From: "Daniel P. Berrangé" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Markus Armbruster" <armbru@redhat.com>,
"Michael Roth" <michael.roth@amd.com>,
"Daniel P. Berrangé" <berrange@redhat.com>
Subject: [PATCH 23/29] system: adapt to new import path for qobject data type headers
Date: Mon, 8 Jan 2024 18:23:59 +0000 [thread overview]
Message-ID: <20240108182405.1135436-24-berrange@redhat.com> (raw)
In-Reply-To: <20240108182405.1135436-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>
---
system/balloon.c | 2 +-
system/cpus.c | 2 +-
system/device_tree.c | 2 +-
system/dirtylimit.c | 2 +-
system/qdev-monitor.c | 8 ++++----
system/rtc.c | 2 +-
system/runstate-hmp-cmds.c | 2 +-
system/tpm.c | 2 +-
system/vl.c | 8 ++++----
9 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/system/balloon.c b/system/balloon.c
index fda7af832e..0b6220d1d6 100644
--- a/system/balloon.c
+++ b/system/balloon.c
@@ -30,7 +30,7 @@
#include "sysemu/balloon.h"
#include "qapi/error.h"
#include "qapi/qapi-commands-machine.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
#include "trace.h"
static QEMUBalloonEvent *balloon_event_fn;
diff --git a/system/cpus.c b/system/cpus.c
index a444a747f0..f1df174d9a 100644
--- a/system/cpus.c
+++ b/system/cpus.c
@@ -29,7 +29,7 @@
#include "qapi/qapi-commands-machine.h"
#include "qapi/qapi-commands-misc.h"
#include "qapi/qapi-events-run-state.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
#include "exec/gdbstub.h"
#include "sysemu/hw_accel.h"
#include "exec/cpu-common.h"
diff --git a/system/device_tree.c b/system/device_tree.c
index eb5166ca36..045cfece3e 100644
--- a/system/device_tree.c
+++ b/system/device_tree.c
@@ -28,7 +28,7 @@
#include "hw/boards.h"
#include "qemu/config-file.h"
#include "qapi/qapi-commands-machine.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "monitor/hmp.h"
#include <libfdt.h>
diff --git a/system/dirtylimit.c b/system/dirtylimit.c
index 495c7a7082..6ffeff7cdb 100644
--- a/system/dirtylimit.c
+++ b/system/dirtylimit.c
@@ -13,7 +13,7 @@
#include "qemu/osdep.h"
#include "qemu/main-loop.h"
#include "qapi/qapi-commands-migration.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "qapi/error.h"
#include "sysemu/dirtyrate.h"
#include "sysemu/dirtylimit.h"
diff --git a/system/qdev-monitor.c b/system/qdev-monitor.c
index a13db763e5..a66abd4c4c 100644
--- a/system/qdev-monitor.c
+++ b/system/qdev-monitor.c
@@ -25,10 +25,10 @@
#include "sysemu/arch_init.h"
#include "qapi/error.h"
#include "qapi/qapi-commands-qdev.h"
-#include "qapi/qmp/dispatch.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qerror.h"
-#include "qapi/qmp/qstring.h"
+#include "qapi/qmp-registry.h"
+#include "qobject/qdict.h"
+#include "qobject/qerror.h"
+#include "qobject/qstring.h"
#include "qapi/qobject-input-visitor.h"
#include "qemu/config-file.h"
#include "qemu/error-report.h"
diff --git a/system/rtc.c b/system/rtc.c
index 4904581abe..7fb9ec1e4c 100644
--- a/system/rtc.c
+++ b/system/rtc.c
@@ -25,7 +25,7 @@
#include "qemu/osdep.h"
#include "qemu/cutils.h"
#include "qapi/error.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
#include "qemu/error-report.h"
#include "qemu/option.h"
#include "qemu/timer.h"
diff --git a/system/runstate-hmp-cmds.c b/system/runstate-hmp-cmds.c
index 2df670f0c0..be1d676992 100644
--- a/system/runstate-hmp-cmds.c
+++ b/system/runstate-hmp-cmds.c
@@ -19,7 +19,7 @@
#include "monitor/monitor.h"
#include "qapi/error.h"
#include "qapi/qapi-commands-run-state.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "qemu/accel.h"
void hmp_info_status(Monitor *mon, const QDict *qdict)
diff --git a/system/tpm.c b/system/tpm.c
index 7164ea7ff1..fe6782e620 100644
--- a/system/tpm.c
+++ b/system/tpm.c
@@ -16,7 +16,7 @@
#include "qapi/error.h"
#include "qapi/qapi-commands-tpm.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
#include "sysemu/tpm_backend.h"
#include "sysemu/tpm.h"
#include "qemu/config-file.h"
diff --git a/system/vl.c b/system/vl.c
index 6b87bfa32c..810ab180aa 100644
--- a/system/vl.c
+++ b/system/vl.c
@@ -31,9 +31,9 @@
#include "hw/qdev-properties.h"
#include "qapi/compat-policy.h"
#include "qapi/error.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qstring.h"
-#include "qapi/qmp/qjson.h"
+#include "qobject/qdict.h"
+#include "qobject/qstring.h"
+#include "qobject/qjson.h"
#include "qemu-version.h"
#include "qemu/cutils.h"
#include "qemu/help_option.h"
@@ -129,7 +129,7 @@
#include "qapi/qapi-visit-qom.h"
#include "qapi/qapi-commands-ui.h"
#include "block/qdict.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
#include "sysemu/iothread.h"
#include "qemu/guest-random.h"
#include "qemu/keyval.h"
--
2.43.0
next prev parent reply other threads:[~2024-01-08 18:26 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-08 18:23 [PATCH 00/29] include: move include/qapi/qmp/ to include/qobject/ Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 01/29] " Daniel P. Berrangé
2024-01-08 18:46 ` Daniel P. Berrangé
2024-01-16 3:34 ` Zhao Liu
2024-04-25 9:34 ` Markus Armbruster
2024-04-25 9:49 ` Markus Armbruster
2024-04-25 9:59 ` Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 02/29] audio: adapt to new import path for qobject data type headers Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 03/29] authz: " Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 04/29] block: " Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 05/29] backends: " Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 06/29] chardev: " Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 07/29] docs: " Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 08/29] dump: " Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 09/29] hw: " Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 10/29] include: " Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 11/29] migration: " Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 12/29] monitor: " Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 13/29] net: " Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 14/29] qapi: " Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 15/29] qga: " Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 16/29] qobject: " Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 17/29] qom: " Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 18/29] replay: " Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 19/29] scripts: " Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 20/29] scsi: " Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 21/29] stats: " Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 22/29] stubs: " Daniel P. Berrangé
2024-01-08 18:23 ` Daniel P. Berrangé [this message]
2024-01-08 18:24 ` [PATCH 24/29] target: " Daniel P. Berrangé
2024-01-08 18:24 ` [PATCH 25/29] tests: " Daniel P. Berrangé
2024-01-08 18:24 ` [PATCH 26/29] trace: " Daniel P. Berrangé
2024-01-08 18:24 ` [PATCH 27/29] ui: " Daniel P. Berrangé
2024-01-08 18:24 ` [PATCH 28/29] util: " Daniel P. Berrangé
2024-01-08 18:24 ` [PATCH 29/29] qapi: remove header file compatibility symlinks Daniel P. Berrangé
2024-03-19 15:50 ` [PATCH 00/29] include: move include/qapi/qmp/ to include/qobject/ Daniel P. Berrangé
2024-04-25 9:36 ` Markus Armbruster
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=20240108182405.1135436-24-berrange@redhat.com \
--to=berrange@redhat.com \
--cc=armbru@redhat.com \
--cc=michael.roth@amd.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).