diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-03-06 11:53:27 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-03-06 11:53:27 +0000 |
| commit | 1464ad45cd6cdeb0b5c1a54d3d3791396e47e52f (patch) | |
| tree | 12e5fa81ad1f1cf455c598a5351c1b4248b38b84 /numa.c | |
| parent | 3c0f12df65da872d5fbccae469f2cb21ed1c03b7 (diff) | |
| parent | 48eb62a74fc2d6b0ae9e5f414304a85cfbf33066 (diff) | |
| download | focaccia-qemu-1464ad45cd6cdeb0b5c1a54d3d3791396e47e52f.tar.gz focaccia-qemu-1464ad45cd6cdeb0b5c1a54d3d3791396e47e52f.zip | |
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: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'numa.c')
| -rw-r--r-- | numa.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/numa.c b/numa.c index 4c4f7f572e..da27bf8d4f 100644 --- a/numa.c +++ b/numa.c @@ -31,7 +31,6 @@ #include "include/exec/cpu-common.h" /* for RAM_ADDR_FMT */ #include "qapi-visit.h" #include "qapi/opts-visitor.h" -#include "qapi/dealloc-visitor.h" #include "hw/boards.h" #include "sysemu/hostmem.h" #include "qmp-commands.h" @@ -243,13 +242,7 @@ static int parse_numa(void *opaque, QemuOpts *opts, Error **errp) error: error_report_err(err); - - if (object) { - QapiDeallocVisitor *dv = qapi_dealloc_visitor_new(); - visit_type_NumaOptions(qapi_dealloc_get_visitor(dv), NULL, &object, - NULL); - qapi_dealloc_visitor_cleanup(dv); - } + qapi_free_NumaOptions(object); return -1; } |