qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] c7eb39: qapi: Improve use of qmp/types.h


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] c7eb39: qapi: Improve use of qmp/types.h
Date: Wed, 06 Jul 2016 05:00:05 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: c7eb39cbd4304ca55c760c0cb33ce235c457546c
      
https://github.com/qemu/qemu/commit/c7eb39cbd4304ca55c760c0cb33ce235c457546c
  Author: Eric Blake <address@hidden>
  Date:   2016-07-06 (Wed, 06 Jul 2016)

  Changed paths:
    M hw/pci/pcie_aer.c
    M include/qapi/qmp/types.h
    M monitor.c
    M qapi/qmp-dispatch.c
    M qobject/json-parser.c
    M qobject/qjson.c
    M qobject/qobject.c
    M tests/check-qjson.c
    M tests/test-qmp-input-strict.c
    M tests/test-qmp-input-visitor.c
    M tests/test-qmp-output-visitor.c
    M tests/test-visitor-serialization.c

  Log Message:
  -----------
  qapi: Improve use of qmp/types.h

'qjson.h' is not a QObject subtype; include this file directly in
.c files that are using it, rather than abusing qmp/types.h for
that purpose.

Meanwhile, for files that include a list of individual QObject
subtypes, it's easier to just use qmp/types.h for that purpose.

Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: 911ee36d411ee9b3540855642b53219b6a974992
      
https://github.com/qemu/qemu/commit/911ee36d411ee9b3540855642b53219b6a974992
  Author: Eric Blake <address@hidden>
  Date:   2016-07-06 (Wed, 06 Jul 2016)

  Changed paths:
    M qemu-img.c

  Log Message:
  -----------
  qemu-img: Don't leak errors when outputting JSON

If our JSON output ever encounters an error, we would just silently
leak the error object.  Instead, assert that our usage won't fail.

Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: 1158bb2a058fcdd0c8fc3e60dc77f7a57ddbb271
      
https://github.com/qemu/qemu/commit/1158bb2a058fcdd0c8fc3e60dc77f7a57ddbb271
  Author: Eric Blake <address@hidden>
  Date:   2016-07-06 (Wed, 06 Jul 2016)

  Changed paths:
    M block/crypto.c
    M docs/qapi-code-gen.txt
    M hw/ppc/spapr_drc.c
    M hw/virtio/virtio-balloon.c
    M include/qapi/visitor-impl.h
    M include/qapi/visitor.h
    M qapi/opts-visitor.c
    M qapi/qapi-dealloc-visitor.c
    M qapi/qapi-visit-core.c
    M qapi/qmp-input-visitor.c
    M qapi/qmp-output-visitor.c
    M qapi/string-input-visitor.c
    M qapi/string-output-visitor.c
    M qom/object.c
    M qom/object_interfaces.c
    M scripts/qapi-commands.py
    M scripts/qapi-event.py
    M scripts/qapi-visit.py
    M tests/test-qmp-input-visitor.c
    M tests/test-qmp-output-visitor.c

  Log Message:
  -----------
  qapi: Add parameter to visit_end_*

Rather than making the dealloc visitor track of stack of pointers
remembered during visit_start_* in order to free them during
visit_end_*, it's a lot easier to just make all callers pass the
same pointer to visit_end_*.  The generated code has access to the
same pointer, while all other users are doing virtual walks and
can pass NULL.  The dealloc visitor is then greatly simplified.

All three visit_end_*() functions intentionally take a void**,
even though the visit_start_*() functions differ between void**,
GenericList**, and GenericAlternate**.  This is done for several
reasons: when doing a virtual walk, passing NULL doesn't care
what the type is, but when doing a generated walk, we already
have to cast the caller's specific FOO* to call visit_start,
while using void** lets us use visit_end without a cast. Also,
an upcoming patch will add a clone visitor that wants to use
the same implementation for all three visit_end callbacks,
which is made easier if all three share the same signature.

For visitors with already track per-object state (the QMP visitors
via a stack, and the string visitors which do not allow nesting),
add an assertion that the caller is indeed passing the same
pointer to paired calls.

Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: 2c0ef9f411ae6081efa9eca5b3eab2dbeee45a6c
      
