diff options
| -rw-r--r-- | hw/ppc/spapr.c | 10 | ||||
| -rw-r--r-- | hw/ppc/spapr_drc.c | 15 |
2 files changed, 10 insertions, 15 deletions
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 2a3e53d..f7a1972 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -776,11 +776,6 @@ static int spapr_dt_cas_updates(sPAPRMachineState *spapr, void *fdt, } } - /* /interrupt controller */ - if (!spapr_ovec_test(ov5_updates, OV5_XIVE_EXPLOIT)) { - spapr_dt_xics(xics_max_server_number(), fdt, PHANDLE_XICP); - } - offset = fdt_path_offset(fdt, "/chosen"); if (offset < 0) { offset = fdt_add_subnode(fdt, 0, "chosen"); @@ -804,7 +799,7 @@ int spapr_h_cas_compose_response(sPAPRMachineState *spapr, size -= sizeof(hdr); - /* Create skeleton */ + /* Create sceleton */ fdt_skel = g_malloc0(size); _FDT((fdt_create(fdt_skel, size))); _FDT((fdt_begin_node(fdt_skel, ""))); @@ -1077,6 +1072,9 @@ static void *spapr_build_fdt(sPAPRMachineState *spapr, _FDT(fdt_setprop_cell(fdt, 0, "#address-cells", 2)); _FDT(fdt_setprop_cell(fdt, 0, "#size-cells", 2)); + /* /interrupt controller */ + spapr_dt_xics(xics_max_server_number(), fdt, PHANDLE_XICP); + ret = spapr_populate_memory(spapr, fdt); if (ret < 0) { error_report("couldn't setup memory nodes in fdt"); diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c index 15bae5c..47d94e7 100644 --- a/hw/ppc/spapr_drc.c +++ b/hw/ppc/spapr_drc.c @@ -506,11 +506,11 @@ static void realize(DeviceState *d, Error **errp) trace_spapr_drc_realize_child(spapr_drc_index(drc), child_name); object_property_add_alias(root_container, link_name, drc->owner, child_name, &err); + g_free(child_name); if (err) { - error_report_err(err); - object_unref(OBJECT(drc)); + error_propagate(errp, err); + return; } - g_free(child_name); vmstate_register(DEVICE(drc), spapr_drc_index(drc), &vmstate_spapr_drc, drc); qemu_register_reset(drc_reset, drc); @@ -522,16 +522,13 @@ static void unrealize(DeviceState *d, Error **errp) sPAPRDRConnector *drc = SPAPR_DR_CONNECTOR(d); Object *root_container; char name[256]; - Error *err = NULL; trace_spapr_drc_unrealize(spapr_drc_index(drc)); + qemu_unregister_reset(drc_reset, drc); + vmstate_unregister(DEVICE(drc), &vmstate_spapr_drc, drc); root_container = container_get(object_get_root(), DRC_CONTAINER_PATH); snprintf(name, sizeof(name), "%x", spapr_drc_index(drc)); - object_property_del(root_container, name, &err); - if (err) { - error_report_err(err); - object_unref(OBJECT(drc)); - } + object_property_del(root_container, name, errp); } sPAPRDRConnector *spapr_dr_connector_new(Object *owner, const char *type, |