diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-10-25 17:03:11 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-10-25 17:03:11 +0100 |
| commit | ede0cbeb7892bdf4a19128853a3a3c61a17fb068 (patch) | |
| tree | 84400c4830c048177e388504b271aa8408c4ebb6 /qom/object_interfaces.c | |
| parent | 4429532b48a25740817aa0901a4355a5de991e5b (diff) | |
| parent | 603476c25c4d588a557ec2139352028f3157cba4 (diff) | |
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: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qom/object_interfaces.c')
| -rw-r--r-- | qom/object_interfaces.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c index bf598468ab..ded4d84c85 100644 --- a/qom/object_interfaces.c +++ b/qom/object_interfaces.c @@ -3,7 +3,7 @@ #include "qom/object_interfaces.h" #include "qemu/module.h" #include "qapi-visit.h" -#include "qapi/qmp-output-visitor.h" +#include "qapi/qobject-output-visitor.h" #include "qapi/opts-visitor.h" void user_creatable_complete(Object *obj, Error **errp) |