Commit b50dab9e authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/armbru/tags/pull-qom-2020-07-21' into staging 



QOM patches for 2020-07-21

# gpg: Signature made Tue 21 Jul 2020 16:40:27 BST
# gpg:                using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg:                issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-qom-2020-07-21:
  qom: Make info qom-tree sort children more efficiently
  qom: Document object_get_canonical_path() returns malloced string
  qom: Change object_get_canonical_path_component() not to malloc

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents a418695e 0dde9fd1

backends/hostmem.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ char * 
host_memory_backend_get_name(HostMemoryBackend *backend)

{

    if (!backend->use_canonical_path) {

        return object_get_canonical_path_component(OBJECT(backend));

        return g_strdup(object_get_canonical_path_component(OBJECT(backend)));

    }



    return object_get_canonical_path(OBJECT(backend));

block/throttle-groups.c

+1 −1
Original line number Diff line number Diff line
@@ -771,7 +771,7 @@ static void throttle_group_obj_complete(UserCreatable *obj, Error **errp) 


    /* set group name to object id if it exists */

    if (!tg->name && tg->parent_obj.parent) {

        tg->name = object_get_canonical_path_component(OBJECT(obj));

        tg->name = g_strdup(object_get_canonical_path_component(OBJECT(obj)));

    }

    /* We must have a group name at this point */

    assert(tg->name);

gdbstub.c

+1 −1
Original line number Diff line number Diff line
@@ -2059,7 +2059,7 @@ static void handle_query_thread_extra(GdbCmdContext *gdb_ctx, void *user_ctx) 
        /* Print the CPU model and name in multiprocess mode */

        ObjectClass *oc = object_get_class(OBJECT(cpu));

        const char *cpu_model = object_class_get_name(oc);

        g_autofree char *cpu_name =

        const char *cpu_name =

            object_get_canonical_path_component(OBJECT(cpu));

        g_string_printf(rs, "%s %s [%s]", cpu_model, cpu_name,

                        cpu->halted ? "halted " : "running");

hw/arm/xlnx-zynqmp.c

+2 −4
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ static void xlnx_zynqmp_create_rpu(MachineState *ms, XlnxZynqMPState *s, 
    qdev_prop_set_uint32(DEVICE(&s->rpu_cluster), "cluster-id", 1);



    for (i = 0; i < num_rpus; i++) {

        char *name;

        const char *name;



        object_initialize_child(OBJECT(&s->rpu_cluster), "rpu-cpu[*]",

                                &s->rpu_cpu[i],
@@ -204,7 +204,6 @@ static void xlnx_zynqmp_create_rpu(MachineState *ms, XlnxZynqMPState *s, 
        } else {

            s->boot_cpu_ptr = &s->rpu_cpu[i];

        }

        g_free(name);



        object_property_set_bool(OBJECT(&s->rpu_cpu[i]), "reset-hivecs", true,

                                 &error_abort);
@@ -341,7 +340,7 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) 


    /* Realize APUs before realizing the GIC. KVM requires this.  */

    for (i = 0; i < num_apus; i++) {

        char *name;

        const char *name;



        object_property_set_int(OBJECT(&s->apu_cpu[i]), "psci-conduit",

                                QEMU_PSCI_CONDUIT_SMC, &error_abort);
@@ -354,7 +353,6 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) 
        } else {

            s->boot_cpu_ptr = &s->apu_cpu[i];

        }

        g_free(name);



        object_property_set_bool(OBJECT(&s->apu_cpu[i]), "has_el3", s->secure,

                                 NULL);

hw/block/nvme.c

+2 −3
Original line number Diff line number Diff line
@@ -1397,9 +1397,8 @@ static void nvme_check_constraints(NvmeCtrl *n, Error **errp) 


    if (!n->params.cmb_size_mb && n->pmrdev) {

        if (host_memory_backend_is_mapped(n->pmrdev)) {

            char *path = object_get_canonical_path_component(OBJECT(n->pmrdev));

            error_setg(errp, "can't use already busy memdev: %s", path);

            g_free(path);

            error_setg(errp, "can't use already busy memdev: %s",

                       object_get_canonical_path_component(OBJECT(n->pmrdev)));

            return;

        }