On Wed, Jan 18, 2017 at 8:58 PM Eric Blake <ebl...@redhat.com> wrote:
> It's simpler to just use a C struct than it is to bundle things > into a QDict in one function just to pull them back out in the > caller. Plus, doing this gets rid of one more user of dynamic > JSON through qobject_from_jsonf(). > and it looks like it removes a leak > > Signed-off-by: Eric Blake <ebl...@redhat.com> > Acked-by: Michael S. Tsirkin <m...@redhat.com> > Reviewed-by: Marc-André Lureau <marcandre.lur...@redhat.com> > --- > hw/pci/pcie_aer.c | 36 +++++++++++++++++------------------- > 1 file changed, 17 insertions(+), 19 deletions(-) > > diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c > index daf1f65..78fd2c3 100644 > --- a/hw/pci/pcie_aer.c > +++ b/hw/pci/pcie_aer.c > @@ -44,6 +44,13 @@ > #define PCI_ERR_SRC_COR_OFFS 0 > #define PCI_ERR_SRC_UNCOR_OFFS 2 > > +typedef struct PCIEErrorInject { > + const char *id; > + const char *root_bus; > + int bus; > + int devfn; > +} PCIEErrorInject; > + > /* From 6.2.7 Error Listing and Rules. Table 6-2, 6-3 and 6-4 */ > static uint32_t pcie_aer_uncor_default_severity(uint32_t status) > { > @@ -943,7 +950,8 @@ static int pcie_aer_parse_error_string(const char > *error_name, > } > > static int do_pcie_aer_inject_error(Monitor *mon, > - const QDict *qdict, QObject > **ret_data) > + const QDict *qdict, > + PCIEErrorInject *ret_data) > { > const char *id = qdict_get_str(qdict, "id"); > const char *error_name; > @@ -1004,34 +1012,24 @@ static int do_pcie_aer_inject_error(Monitor *mon, > err.prefix[2] = qdict_get_try_int(qdict, "prefix2", 0); > err.prefix[3] = qdict_get_try_int(qdict, "prefix3", 0); > > - ret = pcie_aer_inject_error(dev, &err); > - *ret_data = qobject_from_jsonf("{'id': %s, " > - "'root_bus': %s, 'bus': %d, 'devfn': > %d, " > - "'ret': %d}", > - id, pci_root_bus_path(dev), > - pci_bus_num(dev->bus), dev->devfn, > - ret); > - assert(*ret_data); > + pcie_aer_inject_error(dev, &err); > + ret_data->id = id; > + ret_data->root_bus = pci_root_bus_path(dev); > + ret_data->bus = pci_bus_num(dev->bus); > + ret_data->devfn = dev->devfn; > > return 0; > } > > void hmp_pcie_aer_inject_error(Monitor *mon, const QDict *qdict) > { > - QObject *data; > - int devfn; > + PCIEErrorInject data; > > if (do_pcie_aer_inject_error(mon, qdict, &data) < 0) { > return; > } > > - assert(qobject_type(data) == QTYPE_QDICT); > - qdict = qobject_to_qdict(data); > - > - devfn = (int)qdict_get_int(qdict, "devfn"); > monitor_printf(mon, "OK id: %s root bus: %s, bus: %x devfn: %x.%x\n", > - qdict_get_str(qdict, "id"), > - qdict_get_str(qdict, "root_bus"), > - (int) qdict_get_int(qdict, "bus"), > - PCI_SLOT(devfn), PCI_FUNC(devfn)); > + data.id, data.root_bus, data.bus, > + PCI_SLOT(data.devfn), PCI_FUNC(data.devfn)); > } > -- > 2.9.3 > > > -- Marc-André Lureau