The qobject data type headers have moved from qapi/qmp/ to qobject/. Signed-off-by: Daniel P. Berrangé <berra...@redhat.com> --- qga/commands-bsd.c | 2 +- qga/commands-posix.c | 2 +- qga/commands-win32.c | 2 +- qga/commands.c | 2 +- qga/guest-agent-core.h | 2 +- qga/main.c | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/qga/commands-bsd.c b/qga/commands-bsd.c index 17bddda1cf..fed97203ff 100644 --- a/qga/commands-bsd.c +++ b/qga/commands-bsd.c @@ -12,7 +12,7 @@ #include "qemu/osdep.h" #include "qga-qapi-commands.h" -#include "qapi/qmp/qerror.h" +#include "qobject/qerror.h" #include "qapi/error.h" #include "qemu/queue.h" #include "commands-common.h" diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 6169bbf7a0..316a658be2 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -18,7 +18,7 @@ #include <dirent.h> #include "qga-qapi-commands.h" #include "qapi/error.h" -#include "qapi/qmp/qerror.h" +#include "qobject/qerror.h" #include "qemu/host-utils.h" #include "qemu/sockets.h" #include "qemu/base64.h" diff --git a/qga/commands-win32.c b/qga/commands-win32.c index 697c65507c..116cc798c6 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -32,7 +32,7 @@ #include "vss-win32.h" #include "qga-qapi-commands.h" #include "qapi/error.h" -#include "qapi/qmp/qerror.h" +#include "qobject/qerror.h" #include "qemu/queue.h" #include "qemu/host-utils.h" #include "qemu/base64.h" diff --git a/qga/commands.c b/qga/commands.c index 88c1c99fe5..5438474ae5 100644 --- a/qga/commands.c +++ b/qga/commands.c @@ -15,7 +15,7 @@ #include "guest-agent-core.h" #include "qga-qapi-commands.h" #include "qapi/error.h" -#include "qapi/qmp/qerror.h" +#include "qobject/qerror.h" #include "qemu/base64.h" #include "qemu/cutils.h" #include "commands-common.h" diff --git a/qga/guest-agent-core.h b/qga/guest-agent-core.h index b4e7c52c61..a536d07d0d 100644 --- a/qga/guest-agent-core.h +++ b/qga/guest-agent-core.h @@ -13,7 +13,7 @@ #ifndef GUEST_AGENT_CORE_H #define GUEST_AGENT_CORE_H -#include "qapi/qmp/dispatch.h" +#include "qapi/qmp-registry.h" #include "qga-qapi-types.h" #define QGA_READ_COUNT_DEFAULT 4096 diff --git a/qga/main.c b/qga/main.c index 8668b9f3d3..43e7e3a8f0 100644 --- a/qga/main.c +++ b/qga/main.c @@ -19,9 +19,9 @@ #include <sys/wait.h> #endif #include "qemu/help-texts.h" -#include "qapi/qmp/json-parser.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qjson.h" +#include "qobject/json-parser.h" +#include "qobject/qdict.h" +#include "qobject/qjson.h" #include "guest-agent-core.h" #include "qga-qapi-init-commands.h" #include "qapi/error.h" -- 2.43.0