diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-02-09 14:39:09 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-02-09 14:39:09 +0000 |
| commit | 7e0019a7196ebed177c95824875cf852e1a6f667 (patch) | |
| tree | 0a4e5a411c80a56737354700bb15bf4f7262831d /scripts/qapi-commands.py | |
| parent | f31cd9e4e2172a4807f390194978c61e717791d2 (diff) | |
| parent | 922a01a013d2270682a188258cbccacfecf8129c (diff) | |
| download | focaccia-qemu-7e0019a7196ebed177c95824875cf852e1a6f667.tar.gz focaccia-qemu-7e0019a7196ebed177c95824875cf852e1a6f667.zip | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2018-02-07-v4' into staging
Miscellaneous patches for 2018-02-07 # gpg: Signature made Fri 09 Feb 2018 12:52:51 GMT # gpg: using RSA key 3870B400EB918653 # 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-misc-2018-02-07-v4: Move include qemu/option.h from qemu-common.h to actual users Drop superfluous includes of qapi/qmp/qjson.h Drop superfluous includes of qapi/qmp/dispatch.h Include qapi/qmp/qnull.h exactly where needed Include qapi/qmp/qnum.h exactly where needed Include qapi/qmp/qbool.h exactly where needed Include qapi/qmp/qstring.h exactly where needed Include qapi/qmp/qdict.h exactly where needed Include qapi/qmp/qlist.h exactly where needed Include qapi/qmp/qobject.h exactly where needed qdict qlist: Make most helper macros functions Eliminate qapi/qmp/types.h Typedef the subtypes of QObject in qemu/typedefs.h, too Include qmp-commands.h exactly where needed Drop superfluous includes of qapi/qmp/qerror.h Include qapi/error.h exactly where needed Drop superfluous includes of qapi-types.h and test-qapi-types.h Clean up includes Use #include "..." for our own headers, <...> for others vnc: use stubs for CONFIG_VNC=n dummy functions Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/qapi-commands.py')
| -rw-r--r-- | scripts/qapi-commands.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py index 974d0a4a80..f89d748ba4 100644 --- a/scripts/qapi-commands.py +++ b/scripts/qapi-commands.py @@ -289,14 +289,16 @@ h_comment = ''' c_comment, h_comment) fdef.write(mcgen(''' + #include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/module.h" -#include "qapi/qmp/types.h" #include "qapi/visitor.h" +#include "qapi/qmp/qdict.h" #include "qapi/qobject-output-visitor.h" #include "qapi/qobject-input-visitor.h" #include "qapi/dealloc-visitor.h" +#include "qapi/error.h" #include "%(prefix)sqapi-types.h" #include "%(prefix)sqapi-visit.h" #include "%(prefix)sqmp-commands.h" @@ -306,9 +308,7 @@ fdef.write(mcgen(''' fdecl.write(mcgen(''' #include "%(prefix)sqapi-types.h" -#include "qapi/qmp/qdict.h" #include "qapi/qmp/dispatch.h" -#include "qapi/error.h" void %(c_prefix)sqmp_init_marshal(QmpCommandList *cmds); ''', |