On Mon, Feb 04, 2013 at 02:40:20PM +0400, Michael Tokarev wrote: > From: Jason Baron <jba...@redhat.com> > > The Advanced Error Interrupt Message Number (bits 31:27 of the Root > Error Status Register) is updated when the number of msi messages assigned to > a > device changes. Migration of windows 7 on q35 chipset failed because the check > in get_pci_config_device() fails due to cmask being set on these bits. Its > valid > to update these bits and we must restore this state across migration. > > Signed-off-by: Jason Baron <jba...@redhat.com> > Signed-off-by: Michael S. Tsirkin <m...@redhat.com> > (cherry picked from commit 0e180d9c8a7429c55d23d2e7855f1e490a063aaa) > > Signed-off-by: Michael Tokarev <m...@tls.msk.ru>
q35 isn't part of 1.1 so why do we want this patch there? > --- > hw/pcie_aer.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/hw/pcie_aer.c b/hw/pcie_aer.c > index 3b6981c..b04c164 100644 > --- a/hw/pcie_aer.c > +++ b/hw/pcie_aer.c > @@ -738,6 +738,11 @@ void pcie_aer_root_init(PCIDevice *dev) > PCI_ERR_ROOT_CMD_EN_MASK); > pci_set_long(dev->w1cmask + pos + PCI_ERR_ROOT_STATUS, > PCI_ERR_ROOT_STATUS_REPORT_MASK); > + /* PCI_ERR_ROOT_IRQ is RO but devices change it using a > + * device-specific method. > + */ > + pci_set_long(dev->cmask + pos + PCI_ERR_ROOT_STATUS, > + ~PCI_ERR_ROOT_IRQ); > } > > void pcie_aer_root_reset(PCIDevice *dev) > -- > 1.7.10.4
