qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Daniel P. Berrangé" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Markus Armbruster" <armbru@redhat.com>,
	"Daniel P. Berrangé" <berrange@redhat.com>
Subject: [PATCH v2 11/31] migration: adapt to new import path for qobject data type headers
Date: Thu, 17 Oct 2024 12:33:23 +0100	[thread overview]
Message-ID: <20241017113344.883424-12-berrange@redhat.com> (raw)
In-Reply-To: <20241017113344.883424-1-berrange@redhat.com>

The qobject data type headers have moved from qapi/qmp/ to
qobject/.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 migration/dirtyrate.c          | 2 +-
 migration/migration-hmp-cmds.c | 2 +-
 migration/migration.c          | 2 +-
 migration/migration.h          | 2 +-
 migration/options.c            | 2 +-
 migration/vmstate.c            | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c
index 233acb0855..14b28a59fc 100644
--- a/migration/dirtyrate.c
+++ b/migration/dirtyrate.c
@@ -24,7 +24,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 20d1a6e219..69c86780e3 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 021faee2f3..b615f93a1a 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -43,7 +43,7 @@
 #include "qapi/qapi-commands-migration.h"
 #include "qapi/qapi-events-migration.h"
 #include "qapi/qmp/qerror.h"
-#include "qapi/qmp/qnull.h"
+#include "qobject/qnull.h"
 #include "qemu/rcu.h"
 #include "postcopy-ram.h"
 #include "qemu/thread.h"
diff --git a/migration/migration.h b/migration/migration.h
index 38aa1402d5..c61c259a1c 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.h"
 #include "io/channel.h"
diff --git a/migration/options.c b/migration/options.c
index ad8d6989a8..4bfa2ac236 100644
--- a/migration/options.c
+++ b/migration/options.c
@@ -19,7 +19,7 @@
 #include "qapi/qapi-commands-migration.h"
 #include "qapi/qapi-visit-migration.h"
 #include "qapi/qmp/qerror.h"
-#include "qapi/qmp/qnull.h"
+#include "qobject/qnull.h"
 #include "sysemu/runstate.h"
 #include "migration/colo.h"
 #include "migration/misc.h"
diff --git a/migration/vmstate.c b/migration/vmstate.c
index ff5d589a6d..82d64a6988 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.46.0



  parent reply	other threads:[~2024-10-17 11:36 UTC|newest]

