From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53205) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XOlpc-0000yc-7l for qemu-devel@nongnu.org; Tue, 02 Sep 2014 07:01:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XOlpV-0001Tx-59 for qemu-devel@nongnu.org; Tue, 02 Sep 2014 07:01:00 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:40407) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XOlpU-0001Tr-UI for qemu-devel@nongnu.org; Tue, 02 Sep 2014 07:00:53 -0400 From: Knut Omang Date: Tue, 2 Sep 2014 13:00:04 +0200 Message-Id: <1409655606-19150-3-git-send-email-knut.omang@oracle.com> In-Reply-To: <1409655606-19150-1-git-send-email-knut.omang@oracle.com> References: <1409655606-19150-1-git-send-email-knut.omang@oracle.com> Subject: [Qemu-devel] [PATCH v2 2/4] pci: Avoid losing config updates to MSI/MSIX cap regs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Peter Crosthwaite , Stefan Hajnoczi , "Michael S. Tsirkin" , Laszlo Ersek , Gabriel Somlo , Knut Omang , Alexander Graf , Fabien Chouteau , Luiz Capitulino , Beniamino Galvani , Alex Williamson , "Gonglei (Arei)" , Jan Kiszka , Anthony Liguori , Paolo Bonzini , Amos Kong Introduce an extra local variable to avoid that the shifting in the for loop causes updates to msi/msix capability registers to get lost in pci_default_write_config. Signed-off-by: Knut Omang --- hw/pci/pci.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 6b21dee..af547dc 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -1146,9 +1146,10 @@ uint32_t pci_default_read_config(PCIDevice *d, return le32_to_cpu(val); } -void pci_default_write_config(PCIDevice *d, uint32_t addr, uint32_t val, int l) +void pci_default_write_config(PCIDevice *d, uint32_t addr, uint32_t val_in, int l) { int i, was_irq_disabled = pci_irq_disabled(d); + uint32_t val = val_in; for (i = 0; i < l; val >>= 8, ++i) { uint8_t wmask = d->wmask[addr + i]; @@ -1170,8 +1171,8 @@ void pci_default_write_config(PCIDevice *d, uint32_t addr, uint32_t val, int l) & PCI_COMMAND_MASTER); } - msi_write_config(d, addr, val, l); - msix_write_config(d, addr, val, l); + msi_write_config(d, addr, val_in, l); + msix_write_config(d, addr, val_in, l); } /***********************************************************/ -- 1.9.0