From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MO6Vj-00040r-Dj for qemu-devel@nongnu.org; Tue, 07 Jul 2009 04:58:47 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MO6Ve-0003vW-9N for qemu-devel@nongnu.org; Tue, 07 Jul 2009 04:58:46 -0400 Received: from [199.232.76.173] (port=47983 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MO6Vd-0003v5-Qi for qemu-devel@nongnu.org; Tue, 07 Jul 2009 04:58:41 -0400 Received: from mail.valinux.co.jp ([210.128.90.3]:54565) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MO6Vc-00056b-OL for qemu-devel@nongnu.org; Tue, 07 Jul 2009 04:58:41 -0400 From: Isaku Yamahata Date: Tue, 7 Jul 2009 15:59:25 +0900 Message-Id: <1246949967-4778-5-git-send-email-yamahata@valinux.co.jp> In-Reply-To: <1246949967-4778-1-git-send-email-yamahata@valinux.co.jp> References: <1246949967-4778-1-git-send-email-yamahata@valinux.co.jp> Subject: [Qemu-devel] [PATCH 4/6] pci: define a constant to represent a unmapped bar and use it. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: yamahata@valinux.co.jp define a constant to represent a unmapped bar and use it. Signed-off-by: Isaku Yamahata --- hw/cirrus_vga.c | 2 +- hw/pci.c | 18 +++++++++--------- hw/pci.h | 1 + 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c index 902b3ee..0b4615d 100644 --- a/hw/cirrus_vga.c +++ b/hw/cirrus_vga.c @@ -3296,7 +3296,7 @@ static void pci_cirrus_write_config(PCIDevice *d, CirrusVGAState *s = &pvs->cirrus_vga; pci_default_write_config(d, address, val, len); - if (s->vga.map_addr && pvs->dev.io_regions[0].addr == -1) + if (s->vga.map_addr && pvs->dev.io_regions[0].addr == PCI_BAR_UNMAPPED) s->vga.map_addr = 0; cirrus_update_memory_access(s); } diff --git a/hw/pci.c b/hw/pci.c index 7c7bab5..aa3e188 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -351,7 +351,7 @@ static void pci_unregister_io_regions(PCIDevice *pci_dev) for(i = 0; i < PCI_NUM_REGIONS; i++) { r = &pci_dev->io_regions[i]; - if (!r->size || r->addr == -1) + if (!r->size || r->addr == PCI_BAR_UNMAPPED) continue; if (r->type == PCI_ADDRESS_SPACE_IO) { isa_unassign_ioport(r->addr, r->size); @@ -398,7 +398,7 @@ void pci_register_bar(PCIDevice *pci_dev, int region_num, } r = &pci_dev->io_regions[region_num]; - r->addr = -1; + r->addr = PCI_BAR_UNMAPPED; r->size = size; r->type = type; r->map_func = map_func; @@ -441,10 +441,10 @@ static void pci_update_mappings(PCIDevice *d) /* NOTE: we have only 64K ioports on PC */ if (last_addr <= new_addr || new_addr == 0 || last_addr >= 0x10000) { - new_addr = -1; + new_addr = PCI_BAR_UNMAPPED; } } else { - new_addr = -1; + new_addr = PCI_BAR_UNMAPPED; } } else { if (cmd & PCI_COMMAND_MEMORY) { @@ -460,17 +460,17 @@ static void pci_update_mappings(PCIDevice *d) mappings, we handle specific values as invalid mappings. */ if (last_addr <= new_addr || new_addr == 0 || - last_addr == -1) { - new_addr = -1; + last_addr == PCI_BAR_UNMAPPED) { + new_addr = PCI_BAR_UNMAPPED; } } else { no_mem_map: - new_addr = -1; + new_addr = PCI_BAR_UNMAPPED; } } /* now do the real mapping */ if (new_addr != r->addr) { - if (r->addr != -1) { + if (r->addr != PCI_BAR_UNMAPPED) { if (r->type & PCI_ADDRESS_SPACE_IO) { int class; /* NOTE: specific hack for IDE in PC case: @@ -489,7 +489,7 @@ static void pci_update_mappings(PCIDevice *d) } } r->addr = new_addr; - if (r->addr != -1) { + if (r->addr != PCI_BAR_UNMAPPED) { r->map_func(d, i, r->addr, r->size, r->type); } } diff --git a/hw/pci.h b/hw/pci.h index 7e99cf6..a3d755d 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -84,6 +84,7 @@ typedef int PCIUnregisterFunc(PCIDevice *pci_dev); typedef struct PCIIORegion { uint32_t addr; /* current PCI mapping address. -1 means not mapped */ +#define PCI_BAR_UNMAPPED (~(uint32_t)0) uint32_t size; uint8_t type; PCIMapIORegionFunc *map_func; -- 1.6.0.2