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

Merge remote-tracking branch 'remotes/ehabkost/tags/x86-and-machine-pull-request' into staging 



x86 and machine queue, 2017-01-17

Includes i386, CPU, NUMA, and memory backends changes.

i386:
 target/i386: Fix bad patch application to translate.c

CPU:
 qmp: Report QOM type name on query-cpu-definitions

NUMA:
 numa: make -numa parser dynamically allocate CPUs masks

Memory backends:
 qom: remove unused header
 monitor: reuse user_creatable_add_opts() instead of user_creatable_add()
 monitor: fix qmp/hmp query-memdev not reporting IDs of memory backends

# gpg: Signature made Thu 12 Jan 2017 17:53:11 GMT
# gpg:                using RSA key 0x2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6

* remotes/ehabkost/tags/x86-and-machine-pull-request:
  qmp: Report QOM type name on query-cpu-definitions
  numa: make -numa parser dynamically allocate CPUs masks
  target/i386: Fix bad patch application to translate.c
  monitor: fix qmp/hmp query-memdev not reporting IDs of memory backends
  monitor: reuse user_creatable_add_opts() instead of user_creatable_add()
  qom: remove unused header

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents fdbd92f7 8ed877b7

backends/hostmem.c

+26 −0
Original line number Diff line number Diff line
@@ -348,6 +348,24 @@ host_memory_backend_can_be_deleted(UserCreatable *uc, Error **errp) 
    }

}



static char *get_id(Object *o, Error **errp)

{

    HostMemoryBackend *backend = MEMORY_BACKEND(o);



    return g_strdup(backend->id);

}



static void set_id(Object *o, const char *str, Error **errp)

{

    HostMemoryBackend *backend = MEMORY_BACKEND(o);



    if (backend->id) {

        error_setg(errp, "cannot change property value");

        return;

    }

    backend->id = g_strdup(str);

}



static void

host_memory_backend_class_init(ObjectClass *oc, void *data)

{
@@ -377,6 +395,13 @@ host_memory_backend_class_init(ObjectClass *oc, void *data) 
        HostMemPolicy_lookup,

        host_memory_backend_get_policy,

        host_memory_backend_set_policy, &error_abort);

    object_class_property_add_str(oc, "id", get_id, set_id, &error_abort);

}



static void host_memory_backend_finalize(Object *o)

{

    HostMemoryBackend *backend = MEMORY_BACKEND(o);

    g_free(backend->id);

}



static const TypeInfo host_memory_backend_info = {
@@ -387,6 +412,7 @@ static const TypeInfo host_memory_backend_info = { 
    .class_init = host_memory_backend_class_init,

    .instance_size = sizeof(HostMemoryBackend),

    .instance_init = host_memory_backend_init,

    .instance_finalize = host_memory_backend_finalize,

    .interfaces = (InterfaceInfo[]) {

        { TYPE_USER_CREATABLE },

        { }

docs/qmp-commands.txt

+1 −0
Original line number Diff line number Diff line
@@ -3529,6 +3529,7 @@ Example (1): 
         "policy": "bind"

       },

       {

         "id": "mem1",

         "size": 536870912,

         "merge": false,

         "dump": true,

hmp.c

+2 −8
Original line number Diff line number Diff line
@@ -1808,7 +1808,6 @@ void hmp_object_add(Monitor *mon, const QDict *qdict) 
{

    Error *err = NULL;

    QemuOpts *opts;

    Visitor *v;

    Object *obj = NULL;



    opts = qemu_opts_from_qdict(qemu_find_opts("object"), qdict, &err);
@@ -1817,9 +1816,7 @@ void hmp_object_add(Monitor *mon, const QDict *qdict) 
        return;

    }



    v = opts_visitor_new(opts);

    obj = user_creatable_add(qdict, v, &err);

    visit_free(v);

    obj = user_creatable_add_opts(opts, &err);

    qemu_opts_del(opts);



    if (err) {
@@ -2081,13 +2078,11 @@ void hmp_info_memdev(Monitor *mon, const QDict *qdict) 
    MemdevList *m = memdev_list;

    Visitor *v;

    char *str;

    int i = 0;





    while (m) {

        v = string_output_visitor_new(false, &str);

        visit_type_uint16List(v, NULL, &m->value->host_nodes, NULL);

        monitor_printf(mon, "memory backend: %d\n", i);

        monitor_printf(mon, "memory backend: %s\n", m->value->id);

        monitor_printf(mon, "  size:  %" PRId64 "\n", m->value->size);

        monitor_printf(mon, "  merge: %s\n",

                       m->value->merge ? "true" : "false");
@@ -2103,7 +2098,6 @@ void hmp_info_memdev(Monitor *mon, const QDict *qdict) 
        g_free(str);

        visit_free(v);

        m = m->next;

        i++;

    }



    monitor_printf(mon, "\n");

include/qom/object_interfaces.h

+0 −17
Original line number Diff line number Diff line
@@ -75,23 +75,6 @@ void user_creatable_complete(Object *obj, Error **errp); 
 */

bool user_creatable_can_be_deleted(UserCreatable *uc, Error **errp);



/**

 * user_creatable_add:

 * @qdict: the object definition

 * @v: the visitor

 * @errp: if an error occurs, a pointer to an area to store the error

 *

 * Create an instance of the user creatable object whose type

 * is defined in @qdict by the 'qom-type' field, placing it

 * in the object composition tree with name provided by the

 * 'id' field. The remaining fields in @qdict are used to

 * initialize the object properties.

 *

 * Returns: the newly created object or NULL on error

 */

Object *user_creatable_add(const QDict *qdict,

                           Visitor *v, Error **errp);



/**

 * user_creatable_add_type:

 * @type: the object type name

include/sysemu/hostmem.h

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ struct HostMemoryBackend { 
    Object parent;



    /* protected */

    char *id;

    uint64_t size;

    bool merge, dump;

    bool prealloc, force_prealloc, is_mapped;