diff options
| author | Isaku Yamahata <yamahata@valinux.co.jp> | 2009-10-30 21:20:58 +0900 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-11-09 08:43:04 -0600 |
| commit | 182f9c8a64d530d992df35a1a4b17a562c7d1aef (patch) | |
| tree | 5edad9c70d781f9ea77dcb715d288b575351adf9 /hw/pci.c | |
| parent | 2217dcfff5e24a16217cba5e53c3579f97d8880e (diff) | |
| download | focaccia-qemu-182f9c8a64d530d992df35a1a4b17a562c7d1aef.tar.gz focaccia-qemu-182f9c8a64d530d992df35a1a4b17a562c7d1aef.zip | |
pci: define a constant to represent a unmapped bar and use it.
define a constant to represent a unmapped bar instead of -1 and use it. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Acked-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/pci.c')
| -rw-r--r-- | hw/pci.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/hw/pci.c b/hw/pci.c index ce3329bf69..00d407dee5 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -418,7 +418,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); @@ -466,7 +466,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; @@ -500,10 +500,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) { @@ -518,17 +518,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: @@ -547,7 +547,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); } } |