From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MuMc5-0006pt-C7 for qemu-devel@nongnu.org; Sun, 04 Oct 2009 04:38:41 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MuMc0-0006oI-4i for qemu-devel@nongnu.org; Sun, 04 Oct 2009 04:38:40 -0400 Received: from [199.232.76.173] (port=34546 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MuMc0-0006o9-14 for qemu-devel@nongnu.org; Sun, 04 Oct 2009 04:38:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39118) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MuMbz-0001YM-Jg for qemu-devel@nongnu.org; Sun, 04 Oct 2009 04:38:35 -0400 Date: Sun, 4 Oct 2009 10:36:29 +0200 From: "Michael S. Tsirkin" Message-ID: <20091004083629.GA15732@redhat.com> References: <1254479517-25845-1-git-send-email-yamahata@valinux.co.jp> <1254479517-25845-18-git-send-email-yamahata@valinux.co.jp> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1254479517-25845-18-git-send-email-yamahata@valinux.co.jp> Subject: [Qemu-devel] Re: [PATCH 17/25] pci: fix pci_default_write_config() List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Isaku Yamahata Cc: qemu-devel@nongnu.org On Fri, Oct 02, 2009 at 07:31:49PM +0900, Isaku Yamahata wrote: > When updated ROM expantion address of header type 0, it missed > to update mappings. > Add PCI_ROM_ADDRESS check whether to call pci_update_mappings() > > Cc: Michael S. Tsirkin > Signed-off-by: Isaku Yamahata Acked-by: Michael S. Tsirkin > --- > hw/pci.c | 3 ++- > hw/pci.h | 1 + > 2 files changed, 3 insertions(+), 1 deletions(-) > > diff --git a/hw/pci.c b/hw/pci.c > index 1afcfb8..c9054c1 100644 > --- a/hw/pci.c > +++ b/hw/pci.c > @@ -671,7 +671,8 @@ void pci_default_write_config(PCIDevice *d, uint32_t addr, uint32_t val, int l) > uint8_t wmask = d->wmask[addr]; > d->config[addr] = (d->config[addr] & ~wmask) | (val & wmask); > } > - if (memcmp(orig + PCI_BASE_ADDRESS_0, d->config + PCI_BASE_ADDRESS_0, 24) > + if ((memcmp(orig + PCI_BASE_ADDRESS_0, d->config + PCI_BASE_ADDRESS_0, 24) || > + memcmp(orig + PCI_ROM_ADDRESS, d->config + PCI_ROM_ADDRESS, 4)) > || ((orig[PCI_COMMAND] ^ d->config[PCI_COMMAND]) > & (PCI_COMMAND_MEMORY | PCI_COMMAND_IO))) > pci_update_mappings(d); > diff --git a/hw/pci.h b/hw/pci.h > index 66d899d..3ea5258 100644 > --- a/hw/pci.h > +++ b/hw/pci.h > @@ -144,6 +144,7 @@ static inline int pci_bar_is_64bit(const PCIIORegion *r) > #define PCI_SUBVENDOR_ID 0x2c /* obsolete, use PCI_SUBSYSTEM_VENDOR_ID */ > #define PCI_SUBDEVICE_ID 0x2e /* obsolete, use PCI_SUBSYSTEM_ID */ > > +#define PCI_ROM_ADDRESS 0x30 /* Bits 31..11 are address, 10..1 reserved */ > #define PCI_ROM_ADDRESS_ENABLE 0x01 > > /* Bits in the PCI Status Register (PCI 2.3 spec) */ > -- > 1.6.0.2