https://github.com/qemu/qemu/commit/2c0ef9f411ae6081efa9eca5b3eab2dbeee45a6c
  Author: Eric Blake <address@hidden>
  Date:   2016-07-06 (Wed, 06 Jul 2016)

  Changed paths:
    M docs/qapi-code-gen.txt
    M include/qapi/dealloc-visitor.h
    M include/qapi/visitor-impl.h
    M include/qapi/visitor.h
    M qapi/opts-visitor.c
    M qapi/qapi-dealloc-visitor.c
    M qapi/qapi-visit-core.c
    M qapi/qmp-input-visitor.c
    M qapi/qmp-output-visitor.c
    M qapi/string-input-visitor.c
    M qapi/string-output-visitor.c
    M scripts/qapi-commands.py
    M scripts/qapi-event.py
    M scripts/qapi-types.py
    M tests/test-visitor-serialization.c

  Log Message:
  -----------
  qapi: Add new visit_free() function

Making each visitor provide its own (awkwardly-named) FOO_cleanup()
is unusual, when we can instead have a polymorphic visit_free()
interface.  Over the next few patches, we can use the polymorphic
functions to eliminate the need for a FOO_get_visitor() function
for accessing specific visitor functionality, once everything can
be accessed directly through the Visitor* interfaces.

The dealloc visitor is the first one converted to completely use
the new entry point, since qapi_dealloc_visitor_cleanup() was the
only reason that qapi_dealloc_get_visitor() existed, and only
generated and testsuite code was even using it.  With the new
visit_free() entry point in place, we no longer need to expose
the QapiDeallocVisitor subtype through qapi_dealloc_visitor_new(),
and can get by with less generated code, with diffs that look like:

| void qapi_free_ACPIOSTInfo(ACPIOSTInfo *obj)
| {
|-    QapiDeallocVisitor *qdv;
|     Visitor *v;
|
|     if (!obj) {
|         return;
|     }
|
|-    qdv = qapi_dealloc_visitor_new();
|-    v = qapi_dealloc_get_visitor(qdv);
|+    v = qapi_dealloc_visitor_new();
|     visit_type_ACPIOSTInfo(v, NULL, &obj, NULL);
|-    qapi_dealloc_visitor_cleanup(qdv);
|+    visit_free(v);
|}

Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: 09204eac9bb513e56992c00c75f32f9d4766256b
      
https://github.com/qemu/qemu/commit/09204eac9bb513e56992c00c75f32f9d4766256b
  Author: Eric Blake <address@hidden>
  Date:   2016-07-06 (Wed, 06 Jul 2016)

  Changed paths:
    M block/crypto.c
    M hmp.c
    M hw/acpi/core.c
    M include/qapi/opts-visitor.h
    M net/net.c
    M numa.c
    M qapi/opts-visitor.c
    M qom/object_interfaces.c
    M tests/test-opts-visitor.c

  Log Message:
  -----------
  opts-visitor: Favor new visit_free() function

Now that we have a polymorphic visit_free(), we no longer need
opts_visitor_cleanup(); which in turn means we no longer need
to return a subtype from opts_visitor_new() nor a public upcast
function.

Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: 7a0525c7be6b38d32d586e3fd12e7377ded21faa
      
https://github.com/qemu/qemu/commit/7a0525c7be6b38d32d586e3fd12e7377ded21faa
  Author: Eric Blake <address@hidden>
  Date:   2016-07-06 (Wed, 06 Jul 2016)

  Changed paths:
    M include/qapi/string-input-visitor.h
    M qapi/string-input-visitor.c
    M qom/object.c
    M tests/test-string-input-visitor.c
    M tests/test-visitor-serialization.c

  Log Message:
  -----------
  string-input-visitor: Favor new visit_free() function

Now that we have a polymorphic visit_free(), we no longer need
string_input_visitor_cleanup(); which in turn means we no longer
need to return a subtype from string_input_visitor_new() nor a
public upcast function.

Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: b70ce1018a251c0c33498d9c927a07cade655a5e
      
