Re: [Qemu-devel] [PATCH v3] PXB: convert to realize()

[Marcel Apfelbaum <marcel@redhat.com>]

On 12/22/2015 02:50 PM, Cao jin wrote:
> Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
> ---
> v3 changelog:
> 1. As per Paolo`s review, also Marcel`s test suggestion, just unparent bus
>     object while unref the ds & bds object
>
>   hw/pci-bridge/pci_expander_bridge.c | 33 +++++++++++++++++++--------------
>   1 file changed, 19 insertions(+), 14 deletions(-)
>
> diff --git a/hw/pci-bridge/pci_expander_bridge.c b/hw/pci-bridge/pci_expander_bridge.c
> index 57f8a37..7db6a78 100644
> --- a/hw/pci-bridge/pci_expander_bridge.c
> +++ b/hw/pci-bridge/pci_expander_bridge.c
> @@ -145,25 +145,23 @@ static const TypeInfo pxb_host_info = {
>    * Returns 0 on successs, -1 if i440fx host was not
>    * found or the bus number is already in use.
>    */
> -static int pxb_register_bus(PCIDevice *dev, PCIBus *pxb_bus)
> +static void pxb_register_bus(PCIDevice *dev, PCIBus *pxb_bus, Error **errp)
>   {
>       PCIBus *bus = dev->bus;
>       int pxb_bus_num = pci_bus_num(pxb_bus);
>
>       if (bus->parent_dev) {
> -        error_report("PXB devices can be attached only to root bus.");
> -        return -1;
> +        error_setg(errp, "PXB devices can be attached only to root bus.");
> +        return;
>       }
>
>       QLIST_FOREACH(bus, &bus->child, sibling) {
>           if (pci_bus_num(bus) == pxb_bus_num) {
> -            error_report("Bus %d is already in use.", pxb_bus_num);
> -            return -1;
> +            error_setg(errp, "Bus %d is already in use.", pxb_bus_num);
> +            return;
>           }
>       }
>       QLIST_INSERT_HEAD(&dev->bus->child, pxb_bus, sibling);
> -
> -    return 0;
>   }
>
>   static int pxb_map_irq_fn(PCIDevice *pci_dev, int pin)
> @@ -193,7 +191,7 @@ static gint pxb_compare(gconstpointer a, gconstpointer b)
>              0;
>   }
>
> -static int pxb_dev_initfn(PCIDevice *dev)
> +static void pxb_dev_realize(PCIDevice *dev, Error **errp)
>   {
>       PXBDev *pxb = PXB_DEV(dev);
>       DeviceState *ds, *bds;
> @@ -202,8 +200,8 @@ static int pxb_dev_initfn(PCIDevice *dev)
>
>       if (pxb->numa_node != NUMA_NODE_UNASSIGNED &&
>           pxb->numa_node >= nb_numa_nodes) {
> -        error_report("Illegal numa node %d.", pxb->numa_node);
> -        return -EINVAL;
> +        error_setg(errp, "Illegal numa node %d.", pxb->numa_node);
> +        return;
>       }
>
>       if (dev->qdev.id && *dev->qdev.id) {
> @@ -225,8 +223,9 @@ static int pxb_dev_initfn(PCIDevice *dev)
>
>       PCI_HOST_BRIDGE(ds)->bus = bus;
>
> -    if (pxb_register_bus(dev, bus)) {
> -        return -EINVAL;
> +    pxb_register_bus(dev, bus, errp);
> +    if (*errp) {
> +        goto err_register_bus;
>       }
>
>       qdev_init_nofail(ds);
> @@ -237,7 +236,13 @@ static int pxb_dev_initfn(PCIDevice *dev)
>       pci_config_set_class(dev->config, PCI_CLASS_BRIDGE_HOST);
>
>       pxb_dev_list = g_list_insert_sorted(pxb_dev_list, pxb, pxb_compare);
> -    return 0;
> +
> +    return;
> +
> +err_register_bus:
> +    object_unref(OBJECT(bds));
> +    object_unparent(OBJECT(bus));
> +    object_unref(OBJECT(ds));
>   }
>
>   static void pxb_dev_exitfn(PCIDevice *pci_dev)
> @@ -259,7 +264,7 @@ static void pxb_dev_class_init(ObjectClass *klass, void *data)
>       DeviceClass *dc = DEVICE_CLASS(klass);
>       PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
>
> -    k->init = pxb_dev_initfn;
> +    k->realize = pxb_dev_realize;
>       k->exit = pxb_dev_exitfn;
>       k->vendor_id = PCI_VENDOR_ID_REDHAT;
>       k->device_id = PCI_DEVICE_ID_REDHAT_PXB;
>


Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>


Thanks,
Marcel