1 From 89df4609568433f67999c27f9b9cd12e91a7d0b5 Mon Sep 17 00:00:00 2001
2 From: Jason Baron <jbaron@redhat.com>
3 Date: Tue, 4 Sep 2012 16:22:46 -0400
4 Subject: [PATCH] pcie_aer: clear cmask for Advanced Error Interrupt Message
7 The Advanced Error Interrupt Message Number (bits 31:27 of the Root
8 Error Status Register) is updated when the number of msi messages assigned to a
9 device changes. Migration of windows 7 on q35 chipset failed because the check
10 in get_pci_config_device() fails due to cmask being set on these bits. Its valid
11 to update these bits and we must restore this state across migration.
13 Signed-off-by: Jason Baron <jbaron@redhat.com>
14 Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
15 (cherry picked from commit 0e180d9c8a7429c55d23d2e7855f1e490a063aaa)
17 Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
19 hw/pcie_aer.c | 5 +++++
20 1 file changed, 5 insertions(+)
22 diff --git a/hw/pcie_aer.c b/hw/pcie_aer.c
23 index 3b6981c..b04c164 100644
26 @@ -738,6 +738,11 @@ void pcie_aer_root_init(PCIDevice *dev)
27 PCI_ERR_ROOT_CMD_EN_MASK);
28 pci_set_long(dev->w1cmask + pos + PCI_ERR_ROOT_STATUS,
29 PCI_ERR_ROOT_STATUS_REPORT_MASK);
30 + /* PCI_ERR_ROOT_IRQ is RO but devices change it using a
31 + * device-specific method.
33 + pci_set_long(dev->cmask + pos + PCI_ERR_ROOT_STATUS,
37 void pcie_aer_root_reset(PCIDevice *dev)