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

Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2016-10-25' into staging 



QAPI patches for 2016-10-25

# gpg: Signature made Tue 25 Oct 2016 16:56:27 BST
# gpg:                using RSA key 0x3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-qapi-2016-10-25:
  qdict: implement a qdict_crumple method for un-flattening a dict
  qapi: don't pass two copies of TestInputVisitorData to tests
  qapi: rename QmpOutputVisitor to QObjectOutputVisitor
  qapi: rename QmpInputVisitor to QObjectInputVisitor
  qapi: rename *qmp-*-visitor* to *qobject-*-visitor*
  qapi: add trace events for visitor
  trivial: Restore blank line in qapi-schema

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 4429532b 603476c2

Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -162,3 +162,4 @@ trace-events-y += target-s390x/trace-events 
trace-events-y += target-ppc/trace-events

trace-events-y += qom/trace-events

trace-events-y += linux-user/trace-events

trace-events-y += qapi/trace-events

block/qapi.c

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#include "block/write-threshold.h"

#include "qmp-commands.h"

#include "qapi-visit.h"

#include "qapi/qmp-output-visitor.h"

#include "qapi/qobject-output-visitor.h"

#include "qapi/qmp/types.h"

#include "sysemu/block-backend.h"

#include "qemu/cutils.h"
@@ -691,7 +691,7 @@ void bdrv_image_info_specific_dump(fprintf_function func_fprintf, void *f, 
                                   ImageInfoSpecific *info_spec)

{

    QObject *obj, *data;

    Visitor *v = qmp_output_visitor_new(&obj);

    Visitor *v = qobject_output_visitor_new(&obj);



    visit_type_ImageInfoSpecific(v, NULL, &info_spec, &error_abort);

    visit_complete(v, &obj);

blockdev.c

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
#include "qapi/qmp/types.h"

#include "qapi-visit.h"

#include "qapi/qmp/qerror.h"

#include "qapi/qmp-output-visitor.h"

#include "qapi/qobject-output-visitor.h"

#include "qapi/util.h"

#include "sysemu/sysemu.h"

#include "block/block_int.h"
@@ -3776,7 +3776,7 @@ void qmp_blockdev_add(BlockdevOptions *options, Error **errp) 
{

    BlockDriverState *bs;

    QObject *obj;

    Visitor *v = qmp_output_visitor_new(&obj);

    Visitor *v = qobject_output_visitor_new(&obj);

    QDict *qdict;

    Error *local_err = NULL;

docs/qapi-code-gen.txt

+2 −2
Original line number Diff line number Diff line
@@ -1005,7 +1005,7 @@ Example: 
        Error *err = NULL;

        Visitor *v;



        v = qmp_output_visitor_new(ret_out);

        v = qobject_output_visitor_new(ret_out);

        visit_type_UserDefOne(v, "unused", &ret_in, &err);

        if (!err) {

            visit_complete(v, ret_out);
@@ -1024,7 +1024,7 @@ Example: 
        Visitor *v;

        UserDefOneList *arg1 = NULL;



        v = qmp_input_visitor_new(QOBJECT(args), true);

        v = qobject_input_visitor_new(QOBJECT(args), true);

        visit_start_struct(v, NULL, NULL, 0, &err);

        if (err) {

            goto out;

include/qapi/qmp/qdict.h

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ void qdict_flatten(QDict *qdict); 
void qdict_extract_subqdict(QDict *src, QDict **dst, const char *start);

void qdict_array_split(QDict *src, QList **dst);

int qdict_array_entries(QDict *src, const char *subqdict);

QObject *qdict_crumple(const QDict *src, Error **errp);



void qdict_join(QDict *dest, QDict *src, bool overwrite);