The qobject data type headers have moved from qapi/qmp/ to qobject/. Signed-off-by: Daniel P. Berrangé <berra...@redhat.com> --- migration/dirtyrate.c | 2 +- migration/migration-hmp-cmds.c | 2 +- migration/migration.c | 4 ++-- migration/migration.h | 2 +- migration/options.c | 4 ++-- migration/page_cache.c | 2 +- migration/ram.c | 2 +- migration/savevm.c | 2 +- migration/vmstate.c | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c index 62d86b8be2..a6ec21222d 100644 --- a/migration/dirtyrate.c +++ b/migration/dirtyrate.c @@ -25,7 +25,7 @@ #include "dirtyrate.h" #include "monitor/hmp.h" #include "monitor/monitor.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "sysemu/kvm.h" #include "sysemu/runstate.h" #include "exec/memory.h" diff --git a/migration/migration-hmp-cmds.c b/migration/migration-hmp-cmds.c index 99710c8ffb..fda69726f6 100644 --- a/migration/migration-hmp-cmds.c +++ b/migration/migration-hmp-cmds.c @@ -21,7 +21,7 @@ #include "qapi/error.h" #include "qapi/qapi-commands-migration.h" #include "qapi/qapi-visit-migration.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qapi/string-input-visitor.h" #include "qapi/string-output-visitor.h" #include "qemu/cutils.h" diff --git a/migration/migration.c b/migration/migration.c index 3ce04b2aaf..2eb6341b49 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -43,8 +43,8 @@ #include "qapi/qapi-visit-sockets.h" #include "qapi/qapi-commands-migration.h" #include "qapi/qapi-events-migration.h" -#include "qapi/qmp/qerror.h" -#include "qapi/qmp/qnull.h" +#include "qobject/qerror.h" +#include "qobject/qnull.h" #include "qemu/rcu.h" #include "block.h" #include "postcopy-ram.h" diff --git a/migration/migration.h b/migration/migration.h index cf2c9c88e0..e1e4b3e8d9 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -17,7 +17,7 @@ #include "exec/cpu-common.h" #include "hw/qdev-core.h" #include "qapi/qapi-types-migration.h" -#include "qapi/qmp/json-writer.h" +#include "qobject/json-writer.h" #include "qemu/thread.h" #include "qemu/coroutine_int.h" #include "io/channel.h" diff --git a/migration/options.c b/migration/options.c index 8d8ec73ad9..66b980a102 100644 --- a/migration/options.c +++ b/migration/options.c @@ -18,8 +18,8 @@ #include "qapi/error.h" #include "qapi/qapi-commands-migration.h" #include "qapi/qapi-visit-migration.h" -#include "qapi/qmp/qerror.h" -#include "qapi/qmp/qnull.h" +#include "qobject/qerror.h" +#include "qobject/qnull.h" #include "sysemu/runstate.h" #include "migration/colo.h" #include "migration/misc.h" diff --git a/migration/page_cache.c b/migration/page_cache.c index 6d4f7a9bbc..f262f90675 100644 --- a/migration/page_cache.c +++ b/migration/page_cache.c @@ -14,7 +14,7 @@ #include "qemu/osdep.h" -#include "qapi/qmp/qerror.h" +#include "qobject/qerror.h" #include "qapi/error.h" #include "qemu/host-utils.h" #include "page_cache.h" diff --git a/migration/ram.c b/migration/ram.c index 8c7886ab79..8cc1626351 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -47,7 +47,7 @@ #include "qapi/qapi-types-migration.h" #include "qapi/qapi-events-migration.h" #include "qapi/qapi-commands-migration.h" -#include "qapi/qmp/qerror.h" +#include "qobject/qerror.h" #include "trace.h" #include "exec/ram_addr.h" #include "exec/target_page.h" diff --git a/migration/savevm.c b/migration/savevm.c index c8d08fa079..bdc30caf5b 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -45,7 +45,7 @@ #include "qapi/qapi-commands-migration.h" #include "qapi/clone-visitor.h" #include "qapi/qapi-builtin-visit.h" -#include "qapi/qmp/qerror.h" +#include "qobject/qerror.h" #include "qemu/error-report.h" #include "sysemu/cpus.h" #include "exec/memory.h" diff --git a/migration/vmstate.c b/migration/vmstate.c index ef26f26ccd..2e439a7336 100644 --- a/migration/vmstate.c +++ b/migration/vmstate.c @@ -15,7 +15,7 @@ #include "migration/vmstate.h" #include "savevm.h" #include "qapi/error.h" -#include "qapi/qmp/json-writer.h" +#include "qobject/json-writer.h" #include "qemu-file.h" #include "qemu/bitops.h" #include "qemu/error-report.h" -- 2.43.0
