Commit 4829e037 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2016-03-18' into staging 



QAPI patches for 2016-03-18

# gpg: Signature made Fri 18 Mar 2016 09:54:57 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-03-18:
  qapi: Use anonymous bases in QMP flat unions
  qapi: Allow anonymous base for flat union
  qapi: Make BlockdevOptions doc example closer to reality
  qapi: Don't special-case simple union wrappers
  qapi: Drop unused c_null()
  qapi: Inline gen_visit_members() into lone caller
  qapi-commands: Inline single-use helpers of gen_marshal()
  qapi-commands: Utilize implicit struct visits
  qapi-event: Utilize implicit struct visits
  qapi-event: Drop qmp_output_get_qobject() null check
  qapi: Emit implicit structs in generated C
  qapi: Adjust names of implicit types
  qapi: Make c_type() more OO-like
  qapi: Fix command with named empty argument type
  qapi: Assert in places where variants are not handled

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 879c26fb 3666a97f

backends/baum.c

+1 −1
Original line number Diff line number Diff line
@@ -567,7 +567,7 @@ static CharDriverState *chr_baum_init(const char *id, 
                                      ChardevReturn *ret,

                                      Error **errp)

{

    ChardevCommon *common = backend->u.braille;

    ChardevCommon *common = backend->u.braille.data;

    BaumDriverState *baum;

    CharDriverState *chr;

    brlapi_handle_t *handle;

backends/msmouse.c

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ static CharDriverState *qemu_chr_open_msmouse(const char *id, 
                                              ChardevReturn *ret,

                                              Error **errp)

{

    ChardevCommon *common = backend->u.msmouse;

    ChardevCommon *common = backend->u.msmouse.data;

    CharDriverState *chr;



    chr = qemu_chr_alloc(common, errp);

block/nbd.c

+3 −3
Original line number Diff line number Diff line
@@ -206,13 +206,13 @@ static SocketAddress *nbd_config(BDRVNBDState *s, QDict *options, char **export, 
    if (qdict_haskey(options, "path")) {

        UnixSocketAddress *q_unix;

        saddr->type = SOCKET_ADDRESS_KIND_UNIX;

        q_unix = saddr->u.q_unix = g_new0(UnixSocketAddress, 1);

        q_unix = saddr->u.q_unix.data = g_new0(UnixSocketAddress, 1);

        q_unix->path = g_strdup(qdict_get_str(options, "path"));

        qdict_del(options, "path");

    } else {

        InetSocketAddress *inet;

        saddr->type = SOCKET_ADDRESS_KIND_INET;

        inet = saddr->u.inet = g_new0(InetSocketAddress, 1);

        inet = saddr->u.inet.data = g_new0(InetSocketAddress, 1);

        inet->host = g_strdup(qdict_get_str(options, "host"));

        if (!qdict_get_try_str(options, "port")) {

            inet->port = g_strdup_printf("%d", NBD_DEFAULT_PORT);
@@ -321,7 +321,7 @@ static int nbd_open(BlockDriverState *bs, QDict *options, int flags, 
            error_setg(errp, "TLS only supported over IP sockets");

            goto error;

        }

        hostname = saddr->u.inet->host;

        hostname = saddr->u.inet.data->host;

    }



    /* establish TCP connection, return error if it fails

block/qcow2.c

+3 −3
Original line number Diff line number Diff line
@@ -2800,15 +2800,15 @@ static ImageInfoSpecific *qcow2_get_specific_info(BlockDriverState *bs) 


    *spec_info = (ImageInfoSpecific){

        .type  = IMAGE_INFO_SPECIFIC_KIND_QCOW2,

        .u.qcow2 = g_new(ImageInfoSpecificQCow2, 1),

        .u.qcow2.data = g_new(ImageInfoSpecificQCow2, 1),

    };

    if (s->qcow_version == 2) {

        *spec_info->u.qcow2 = (ImageInfoSpecificQCow2){

        *spec_info->u.qcow2.data = (ImageInfoSpecificQCow2){

            .compat             = g_strdup("0.10"),

            .refcount_bits      = s->refcount_bits,

        };

    } else if (s->qcow_version == 3) {

        *spec_info->u.qcow2 = (ImageInfoSpecificQCow2){

        *spec_info->u.qcow2.data = (ImageInfoSpecificQCow2){

            .compat             = g_strdup("1.1"),

            .lazy_refcounts     = s->compatible_features &

                                  QCOW2_COMPAT_LAZY_REFCOUNTS,

block/vmdk.c

+4 −4
Original line number Diff line number Diff line
@@ -2203,18 +2203,18 @@ static ImageInfoSpecific *vmdk_get_specific_info(BlockDriverState *bs) 


    *spec_info = (ImageInfoSpecific){

        .type = IMAGE_INFO_SPECIFIC_KIND_VMDK,

        {

            .vmdk = g_new0(ImageInfoSpecificVmdk, 1),

        .u = {

            .vmdk.data = g_new0(ImageInfoSpecificVmdk, 1),

        },

    };



    *spec_info->u.vmdk = (ImageInfoSpecificVmdk) {

    *spec_info->u.vmdk.data = (ImageInfoSpecificVmdk) {

        .create_type = g_strdup(s->create_type),

        .cid = s->cid,

        .parent_cid = s->parent_cid,

    };



    next = &spec_info->u.vmdk->extents;

    next = &spec_info->u.vmdk.data->extents;

    for (i = 0; i < s->num_extents; i++) {

        *next = g_new0(ImageInfoList, 1);

        (*next)->value = vmdk_get_extent_info(&s->extents[i]);