From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 34538138202 for ; Wed, 21 Nov 2012 20:51:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 554DD21C06D; Wed, 21 Nov 2012 20:50:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3E73D21C06D for ; Wed, 21 Nov 2012 20:50:39 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5420033D987 for ; Wed, 21 Nov 2012 20:50:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id B8872E544C for ; Wed, 21 Nov 2012 20:50:35 +0000 (UTC) From: "Doug Goldstein" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Doug Goldstein" Message-ID: <1351062441.a9f3f483c3d2f0667fc7f7cccfd3f50402712456.cardoe@gentoo> Subject: [gentoo-commits] proj/qemu-kvm:qemu-kvm-1.1.2-gentoo commit in: hw/ X-VCS-Repository: proj/qemu-kvm X-VCS-Files: hw/pcie_aer.c X-VCS-Directories: hw/ X-VCS-Committer: cardoe X-VCS-Committer-Name: Doug Goldstein X-VCS-Revision: a9f3f483c3d2f0667fc7f7cccfd3f50402712456 X-VCS-Branch: qemu-kvm-1.1.2-gentoo Date: Wed, 21 Nov 2012 20:50:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 431e2618-5c3d-4b40-b0d6-bcf3468f415b X-Archives-Hash: 9a0036f30f3a84d8d3116a139ea0ef56 commit: a9f3f483c3d2f0667fc7f7cccfd3f50402712456 Author: Jason Baron redhat com> AuthorDate: Tue Sep 4 20:22:46 2012 +0000 Commit: Doug Goldstein gentoo org> CommitDate: Wed Oct 24 07:07:21 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qemu-kvm.git;a=commit;h=a9f3f483 pcie_aer: clear cmask for Advanced Error Interrupt Message Number 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 redhat.com> Signed-off-by: Michael S. Tsirkin redhat.com> (cherry picked from commit 0e180d9c8a7429c55d23d2e7855f1e490a063aaa) --- hw/pcie_aer.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) 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)