[Qemu-devel] Re: [PATCH] pci: Replace unneeded type casts in calls of pci_register_bar

[Michael S. Tsirkin]

On Fri, Nov 19, 2010 at 07:29:07PM +0100, Stefan Weil wrote:
> There is no need for these type casts (as other existing
> code shows). So re-write the first argument without
> type cast (and remove a related TODO comment).
> 
> Cc: Michael S. Tsirkin <address@hidden>
> Signed-off-by: Stefan Weil <address@hidden>

Thanks, applied.

> ---
>  hw/cirrus_vga.c |    4 ++--
>  hw/e1000.c      |    4 ++--
>  hw/ide/via.c    |    2 +-
>  hw/lsi53c895a.c |    7 +++----
>  hw/openpic.c    |    2 +-
>  hw/usb-ohci.c   |    2 +-
>  6 files changed, 10 insertions(+), 11 deletions(-)
> 
> diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c
> index aadc56f..40be55d 100644
> --- a/hw/cirrus_vga.c
> +++ b/hw/cirrus_vga.c
> @@ -3204,10 +3204,10 @@ static int pci_cirrus_vga_initfn(PCIDevice *dev)
>       /* memory #0 LFB */
>       /* memory #1 memory-mapped I/O */
>       /* XXX: s->vga.vram_size must be a power of two */
> -     pci_register_bar((PCIDevice *)d, 0, 0x2000000,
> +     pci_register_bar(&d->dev, 0, 0x2000000,
>                        PCI_BASE_ADDRESS_MEM_PREFETCH, cirrus_pci_lfb_map);
>       if (device_id == CIRRUS_ID_CLGD5446) {
> -         pci_register_bar((PCIDevice *)d, 1, CIRRUS_PNPMMIO_SIZE,
> +         pci_register_bar(&d->dev, 1, CIRRUS_PNPMMIO_SIZE,
>                            PCI_BASE_ADDRESS_SPACE_MEMORY, 
> cirrus_pci_mmio_map);
>       }
>       return 0;
> diff --git a/hw/e1000.c b/hw/e1000.c
> index 7811699..57d08cf 100644
> --- a/hw/e1000.c
> +++ b/hw/e1000.c
> @@ -1133,10 +1133,10 @@ static int pci_e1000_init(PCIDevice *pci_dev)
>      d->mmio_index = cpu_register_io_memory(e1000_mmio_read,
>              e1000_mmio_write, d);
>  
> -    pci_register_bar((PCIDevice *)d, 0, PNPMMIO_SIZE,
> +    pci_register_bar(&d->dev, 0, PNPMMIO_SIZE,
>                             PCI_BASE_ADDRESS_SPACE_MEMORY, e1000_mmio_map);
>  
> -    pci_register_bar((PCIDevice *)d, 1, IOPORT_SIZE,
> +    pci_register_bar(&d->dev, 1, IOPORT_SIZE,
>                             PCI_BASE_ADDRESS_SPACE_IO, ioport_map);
>  
>      memmove(d->eeprom_data, e1000_eeprom_template,
> diff --git a/hw/ide/via.c b/hw/ide/via.c
> index b2c7cad..2001a36 100644
> --- a/hw/ide/via.c
> +++ b/hw/ide/via.c
> @@ -153,7 +153,7 @@ static int vt82c686b_ide_initfn(PCIDevice *dev)
>      pci_set_long(pci_conf + PCI_CAPABILITY_LIST, 0x000000c0);
>  
>      qemu_register_reset(via_reset, d);
> -    pci_register_bar((PCIDevice *)d, 4, 0x10,
> +    pci_register_bar(&d->dev, 4, 0x10,
>                             PCI_BASE_ADDRESS_SPACE_IO, bmdma_map);
>  
>      vmstate_register(&dev->qdev, 0, &vmstate_ide_pci, d);
> diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c
> index f97335e..1aef62f 100644
> --- a/hw/lsi53c895a.c
> +++ b/hw/lsi53c895a.c
> @@ -2177,12 +2177,11 @@ static int lsi_scsi_init(PCIDevice *dev)
>      s->ram_io_addr = cpu_register_io_memory(lsi_ram_readfn,
>                                              lsi_ram_writefn, s);
>  
> -    /* TODO: use dev and get rid of cast below */
> -    pci_register_bar((struct PCIDevice *)s, 0, 256,
> +    pci_register_bar(&s->dev, 0, 256,
>                             PCI_BASE_ADDRESS_SPACE_IO, lsi_io_mapfunc);
> -    pci_register_bar((struct PCIDevice *)s, 1, 0x400,
> +    pci_register_bar(&s->dev, 1, 0x400,
>                             PCI_BASE_ADDRESS_SPACE_MEMORY, lsi_mmio_mapfunc);
> -    pci_register_bar((struct PCIDevice *)s, 2, 0x2000,
> +    pci_register_bar(&s->dev, 2, 0x2000,
>                             PCI_BASE_ADDRESS_SPACE_MEMORY, lsi_ram_mapfunc);
>      QTAILQ_INIT(&s->queue);
>  
> diff --git a/hw/openpic.c b/hw/openpic.c
> index 01bf15f..f6b8f21 100644
> --- a/hw/openpic.c
> +++ b/hw/openpic.c
> @@ -1197,7 +1197,7 @@ qemu_irq *openpic_init (PCIBus *bus, int *pmem_index, 
> int nb_cpus,
>          pci_conf[0x3d] = 0x00; // no interrupt pin
>  
>          /* Register I/O spaces */
> -        pci_register_bar((PCIDevice *)opp, 0, 0x40000,
> +        pci_register_bar(&opp->pci_dev, 0, 0x40000,
>                                 PCI_BASE_ADDRESS_SPACE_MEMORY, &openpic_map);
>      } else {
>          opp = qemu_mallocz(sizeof(openpic_t));
> diff --git a/hw/usb-ohci.c b/hw/usb-ohci.c
> index c60fd8d..8fb2f83 100644
> --- a/hw/usb-ohci.c
> +++ b/hw/usb-ohci.c
> @@ -1741,7 +1741,7 @@ static int usb_ohci_initfn_pci(struct PCIDevice *dev)
>      ohci->state.irq = ohci->pci_dev.irq[0];
>  
>      /* TODO: avoid cast below by using dev */
> -    pci_register_bar((struct PCIDevice *)ohci, 0, 256,
> +    pci_register_bar(&ohci->pci_dev, 0, 256,
>                             PCI_BASE_ADDRESS_SPACE_MEMORY, ohci_mapfunc);
>      return 0;
>  }
> -- 
> 1.7.2.3