https://github.com/qemu/qemu/commit/b70ce1018a251c0c33498d9c927a07cade655a5e
  Author: Eric Blake <address@hidden>
  Date:   2016-07-06 (Wed, 06 Jul 2016)

  Changed paths:
    M docs/qapi-code-gen.txt
    M include/qapi/qmp-input-visitor.h
    M qapi/qmp-input-visitor.c
    M qmp.c
    M qom/qom-qobject.c
    M replay/replay-input.c
    M scripts/qapi-commands.py
    M tests/check-qnull.c
    M tests/test-qmp-commands.c
    M tests/test-qmp-input-strict.c
    M tests/test-qmp-input-visitor.c
    M tests/test-visitor-serialization.c
    M util/qemu-sockets.c

  Log Message:
  -----------
  qmp-input-visitor: Favor new visit_free() function

Now that we have a polymorphic visit_free(), we no longer need
qmp_input_visitor_cleanup(); which in turn means we no longer
need to return a subtype from qmp_input_visitor_new() nor a
public upcast function.

Generated code changes to qmp-marshal.c look like:

|@@ -52,11 +52,10 @@ void qmp_marshal_add_fd(QDict *args, QOb
| {
|     Error *err = NULL;
|     AddfdInfo *retval;
|-    QmpInputVisitor *qiv = qmp_input_visitor_new(QOBJECT(args), true);
|     Visitor *v;
|     q_obj_add_fd_arg arg = {0};
|
|-    v = qmp_input_get_visitor(qiv);
|+    v = qmp_input_visitor_new(QOBJECT(args), true);
|     visit_start_struct(v, NULL, NULL, 0, &err);
|     if (err) {
|         goto out;

Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: e7ca56562990991bc614a43b9351ee0737f3045d
      
https://github.com/qemu/qemu/commit/e7ca56562990991bc614a43b9351ee0737f3045d
  Author: Eric Blake <address@hidden>
  Date:   2016-07-06 (Wed, 06 Jul 2016)

  Changed paths:
    M hmp.c
    M include/qapi/string-output-visitor.h
    M net/net.c
    M qapi/string-output-visitor.c
    M qom/object.c
    M tests/test-string-output-visitor.c
    M tests/test-visitor-serialization.c

  Log Message:
  -----------
  string-output-visitor: Favor new visit_free() function

Now that we have a polymorphic visit_free(), we no longer need
string_output_visitor_cleanup(); however, we still need to
expose the subtype for string_output_get_string().

Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: 1830f22a6777cedaccd67a08f675d30f7a85ebfd
      
https://github.com/qemu/qemu/commit/1830f22a6777cedaccd67a08f675d30f7a85ebfd
  Author: Eric Blake <address@hidden>
  Date:   2016-07-06 (Wed, 06 Jul 2016)

  Changed paths:
    M block/qapi.c
    M blockdev.c
    M include/qapi/qmp-output-visitor.h
    M qapi/qmp-output-visitor.c
    M qemu-img.c
    M qom/qom-qobject.c
    M replay/replay-input.c
    M tests/check-qnull.c
    M tests/test-qmp-output-visitor.c
    M util/qemu-sockets.c

  Log Message:
  -----------
  qmp-output-visitor: Favor new visit_free() function

Now that we have a polymorphic visit_free(), we no longer need
qmp_output_visitor_cleanup(); however, we still need to
expose the subtype for qmp_output_get_qobject().

Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: a8fff94d28bd2f0db37b2194cbfa197ba998b7f7
      
https://github.com/qemu/qemu/commit/a8fff94d28bd2f0db37b2194cbfa197ba998b7f7
  Author: Eric Blake <address@hidden>
  Date:   2016-07-06 (Wed, 06 Jul 2016)

  Changed paths:
    M tests/test-string-output-visitor.c

  Log Message:
  -----------
  tests: Clean up test-string-output-visitor

Use &error_abort and error_free_or_abort() in more places, use
the generated qapi_free_intList() instead of open-coding it,
reduce the scope of some variables, avoid code duplication
during test setup with visitor_output_setup_internal(), and
copy the visitor_reset() concept from the qmp-output test to
the string-output test.

Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: 23d1705f425ca847f11d92e4363cd7f67f369fd8
      
https://github.com/qemu/qemu/commit/23d1705f425ca847f11d92e4363cd7f67f369fd8
  Author: Eric Blake <address@hidden>
  Date:   2016-07-06 (Wed, 06 Jul 2016)

  Changed paths:
    M tests/test-qmp-output-visitor.c
    M tests/test-string-output-visitor.c

  Log Message:
  -----------
  tests: Factor out common code in qapi output tests

Create a new visitor_get() function to capture common
actions taken in collecting output from an output visitor,
to make it easier to refactor the output visitors in a
later patch.

Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: 3b098d56979d2f7fd707c5be85555d114353a28d
      
https://github.com/qemu/qemu/commit/3b098d56979d2f7fd707c5be85555d114353a28d
  Author: Eric Blake <address@hidden>
  Date:   2016-07-06 (Wed, 06 Jul 2016)

  Changed paths:
    M block/qapi.c
    M blockdev.c
    M docs/qapi-code-gen.txt
    M hmp.c
    M include/qapi/qmp-output-visitor.h
    M include/qapi/string-output-visitor.h
    M include/qapi/visitor-impl.h
    M include/qapi/visitor.h
    M net/net.c
    M qapi/qapi-visit-core.c
    M qapi/qmp-output-visitor.c
    M qapi/string-output-visitor.c
    M qemu-img.c
    M qom/object.c
    M qom/qom-qobject.c
    M replay/replay-input.c
    M scripts/qapi-commands.py
    M scripts/qapi-event.py
    M tests/check-qnull.c
    M tests/test-qmp-output-visitor.c
    M tests/test-string-output-visitor.c
    M tests/test-visitor-serialization.c
    M util/qemu-sockets.c

  Log Message:
  -----------
  qapi: Add new visit_complete() function

Making each output visitor provide its own output collection
function was the only remaining reason for exposing visitor
sub-types to the rest of the code base.  Add a polymorphic
visit_complete() function which is a no-op for input visitors,
and which populates an opaque pointer for output visitors.  For
maximum type-safety, also add a parameter to the output visitor
constructors with a type-correct version of the output pointer,
and assert that the two uses match.

This approach was considered superior to either passing the
output parameter only during construction (action at a distance
during visit_free() feels awkward) or only during visit_complete()
(defeating type safety makes it easier to use incorrectly).

Most callers were function-local, and therefore a mechanical
conversion; the testsuite was a bit trickier, but the previous
cleanup patch minimized the churn here.

The visit_complete() function may be called at most once; doing
so lets us use transfer semantics rather than duplication or
ref-count semantics to get the just-built output back to the
caller, even though it means our behavior is not idempotent.

Generated code is simplified as follows for events:

|@@ -26,7 +26,7 @@ void qapi_event_send_acpi_device_ost(ACP
|     QDict *qmp;
|     Error *err = NULL;
|     QMPEventFuncEmit emit;
|-    QmpOutputVisitor *qov;
|+    QObject *obj;
|     Visitor *v;
|     q_obj_ACPI_DEVICE_OST_arg param = {
|         info
|@@ -39,8 +39,7 @@ void qapi_event_send_acpi_device_ost(ACP
|
|     qmp = qmp_event_build_dict("ACPI_DEVICE_OST");
|
|-    qov = qmp_output_visitor_new();
|-    v = qmp_output_get_visitor(qov);
|+    v = qmp_output_visitor_new(&obj);
|
|     visit_start_struct(v, "ACPI_DEVICE_OST", NULL, 0, &err);
|     if (err) {
|@@ -55,7 +54,8 @@ void qapi_event_send_acpi_device_ost(ACP
|         goto out;
|     }
|
|-    qdict_put_obj(qmp, "data", qmp_output_get_qobject(qov));
|+    visit_complete(v, &obj);
|+    qdict_put_obj(qmp, "data", obj);
|     emit(QAPI_EVENT_ACPI_DEVICE_OST, qmp, &err);

and for commands:

| {
|     Error *err = NULL;
|-    QmpOutputVisitor *qov = qmp_output_visitor_new();
|     Visitor *v;
|
|-    v = qmp_output_get_visitor(qov);
|+    v = qmp_output_visitor_new(ret_out);
|     visit_type_AddfdInfo(v, "unused", &ret_in, &err);
|-    if (err) {
|-        goto out;
|+    if (!err) {
|+        visit_complete(v, ret_out);
|     }
|-    *ret_out = qmp_output_get_qobject(qov);
|-
|-out:
|     error_propagate(errp, err);

Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: a15fcc3cf69ee3d408f60d6cc316488d2b0249b4
      
https://github.com/qemu/qemu/commit/a15fcc3cf69ee3d408f60d6cc316488d2b0249b4
  Author: Eric Blake <address@hidden>
  Date:   2016-07-06 (Wed, 06 Jul 2016)

  Changed paths:
    A include/qapi/clone-visitor.h
    M include/qapi/visitor-impl.h
    M include/qapi/visitor.h
    M qapi/Makefile.objs
    A qapi/qapi-clone-visitor.c
    M qapi/qapi-visit-core.c
    M tests/.gitignore
    M tests/Makefile.include
    A tests/test-clone-visitor.c

  Log Message:
  -----------
  qapi: Add new clone visitor

We have a couple places in the code base that want to deep-clone
one QAPI object into another, and they were resorting to serializing
the struct out to QObject then reparsing it.  A much more efficient
version can be done by adding a new clone visitor.

Since cloning is still relatively uncommon, expose the use of the
new visitor via a QAPI_CLONE() macro that takes care of type-punning
the underlying function pointer, rather than generating lots of
unused functions for types that won't be cloned.  And yes, we're
relying on the compiler treating all pointers equally, even though
a strict C program cannot portably do so - but we're not the first
one in the qemu code base to expect it to work (hello, glib!).

The choice of adding a fourth visitor type deserves some explanation.
On the surface, the clone visitor is mostly an input visitor (it
takes arbitrary input - in this case, another QAPI object - and
creates a new QAPI object during the course of the visit).  But
ever since commit da72ab0 consolidated enum visits based on the
visitor type, using VISITOR_INPUT would cause us to run
visit_type_str(), even though for cloning there is nothing to do
(we just copy the enum value across, without regards to its mapping
to strings).   Also, since our input happens to be a QAPI object,
we can also satisfy the internal checks for VISITOR_OUTPUT.  So in
the end, I settled with a new VISITOR_CLONE, and chose its value
such that many internal checks can use 'v->type & mask', sticking
to 'v->type == value' where the difference matters.

Note that we can only clone objects (including alternates) and lists,
not built-ins or enums.  The visitor core hides integer width from
the actual visitor (since commit 04e070d), and as long as that's the
case, we can't clone top-level integers.  Then again, those can
always be cloned by direct copy, since they are not objects with
deep pointers, so it's no real loss.  And restricting cloning to
just objects and lists is cleaner than restricting it to non-integers.
As such, I documented that the clone visitor is for direct use only
by code internal to QAPI, and should not be used on incomplete objects
(other than a hack to work around the fact that we allow NULL in place
of "" in visit_type_str() in other output visitors).  Note that as
written, the clone visitor will never fail on a complete object.

Scalars (including enums) not at the root of the clone copy just fine
with no additional effort while visiting the scalar, by virtue of a
g_memdup() each time we push another struct onto the stack.  Cloning
a string requires deduplication of a pointer, which means it can also
provide the guarantee of an input visitor of never producing NULL
even when still accepting NULL in place of "" the way the QMP output
visitor does.

Cloning an 'any' type could be possible by incrementing the QObject
refcnt, but it's not obvious whether that is better than implementing
a QObject deep clone.  So for now, we document it as unsupported,
and intentionally omit the .type_any() callback to let a developer
know their usage needs implementation.

Add testsuite coverage for several different clone situations, to
ensure that the code is working.  I also tested that valgrind was
happy with the test.

Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: 37f9e0a2b65a6dd5fe09cb0023b8001014aaaf01
      
https://github.com/qemu/qemu/commit/37f9e0a2b65a6dd5fe09cb0023b8001014aaaf01
  Author: Eric Blake <address@hidden>
  Date:   2016-07-06 (Wed, 06 Jul 2016)

  Changed paths:
    M include/io/task.h
    M include/qapi/clone-visitor.h
    M include/qemu/sockets.h
    M io/channel-socket.c
    M qemu-char.c
    M util/qemu-sockets.c

  Log Message:
  -----------
  sockets: Use new QAPI cloning

Rather than rolling our own clone via an expensive conversion
in and back out of QObject, use the new clone visitor.

Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: b6954712abea03afd686b724060f9873e2c61f2b
      
https://github.com/qemu/qemu/commit/b6954712abea03afd686b724060f9873e2c61f2b
  Author: Eric Blake <address@hidden>
  Date:   2016-07-06 (Wed, 06 Jul 2016)

  Changed paths:
    M replay/replay-input.c

  Log Message:
  -----------
  replay: Use new QAPI cloning

Rather than rolling our own clone via an expensive conversion
in and back out of QObject, use the new clone visitor.

Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: 975b1c3ac6ae57b3e1356b0156c68f63a8a349dc
      
https://github.com/qemu/qemu/commit/975b1c3ac6ae57b3e1356b0156c68f63a8a349dc
  Author: Peter Maydell <address@hidden>
  Date:   2016-07-06 (Wed, 06 Jul 2016)

  Changed paths:
    M block/crypto.c
    M block/qapi.c
    M blockdev.c
    M docs/qapi-code-gen.txt
    M hmp.c
    M hw/acpi/core.c
    M hw/pci/pcie_aer.c
    M hw/ppc/spapr_drc.c
    M hw/virtio/virtio-balloon.c
    M include/io/task.h
    A include/qapi/clone-visitor.h
    M include/qapi/dealloc-visitor.h
    M include/qapi/opts-visitor.h
    M include/qapi/qmp-input-visitor.h
    M include/qapi/qmp-output-visitor.h
    M include/qapi/qmp/types.h
    M include/qapi/string-input-visitor.h
    M include/qapi/string-output-visitor.h
    M include/qapi/visitor-impl.h
    M include/qapi/visitor.h
    M include/qemu/sockets.h
    M io/channel-socket.c
    M monitor.c
    M net/net.c
    M numa.c
    M qapi/Makefile.objs
    M qapi/opts-visitor.c
    A qapi/qapi-clone-visitor.c
    M qapi/qapi-dealloc-visitor.c
    M qapi/qapi-visit-core.c
    M qapi/qmp-dispatch.c
    M qapi/qmp-input-visitor.c
    M qapi/qmp-output-visitor.c
    M qapi/string-input-visitor.c
    M qapi/string-output-visitor.c
    M qemu-char.c
    M qemu-img.c
    M qmp.c
    M qobject/json-parser.c
    M qobject/qjson.c
    M qobject/qobject.c
    M qom/object.c
    M qom/object_interfaces.c
    M qom/qom-qobject.c
    M replay/replay-input.c
    M scripts/qapi-commands.py
    M scripts/qapi-event.py
    M scripts/qapi-types.py
    M scripts/qapi-visit.py
    M tests/.gitignore
    M tests/Makefile.include
    M tests/check-qjson.c
    M tests/check-qnull.c
    A tests/test-clone-visitor.c
    M tests/test-opts-visitor.c
    M tests/test-qmp-commands.c
    M tests/test-qmp-input-strict.c
    M tests/test-qmp-input-visitor.c
    M tests/test-qmp-output-visitor.c
    M tests/test-string-input-visitor.c
    M tests/test-string-output-visitor.c
    M tests/test-visitor-serialization.c
    M util/qemu-sockets.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2016-07-06' into 
staging

QAPI patches for 2016-07-06

# gpg: Signature made Wed 06 Jul 2016 10:00:51 BST
# gpg:                using RSA key 0x3870B400EB918653
# gpg: Good signature from "Markus Armbruster <address@hidden>"
# gpg:                 aka "Markus Armbruster <address@hidden>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-qapi-2016-07-06:
  replay: Use new QAPI cloning
  sockets: Use new QAPI cloning
  qapi: Add new clone visitor
  qapi: Add new visit_complete() function
  tests: Factor out common code in qapi output tests
  tests: Clean up test-string-output-visitor
  qmp-output-visitor: Favor new visit_free() function
  string-output-visitor: Favor new visit_free() function
  qmp-input-visitor: Favor new visit_free() function
  string-input-visitor: Favor new visit_free() function
  opts-visitor: Favor new visit_free() function
  qapi: Add new visit_free() function
  qapi: Add parameter to visit_end_*
  qemu-img: Don't leak errors when outputting JSON
  qapi: Improve use of qmp/types.h

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/fc5d0a2b243a...975b1c3ac6ae

reply via email to

[Prev in Thread] Current Thread [Next in Thread]