diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2019-06-12 13:50:01 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2019-06-12 13:50:02 +0100 |
commit | 59c58f96b270f5edd4ad10954c3a96556cb3a728 (patch) | |
tree | 005ac413277b8b88a2a580eab2d10d45f25d2fc8 /qapi | |
parent | d3e3413bd6a8c0287dbad8942e208d562fd8e29e (diff) | |
parent | 84995ea21935403cc9d57b6cb7dddcac5fa02c1c (diff) |
Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2019-06-11-v3' into staging
Miscellaneous patches for 2019-06-11
# gpg: Signature made Wed 12 Jun 2019 12:20:41 BST
# gpg: using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg: issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-misc-2019-06-11-v3:
MAINTAINERS: Polish headline decorations
MAINTAINERS: Improve section headlines
MAINTAINERS: Remove duplicate entries of qemu-devel@nongnu.org
Clean up a header guard symbols (again)
Supply missing header guards
Clean up a few header guard symbols
scripts/clean-header-guards: Fix handling of trailing comments
Normalize position of header guard
Include qemu-common.h exactly where needed
Include qemu/module.h where needed, drop it from qemu-common.h
qemu-common: Move qemu_isalnum() etc. to qemu/ctype.h
qemu-common: Move tcg_enabled() etc. to sysemu/tcg.h
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qapi')
-rw-r--r-- | qapi/qapi-dealloc-visitor.c | 1 | ||||
-rw-r--r-- | qapi/qapi-util.c | 2 | ||||
-rw-r--r-- | qapi/qapi-visit-core.c | 1 | ||||
-rw-r--r-- | qapi/qmp-event.c | 1 | ||||
-rw-r--r-- | qapi/qobject-input-visitor.c | 1 | ||||
-rw-r--r-- | qapi/qobject-output-visitor.c | 1 | ||||
-rw-r--r-- | qapi/string-input-visitor.c | 1 |
7 files changed, 1 insertions, 7 deletions
diff --git a/qapi/qapi-dealloc-visitor.c b/qapi/qapi-dealloc-visitor.c index 6b24afd367..89ccd905ec 100644 --- a/qapi/qapi-dealloc-visitor.c +++ b/qapi/qapi-dealloc-visitor.c @@ -16,7 +16,6 @@ #include "qapi/dealloc-visitor.h" #include "qapi/qmp/qnull.h" #include "qemu/queue.h" -#include "qemu-common.h" #include "qapi/visitor-impl.h" struct QapiDeallocVisitor diff --git a/qapi/qapi-util.c b/qapi/qapi-util.c index e9b266bb70..29a6c98b53 100644 --- a/qapi/qapi-util.c +++ b/qapi/qapi-util.c @@ -12,7 +12,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" +#include "qemu/ctype.h" const char *qapi_enum_lookup(const QEnumLookup *lookup, int val) { diff --git a/qapi/qapi-visit-core.c b/qapi/qapi-visit-core.c index d9a113726f..5365561b07 100644 --- a/qapi/qapi-visit-core.c +++ b/qapi/qapi-visit-core.c @@ -14,7 +14,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "qapi/qmp/qerror.h" #include "qapi/visitor.h" #include "qapi/visitor-impl.h" diff --git a/qapi/qmp-event.c b/qapi/qmp-event.c index 81ddd5331f..19d3cd0038 100644 --- a/qapi/qmp-event.c +++ b/qapi/qmp-event.c @@ -13,7 +13,6 @@ #include "qemu/osdep.h" -#include "qemu-common.h" #include "qapi/qmp-event.h" #include "qapi/qmp/qstring.h" #include "qapi/qmp/qdict.h" diff --git a/qapi/qobject-input-visitor.c b/qapi/qobject-input-visitor.c index 07465f9947..32236cbcb1 100644 --- a/qapi/qobject-input-visitor.c +++ b/qapi/qobject-input-visitor.c @@ -18,7 +18,6 @@ #include "qapi/qobject-input-visitor.h" #include "qapi/visitor-impl.h" #include "qemu/queue.h" -#include "qemu-common.h" #include "qapi/qmp/qjson.h" #include "qapi/qmp/qbool.h" #include "qapi/qmp/qdict.h" diff --git a/qapi/qobject-output-visitor.c b/qapi/qobject-output-visitor.c index 89ffd8a7bf..26d7be5ec9 100644 --- a/qapi/qobject-output-visitor.c +++ b/qapi/qobject-output-visitor.c @@ -16,7 +16,6 @@ #include "qapi/qobject-output-visitor.h" #include "qapi/visitor-impl.h" #include "qemu/queue.h" -#include "qemu-common.h" #include "qapi/qmp/qbool.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qlist.h" diff --git a/qapi/string-input-visitor.c b/qapi/string-input-visitor.c index bd92080667..9be418b6d6 100644 --- a/qapi/string-input-visitor.c +++ b/qapi/string-input-visitor.c @@ -12,7 +12,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "qapi/string-input-visitor.h" #include "qapi/visitor-impl.h" #include "qapi/qmp/qerror.h" |