On Wed, Jan 04, 2017 at 09:57:18PM +0200, Marcel Apfelbaum wrote: > Make Power Management State flag writable to conform > with the PCI Express spec. > > Signed-off-by: Marcel Apfelbaum <mar...@redhat.com>
Same comment as previously. > --- > hw/virtio/virtio-pci.c | 5 +++++ > include/hw/pci/pcie.h | 2 ++ > 2 files changed, 7 insertions(+) > > diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c > index 66a5bf3..7a98078 100644 > --- a/hw/virtio/virtio-pci.c > +++ b/hw/virtio/virtio-pci.c > @@ -1796,12 +1796,15 @@ static void virtio_pci_realize(PCIDevice *pci_dev, > Error **errp) > > pos = pci_add_capability(pci_dev, PCI_CAP_ID_PM, 0, PCI_PM_SIZEOF); > assert(pos > 0); > + pci_dev->exp.pm_cap = pos; > > /* > * Indicates that this function complies with revision 1.2 of the > * PCI Power Management Interface Specification. > */ > pci_set_word(pci_dev->config + pos + PCI_PM_PMC, 0x3); > + pci_set_word(pci_dev->wmask + pos + PCI_PM_CTRL, > + PCI_PM_CTRL_STATE_MASK); > /* Init error enabling flags */ > pcie_cap_deverr_init(pci_dev); > /* Init Link Control Register */ > @@ -1846,6 +1849,8 @@ static void virtio_pci_reset(DeviceState *qdev) > if (pci_is_express(dev)) { > pcie_cap_deverr_reset(dev); > pcie_cap_lnkctl_reset(dev); > + > + pci_set_word(dev->config + dev->exp.pm_cap + PCI_PM_CTRL, 0); > } > } > > diff --git a/include/hw/pci/pcie.h b/include/hw/pci/pcie.h > index 7d6611a..7c9c573 100644 > --- a/include/hw/pci/pcie.h > +++ b/include/hw/pci/pcie.h > @@ -63,6 +63,8 @@ typedef enum { > struct PCIExpressDevice { > /* Offset of express capability in config space */ > uint8_t exp_cap; > + /* Offset of Power Management capability in config space */ > + uint8_t pm_cap; > > /* SLOT */ > bool hpev_notified; /* Logical AND of conditions for hot plug event. > -- > 2.5.5