Commit 1464ad45 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



QAPI patches for 2016-03-04

# gpg: Signature made Sat 05 Mar 2016 09:47:19 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-04:
  qapi: Drop useless 'data' member of unions
  chardev: Drop useless ChardevDummy type
  qapi: Avoid use of 'data' member of QAPI unions
  ui: Shorten references into InputEvent
  util: Shorten references into SocketAddress
  chardev: Shorten references into ChardevBackend
  qapi: Update docs to match recent generator changes
  qapi-visit: Expose visit_type_FOO_members()
  qapi: Rename 'fields' to 'members' in generated C code
  qapi: Rename 'fields' to 'members' in generator
  qapi-dealloc: Reduce use outside of generated code
  qmp-shell: fix pretty printing of JSON responses

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 3c0f12df 48eb62a7

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 = qapi_ChardevDummy_base(backend->u.braille);

    ChardevCommon *common = backend->u.braille;

    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 = qapi_ChardevDummy_base(backend->u.msmouse);

    ChardevCommon *common = backend->u.msmouse;

    CharDriverState *chr;



    chr = qemu_chr_alloc(common, errp);

block/nbd.c

+8 −6
Original line number Diff line number Diff line
@@ -204,18 +204,20 @@ static SocketAddress *nbd_config(BDRVNBDState *s, QDict *options, char **export, 
    saddr = g_new0(SocketAddress, 1);



    if (qdict_haskey(options, "path")) {

        UnixSocketAddress *q_unix;

        saddr->type = SOCKET_ADDRESS_KIND_UNIX;

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

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

        q_unix = saddr->u.q_unix = 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;

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

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

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

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

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

            saddr->u.inet->port = g_strdup_printf("%d", NBD_DEFAULT_PORT);

            inet->port = g_strdup_printf("%d", NBD_DEFAULT_PORT);

        } else {

            saddr->u.inet->port = g_strdup(qdict_get_str(options, "port"));

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

        }

        qdict_del(options, "host");

        qdict_del(options, "port");

blockdev.c

+17 −14
Original line number Diff line number Diff line
@@ -1202,15 +1202,11 @@ void hmp_commit(Monitor *mon, const QDict *qdict) 
    }

}



static void blockdev_do_action(TransactionActionKind type, void *data,

                               Error **errp)

static void blockdev_do_action(TransactionAction *action, Error **errp)

{

    TransactionAction action;

    TransactionActionList list;



    action.type = type;

    action.u.data = data;

    list.value = &action;

    list.value = action;

    list.next = NULL;

    qmp_transaction(&list, false, NULL, errp);

}
@@ -1236,8 +1232,11 @@ void qmp_blockdev_snapshot_sync(bool has_device, const char *device, 
        .has_mode = has_mode,

        .mode = mode,

    };

    blockdev_do_action(TRANSACTION_ACTION_KIND_BLOCKDEV_SNAPSHOT_SYNC,

                       &snapshot, errp);

    TransactionAction action = {

        .type = TRANSACTION_ACTION_KIND_BLOCKDEV_SNAPSHOT_SYNC,

        .u.blockdev_snapshot_sync = &snapshot,

    };

    blockdev_do_action(&action, errp);

}



void qmp_blockdev_snapshot(const char *node, const char *overlay,
@@ -1247,9 +1246,11 @@ void qmp_blockdev_snapshot(const char *node, const char *overlay, 
        .node = (char *) node,

        .overlay = (char *) overlay

    };



    blockdev_do_action(TRANSACTION_ACTION_KIND_BLOCKDEV_SNAPSHOT,

                       &snapshot_data, errp);

    TransactionAction action = {

        .type = TRANSACTION_ACTION_KIND_BLOCKDEV_SNAPSHOT,

        .u.blockdev_snapshot = &snapshot_data,

    };

    blockdev_do_action(&action, errp);

}



void qmp_blockdev_snapshot_internal_sync(const char *device,
@@ -1260,9 +1261,11 @@ void qmp_blockdev_snapshot_internal_sync(const char *device, 
        .device = (char *) device,

        .name = (char *) name

    };



    blockdev_do_action(TRANSACTION_ACTION_KIND_BLOCKDEV_SNAPSHOT_INTERNAL_SYNC,

                       &snapshot, errp);

    TransactionAction action = {

        .type = TRANSACTION_ACTION_KIND_BLOCKDEV_SNAPSHOT_INTERNAL_SYNC,

        .u.blockdev_snapshot_internal_sync = &snapshot,

    };

    blockdev_do_action(&action, errp);

}



SnapshotInfo *qmp_blockdev_snapshot_delete_internal_sync(const char *device,

docs/qapi-code-gen.txt

+178 −162

File changed.

Preview size limit exceeded, changes collapsed.