From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=45884 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PHNXA-0006W3-Kk for qemu-devel@nongnu.org; Sat, 13 Nov 2010 16:21:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PHNX9-0007d4-NO for qemu-devel@nongnu.org; Sat, 13 Nov 2010 16:21:16 -0500 Received: from mx1.redhat.com ([209.132.183.28]:21749) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PHNX9-0007cr-Co for qemu-devel@nongnu.org; Sat, 13 Nov 2010 16:21:15 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oADLLDha022770 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sat, 13 Nov 2010 16:21:14 -0500 Date: Sat, 13 Nov 2010 23:21:07 +0200 From: "Michael S. Tsirkin" Message-ID: <20101113212107.GA24071@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Subject: [Qemu-devel] [PATCH] pci: split config update for dev assignment List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alex Williamson , qemu-devel@nongnu.org Device assignment in qemu-kvm wants to update config array without any side-efects. Make it easier to do so. Signed-off-by: Michael S. Tsirkin --- Alex, I think your work on dev assignment will be easier if I apply this on qemu.kvm. Right? Let me know. hw/pci.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index 8f6fcf8..30e1603 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -996,10 +996,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) +static void pci_update_config(PCIDevice *d, uint32_t addr, uint32_t val, int l) { - int i, was_irq_disabled = pci_irq_disabled(d); uint32_t config_size = pci_config_size(d); + int i; for (i = 0; i < l && addr + i < config_size; val >>= 8, ++i) { uint8_t wmask = d->wmask[addr + i]; @@ -1008,6 +1008,14 @@ void pci_default_write_config(PCIDevice *d, uint32_t addr, uint32_t val, int l) d->config[addr + i] = (d->config[addr + i] & ~wmask) | (val & wmask); d->config[addr + i] &= ~(val & w1cmask); /* W1C: Write 1 to Clear */ } +} + +void pci_default_write_config(PCIDevice *d, uint32_t addr, uint32_t val, int l) +{ + int was_irq_disabled = pci_irq_disabled(d); + + pci_update_config(d, addr, val, l); + if (ranges_overlap(addr, l, PCI_BASE_ADDRESS_0, 24) || ranges_overlap(addr, l, PCI_ROM_ADDRESS, 4) || ranges_overlap(addr, l, PCI_ROM_ADDRESS1, 4) || -- 1.7.3.2.91.g446ac