Re: [Qemu-devel] [PATCH v2 2/2] hw/pci-bridge: Convert pxb initialization functions to Error

[Cao jin]

On 03/23/2016 03:26 PM, Wei Jiangang wrote:


-static int pxb_dev_init_common(PCIDevice *dev, bool pcie)
+static void pxb_dev_realize_common(PCIDevice *dev, bool pcie, Error **errp)
  {
      PXBDev *pxb = convert_to_pxb(dev);
      DeviceState *ds, *bds = NULL;
      PCIBus *bus;
      const char *dev_name = NULL;
+    Error *local_err = NULL;


the preferred style I think, is /*err/

      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;

since we have local /*err/ to avoid null /**errp/ venture, I guess it 
should be used here too.

      }

      if (dev->qdev.id && *dev->qdev.id) {
@@ -248,7 +244,9 @@ static int pxb_dev_init_common(PCIDevice *dev, bool pcie)

      PCI_HOST_BRIDGE(ds)->bus = bus;

-    if (pxb_register_bus(dev, bus)) {
+    pxb_register_bus(dev, bus, &local_err);
+    if (local_err) {
+        error_propagate(errp, local_err);
          goto err_register_bus;
      }

@@ -262,23 +260,22 @@ static int pxb_dev_init_common(PCIDevice *dev, bool pcie)
      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));
-    return -EINVAL;
  }

-static int pxb_dev_initfn(PCIDevice *dev)
+static void pxb_dev_realize(PCIDevice *dev, Error **errp)
  {
      if (pci_bus_is_express(dev->bus)) {
-        error_report("pxb devices cannot reside on a PCIe bus!");
-        return -EINVAL;
+        error_setg(errp, "pxb devices cannot reside on a PCIe bus");
+        return;
      }

-    return pxb_dev_init_common(dev, false);
+    pxb_dev_realize_common(dev, false, errp);
  }

  static void pxb_dev_exitfn(PCIDevice *pci_dev)
@@ -300,7 +297,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;
@@ -318,14 +315,14 @@ static const TypeInfo pxb_dev_info = {
      .class_init    = pxb_dev_class_init,
  };

-static int pxb_pcie_dev_initfn(PCIDevice *dev)
+static void pxb_pcie_dev_realize(PCIDevice *dev, Error **errp)
  {
      if (!pci_bus_is_express(dev->bus)) {
-        error_report("pxb-pcie devices cannot reside on a PCI bus!");
-        return -EINVAL;
+        error_setg(errp, "pxb-pcie devices cannot reside on a PCI bus");
+        return;
      }

-    return pxb_dev_init_common(dev, true);
+    pxb_dev_realize_common(dev, true, errp);
  }

  static void pxb_pcie_dev_class_init(ObjectClass *klass, void *data)
@@ -333,7 +330,7 @@ static void pxb_pcie_dev_class_init(ObjectClass *klass, 
void *data)
      DeviceClass *dc = DEVICE_CLASS(klass);
      PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);

-    k->init = pxb_pcie_dev_initfn;
+    k->realize = pxb_pcie_dev_realize;
      k->exit = pxb_dev_exitfn;
      k->vendor_id = PCI_VENDOR_ID_REDHAT;
      k->device_id = PCI_DEVICE_ID_REDHAT_PXB_PCIE;


--
Yours Sincerely,

Cao jin