Commit 0c26c080 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.10-20170731' into staging 



ppc patch queue 2017-07-31

This has a couple of last minute bugfixes for qemu 2.10.

# gpg: Signature made Mon 31 Jul 2017 05:25:54 BST
# gpg:                using RSA key 0x6C38CACA20D9B392
# gpg: Good signature from "David Gibson <david@gibson.dropbear.id.au>"
# gpg:                 aka "David Gibson (Red Hat) <dgibson@redhat.com>"
# gpg:                 aka "David Gibson (ozlabs.org) <dgibson@ozlabs.org>"
# gpg:                 aka "David Gibson (kernel.org) <dwg@kernel.org>"
# Primary key fingerprint: 75F4 6586 AE61 A66C C44E  87DC 6C38 CACA 20D9 B392

* remotes/dgibson/tags/ppc-for-2.10-20170731:
  Revert "spapr: populate device tree depending on XIVE_EXPLOIT option"
  spapr_drc: fix realize and unrealize

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents a588c498 fc7e0765

hw/ppc/spapr.c

+4 −6
Original line number Diff line number Diff line
@@ -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");

hw/ppc/spapr_drc.c

+6 −9
Original line number Diff line number Diff line
@@ -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,