[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] Re: [PATCH 06/25] pci: define a constant to represent a unm
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] Re: [PATCH 06/25] pci: define a constant to represent a unmapped bar and use it. |
Date: |
Sun, 4 Oct 2009 12:04:13 +0200 |
User-agent: |
Mutt/1.5.19 (2009-01-05) |
On Sat, Oct 03, 2009 at 05:15:58AM +0900, Isaku Yamahata wrote:
> define a constant to represent a unmapped bar instead of -1 and use it.
>
> Signed-off-by: Isaku Yamahata <address@hidden>
> Acked-by: Michael S. Tsirkin <address@hidden>
> ---
> 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 7e95f10..fd2367a 100644
> --- a/hw/cirrus_vga.c
> +++ b/hw/cirrus_vga.c
> @@ -3206,7 +3206,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 && d->io_regions[0].addr == -1)
> + if (s->vga.map_addr && d->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 3bbc7e3..39791d0 100644
> --- a/hw/pci.c
> +++ b/hw/pci.c
> @@ -366,7 +366,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);
> @@ -413,7 +413,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;
> @@ -455,10 +455,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) {
> @@ -474,17 +474,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:
> @@ -503,7 +503,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 def45ae..00c8947 100644
> --- a/hw/pci.h
> +++ b/hw/pci.h
> @@ -85,6 +85,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)
Nitpick: single space between name and value. Doesn't appear aligned
to anything ...
> uint32_t size;
> uint8_t type;
> PCIMapIORegionFunc *map_func;
> --
> 1.6.0.2
>
>
- [Qemu-devel] [PATCH 16/25] pci: pcie host and mmcfg support., (continued)
- [Qemu-devel] [PATCH 01/25] pci: fix PCI_DPRINTF() wrt variadic macro., Isaku Yamahata, 2009/10/02
- [Qemu-devel] [PATCH 06/25] pci: define a constant to represent a unmapped bar and use it., Isaku Yamahata, 2009/10/02
- [Qemu-devel] Re: [PATCH 06/25] pci: define a constant to represent a unmapped bar and use it.,
Michael S. Tsirkin <=
- [Qemu-devel] [PATCH 17/25] pci: fix pci_default_write_config(), Isaku Yamahata, 2009/10/02
- [Qemu-devel] [PATCH 12/25] pci: 64bit bar support., Isaku Yamahata, 2009/10/02
[Qemu-devel] [PATCH 08/25] pci: use helper functions to access pci config space., Isaku Yamahata, 2009/10/02
[Qemu-devel] [PATCH 10/25] pci: introduce FMT_pcibus for printf format for pcibus_t., Isaku Yamahata, 2009/10/02