Thread overview: 68+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-17 11:33 [PATCH v2 00/31] include: move include/qapi/qmp/ to include/qobject/ Daniel P. Berrangé
2024-10-17 11:33 ` [PATCH v2 01/31] " Daniel P. Berrangé
2024-10-18  9:47   ` Zhao Liu
2024-11-14 14:30   ` Markus Armbruster
2024-11-15 17:51     ` Daniel P. Berrangé
2024-10-17 11:33 ` [PATCH v2 02/31] audio: adapt to new import path for qobject data type headers Daniel P. Berrangé
2024-10-18  9:48   ` Zhao Liu
2024-10-17 11:33 ` [PATCH v2 03/31] authz: " Daniel P. Berrangé
2024-10-18  9:48   ` Zhao Liu
2024-10-17 11:33 ` [PATCH v2 04/31] block: " Daniel P. Berrangé
2024-10-18  9:51   ` Zhao Liu
2024-10-17 11:33 ` [PATCH v2 05/31] backends: " Daniel P. Berrangé
2024-10-18  9:51   ` Zhao Liu
2024-10-17 11:33 ` [PATCH v2 06/31] chardev: " Daniel P. Berrangé
2024-10-18  9:52   ` Zhao Liu
2024-10-17 11:33 ` [PATCH v2 07/31] docs: " Daniel P. Berrangé
2024-10-18  9:52   ` Zhao Liu
2024-10-17 11:33 ` [PATCH v2 08/31] dump: " Daniel P. Berrangé
2024-10-18  9:53   ` Zhao Liu
2024-10-17 11:33 ` [PATCH v2 09/31] hw: " Daniel P. Berrangé
2024-10-17 20:38   ` Halil Pasic
2024-10-18  9:54   ` Zhao Liu
2024-10-17 11:33 ` [PATCH v2 10/31] include: " Daniel P. Berrangé
2024-10-18  9:55   ` Zhao Liu
2024-10-17 11:33 ` Daniel P. Berrangé [this message]
2024-10-18  9:56   ` [PATCH v2 11/31] migration: " Zhao Liu
2024-10-17 11:33 ` [PATCH v2 12/31] monitor: " Daniel P. Berrangé
2024-10-18  9:57   ` Zhao Liu
2024-10-17 11:33 ` [PATCH v2 13/31] net: " Daniel P. Berrangé
2024-10-18  9:57   ` Zhao Liu
2024-10-17 11:33 ` [PATCH v2 14/31] qapi: " Daniel P. Berrangé
2024-10-18  9:58   ` Zhao Liu
2024-10-17 11:33 ` [PATCH v2 15/31] qga: " Daniel P. Berrangé
2024-10-18  9:59   ` Zhao Liu
2024-10-17 11:33 ` [PATCH v2 16/31] qobject: " Daniel P. Berrangé
2024-10-18 10:01   ` Zhao Liu
2024-10-17 11:33 ` [PATCH v2 17/31] qom: " Daniel P. Berrangé
2024-10-18 10:01   ` Zhao Liu
2024-10-17 11:33 ` [PATCH v2 18/31] replay: " Daniel P. Berrangé
2024-10-18 10:02   ` Zhao Liu
2024-10-17 11:33 ` [PATCH v2 19/31] scripts: " Daniel P. Berrangé
2024-10-18 10:02   ` Zhao Liu
2024-10-17 11:33 ` [PATCH v2 20/31] scsi: " Daniel P. Berrangé
2024-10-18 10:02   ` Zhao Liu
2024-10-17 11:33 ` [PATCH v2 21/31] stats: " Daniel P. Berrangé
2024-10-18 10:03   ` Zhao Liu
2024-10-17 11:33 ` [PATCH v2 22/31] stubs: " Daniel P. Berrangé
2024-10-18 10:03   ` Zhao Liu
2024-10-17 11:33 ` [PATCH v2 23/31] system: " Daniel P. Berrangé
2024-10-18 10:06   ` Zhao Liu
2024-10-18 10:02     ` Daniel P. Berrangé
2024-10-17 11:33 ` [PATCH v2 24/31] target: " Daniel P. Berrangé
2024-10-18 10:07   ` Zhao Liu
2024-10-17 11:33 ` [PATCH v2 25/31] tests: " Daniel P. Berrangé
2024-10-18 10:12   ` Zhao Liu
2024-10-17 11:33 ` [PATCH v2 26/31] trace: " Daniel P. Berrangé
2024-10-18 10:12   ` Zhao Liu
2024-10-17 11:33 ` [PATCH v2 27/31] ui: " Daniel P. Berrangé
2024-10-18 10:12   ` Zhao Liu
2024-10-17 11:33 ` [PATCH v2 28/31] util: " Daniel P. Berrangé
2024-10-18 10:13   ` Zhao Liu
2024-10-17 11:33 ` [PATCH v2 29/31] qapi: remove header file compatibility symlinks Daniel P. Berrangé
2024-10-18 10:13   ` Zhao Liu
2024-10-17 11:33 ` [PATCH v2 30/31] qga: remove unused qerror.h header Daniel P. Berrangé
2024-10-18 10:14   ` Zhao Liu
2024-10-17 11:33 ` [PATCH v2 31/31] system: " Daniel P. Berrangé
2024-10-18 10:17   ` Zhao Liu
2024-10-18 13:34     ` Daniel P. Berrangé

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20241017113344.883424-12-berrange@redhat.com \
    --to=berrange@redhat.com \
    --cc=armbru@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).