From: Markus Armbruster <arm...@redhat.com> Signed-off-by: Markus Armbruster <arm...@redhat.com> Message-Id: <20180211093607.27351-2-arm...@redhat.com> Reviewed-by: Eric Blake <ebl...@redhat.com> Reviewed-by: Marc-André Lureau <marcandre.lur...@redhat.com> Signed-off-by: Eric Blake <ebl...@redhat.com> --- scripts/qapi-visit.py | 2 +- block.c | 1 - block/qcow2.c | 1 - chardev/char-fe.c | 1 + chardev/char.c | 1 + qom/object_interfaces.c | 1 + 6 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py index 7e1cfc13f08..bc2b8b581a0 100644 --- a/scripts/qapi-visit.py +++ b/scripts/qapi-visit.py @@ -371,13 +371,13 @@ fdef.write(mcgen(''' #include "qemu/osdep.h" #include "qemu-common.h" #include "qapi/error.h" +#include "qapi/qmp/qerror.h" #include "%(prefix)sqapi-visit.h" ''', prefix=prefix)) fdecl.write(mcgen(''' #include "qapi/visitor.h" -#include "qapi/qmp/qerror.h" #include "%(prefix)sqapi-types.h" ''', diff --git a/block.c b/block.c index 814e5a02da6..628910f6382 100644 --- a/block.c +++ b/block.c @@ -32,7 +32,6 @@ #include "qemu/module.h" #include "qapi/error.h" #include "qapi/qmp/qdict.h" -#include "qapi/qmp/qerror.h" #include "qapi/qmp/qjson.h" #include "qapi/qmp/qstring.h" #include "sysemu/block-backend.h" diff --git a/block/qcow2.c b/block/qcow2.c index 57a517e2bdd..fd79c0ebaaf 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -30,7 +30,6 @@ #include "block/qcow2.h" #include "qemu/error-report.h" #include "qapi/error.h" -#include "qapi/qmp/qerror.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" #include "qapi-event.h" diff --git a/chardev/char-fe.c b/chardev/char-fe.c index c611b3fa3e0..e5f870e4d21 100644 --- a/chardev/char-fe.c +++ b/chardev/char-fe.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" #include "qapi/error.h" +#include "qapi/qmp/qerror.h" #include "qapi-visit.h" #include "sysemu/replay.h" diff --git a/chardev/char.c b/chardev/char.c index 01d979a1da5..c9a4da55163 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -32,6 +32,7 @@ #include "qmp-commands.h" #include "qapi-visit.h" #include "qapi/error.h" +#include "qapi/qmp/qerror.h" #include "sysemu/replay.h" #include "qemu/help_option.h" #include "qemu/option.h" diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c index 80d09139be0..43d9aa0946d 100644 --- a/qom/object_interfaces.c +++ b/qom/object_interfaces.c @@ -1,6 +1,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qapi/qmp/qdict.h" +#include "qapi/qmp/qerror.h" #include "qom/object_interfaces.h" #include "qemu/module.h" #include "qemu/option.h" -- 2.14.3