Re: [Qemu-devel] [PATCH] unin_pci: Clean up qdev names

[Alexander Graf]

On 19.01.2012, at 14:24, Andreas Färber wrote:

> Add -pcihost to SysBus devices to resolve name conflicts,
> and clarify PCI vs. Internal PCI.
> 
> Signed-off-by: Andreas Färber <address@hidden>
> Cc: Alexander Graf <address@hidden>
> Cc: Anthony Liguori <address@hidden>
> ---
> hw/unin_pci.c |   53 ++++++++++++++++++++++++++++++++++++++---------------
> 1 files changed, 38 insertions(+), 15 deletions(-)
> 
> diff --git a/hw/unin_pci.c b/hw/unin_pci.c
> index 14d9914..bd1b32a 100644
> --- a/hw/unin_pci.c
> +++ b/hw/unin_pci.c
> @@ -213,7 +213,7 @@ PCIBus *pci_pmac_init(qemu_irq *pic,
> 
>     /* Use values found on a real PowerMac */
>     /* Uninorth main bus */
> -    dev = qdev_create(NULL, "uni-north");
> +    dev = qdev_create(NULL, "uni-north-pci-pcihost");
>     qdev_init_nofail(dev);
>     s = sysbus_from_qdev(dev);
>     d = FROM_SYSBUS(UNINState, s);
> @@ -245,7 +245,7 @@ PCIBus *pci_pmac_init(qemu_irq *pic,
> 
>     /* Uninorth AGP bus */
>     pci_create_simple(d->host_state.bus, PCI_DEVFN(11, 0), "uni-north-agp");
> -    dev = qdev_create(NULL, "uni-north-agp");
> +    dev = qdev_create(NULL, "uni-north-agp-pcihost");
>     qdev_init_nofail(dev);
>     s = sysbus_from_qdev(dev);
>     sysbus_mmio_map(s, 0, 0xf0800000);
> @@ -254,8 +254,8 @@ PCIBus *pci_pmac_init(qemu_irq *pic,
>     /* Uninorth internal bus */
> #if 0
>     /* XXX: not needed for now */
> -    pci_create_simple(d->host_state.bus, PCI_DEVFN(14, 0), "uni-north-pci");
> -    dev = qdev_create(NULL, "uni-north-pci");
> +    pci_create_simple(d->host_state.bus, PCI_DEVFN(14, 0), 
> "uni-north-internal-pci");


address@hidden:/home/agraf/release/qemu> git pw am 'unin_pci: Clean up qdev 
names'
WARNING: line over 80 characters
#53: FILE: hw/unin_pci.c:257:
+    pci_create_simple(d->host_state.bus, PCI_DEVFN(14, 0), 
"uni-north-internal-pci");

total: 0 errors, 1 warnings, 100 lines checked


Mind to fix that one up and resubmit? The rest looks good to me.


Alex