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

Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2016-02-09' into staging 



QAPI patches for 2016-02-09

# gpg: Signature made Tue 09 Feb 2016 10:55:51 GMT using RSA key ID EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"

* remotes/armbru/tags/pull-qapi-2016-02-09: (31 commits)
  qapi: Add missing JSON files in build dependencies
  qapi: Fix compilation failure on MIPS and SPARC
  qmp: Don't abuse stack to track qmp-output root
  qmp: Fix reference-counting of qnull on empty output visit
  qapi: Drop unused error argument for list and implicit struct
  qapi: Tighten qmp_input_end_list()
  qapi: Drop unused 'kind' for struct/enum visit
  qapi: Swap 'name' in visit_* callbacks to match public API
  qom: Swap 'name' next to visitor in ObjectPropertyAccessor
  qapi: Swap visit_* arguments for consistent 'name' placement
  qom: Use typedef for Visitor
  qapi: Don't cast Enum* to int*
  qapi: Consolidate visitor small integer callbacks
  qapi: Make all visitors supply uint64 callbacks
  qapi: Prefer type_int64 over type_int in visitors
  qapi-visit: Kill unused visit_end_union()
  qapi: Track all failures between visit_start/stop
  qapi: Improve generated event use of qapi visitor
  balloon: Improve use of qapi visitor
  vl: Ensure qapi visitor properly ends struct visit
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 74f30f15 423aeaf2

Makefile

+2 −1
Original line number Diff line number Diff line
@@ -272,7 +272,8 @@ $(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py) 
qapi-modules = $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/qapi/common.json \

               $(SRC_PATH)/qapi/block.json $(SRC_PATH)/qapi/block-core.json \

               $(SRC_PATH)/qapi/event.json $(SRC_PATH)/qapi/introspect.json \

               $(SRC_PATH)/qapi/crypto.json

               $(SRC_PATH)/qapi/crypto.json $(SRC_PATH)/qapi/rocker.json \

               $(SRC_PATH)/qapi/trace.json



qapi-types.c qapi-types.h :\

$(qapi-modules) $(SRC_PATH)/scripts/qapi-types.py $(qapi-py)

backends/hostmem.c

+12 −12
Original line number Diff line number Diff line
@@ -27,18 +27,18 @@ QEMU_BUILD_BUG_ON(HOST_MEM_POLICY_INTERLEAVE != MPOL_INTERLEAVE); 
#endif



static void

host_memory_backend_get_size(Object *obj, Visitor *v, void *opaque,

                             const char *name, Error **errp)

host_memory_backend_get_size(Object *obj, Visitor *v, const char *name,

                             void *opaque, Error **errp)

{

    HostMemoryBackend *backend = MEMORY_BACKEND(obj);

    uint64_t value = backend->size;



    visit_type_size(v, &value, name, errp);

    visit_type_size(v, name, &value, errp);

}



static void

host_memory_backend_set_size(Object *obj, Visitor *v, void *opaque,

                             const char *name, Error **errp)

host_memory_backend_set_size(Object *obj, Visitor *v, const char *name,

                             void *opaque, Error **errp)

{

    HostMemoryBackend *backend = MEMORY_BACKEND(obj);

    Error *local_err = NULL;
@@ -49,7 +49,7 @@ host_memory_backend_set_size(Object *obj, Visitor *v, void *opaque, 
        goto out;

    }



    visit_type_size(v, &value, name, &local_err);

    visit_type_size(v, name, &value, &local_err);

    if (local_err) {

        goto out;

    }
@@ -64,8 +64,8 @@ out: 
}



static void

host_memory_backend_get_host_nodes(Object *obj, Visitor *v, void *opaque,

                                   const char *name, Error **errp)

host_memory_backend_get_host_nodes(Object *obj, Visitor *v, const char *name,

                                   void *opaque, Error **errp)

{

    HostMemoryBackend *backend = MEMORY_BACKEND(obj);

    uint16List *host_nodes = NULL;
@@ -92,18 +92,18 @@ host_memory_backend_get_host_nodes(Object *obj, Visitor *v, void *opaque, 
        node = &(*node)->next;

    } while (true);



    visit_type_uint16List(v, &host_nodes, name, errp);

    visit_type_uint16List(v, name, &host_nodes, errp);

}



static void

host_memory_backend_set_host_nodes(Object *obj, Visitor *v, void *opaque,

                                   const char *name, Error **errp)

host_memory_backend_set_host_nodes(Object *obj, Visitor *v, const char *name,

                                   void *opaque, Error **errp)

{

#ifdef CONFIG_NUMA

    HostMemoryBackend *backend = MEMORY_BACKEND(obj);

    uint16List *l = NULL;



    visit_type_uint16List(v, &l, name, errp);

    visit_type_uint16List(v, name, &l, errp);



    while (l) {

        bitmap_set(backend->host_nodes, l->value, 1);

block/qapi.c

+1 −1
Original line number Diff line number Diff line
@@ -641,7 +641,7 @@ void bdrv_image_info_specific_dump(fprintf_function func_fprintf, void *f, 
    QmpOutputVisitor *ov = qmp_output_visitor_new();

    QObject *obj, *data;



    visit_type_ImageInfoSpecific(qmp_output_get_visitor(ov), &info_spec, NULL,

    visit_type_ImageInfoSpecific(qmp_output_get_visitor(ov), NULL, &info_spec,

                                 &error_abort);

    obj = qmp_output_get_qobject(ov);

    assert(qobject_type(obj) == QTYPE_QDICT);

blockdev.c

+2 −2
Original line number Diff line number Diff line
@@ -3860,8 +3860,8 @@ void qmp_blockdev_add(BlockdevOptions *options, Error **errp) 
        }

    }



    visit_type_BlockdevOptions(qmp_output_get_visitor(ov),

                               &options, NULL, &local_err);

    visit_type_BlockdevOptions(qmp_output_get_visitor(ov), NULL, &options,

                               &local_err);

    if (local_err) {

        error_propagate(errp, local_err);

        goto fail;

bootdevice.c

+6 −6
Original line number Diff line number Diff line
@@ -271,21 +271,21 @@ typedef struct { 
    DeviceState *dev;

} BootIndexProperty;



static void device_get_bootindex(Object *obj, Visitor *v, void *opaque,

                                 const char *name, Error **errp)

static void device_get_bootindex(Object *obj, Visitor *v, const char *name,

                                 void *opaque, Error **errp)

{

    BootIndexProperty *prop = opaque;

    visit_type_int32(v, prop->bootindex, name, errp);

    visit_type_int32(v, name, prop->bootindex, errp);

}



static void device_set_bootindex(Object *obj, Visitor *v, void *opaque,

                                 const char *name, Error **errp)

static void device_set_bootindex(Object *obj, Visitor *v, const char *name,

                                 void *opaque, Error **errp)

{

    BootIndexProperty *prop = opaque;

    int32_t boot_index;

    Error *local_err = NULL;



    visit_type_int32(v, &boot_index, name, &local_err);

    visit_type_int32(v, name, &boot_index, &local_err);

    if (local_err) {

        goto out;

    }