qapi-types.h needs only qemu-common.h. Including qapi-types-core.h causes problems when qerror.h or error.h includes qapi-types.h.
Signed-off-by: Luiz Capitulino <lcapitul...@redhat.com> Reviewed-by: Markus Armbruster <arm...@redhat.com> --- scripts/qapi-types.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py index 4a734f5..3ed9f04 100644 --- a/scripts/qapi-types.py +++ b/scripts/qapi-types.py @@ -253,7 +253,8 @@ fdecl.write(mcgen(''' #ifndef %(guard)s #define %(guard)s -#include "qapi/qapi-types-core.h" +#include "qemu-common.h" + ''', guard=guardname(h_file))) -- 1.7.11.2.249.g31c7954.dirty