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 14/29] qapi: adapt to new import path for qobject data type headers
Date: Mon, 8 Jan 2024 18:23:50 +0000 [thread overview]
Message-ID: <20240108182405.1135436-15-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>
---
qapi/opts-visitor.c | 2 +-
qapi/qapi-clone-visitor.c | 2 +-
qapi/qapi-dealloc-visitor.c | 2 +-
qapi/qapi-forward-visitor.c | 16 ++++++++--------
qapi/qapi-util.c | 2 +-
qapi/qapi-visit-core.c | 2 +-
qapi/qmp-dispatch.c | 8 ++++----
qapi/qmp-event.c | 6 +++---
qapi/qmp-registry.c | 2 +-
qapi/qobject-input-visitor.c | 16 ++++++++--------
qapi/qobject-output-visitor.c | 12 ++++++------
qapi/string-input-visitor.c | 4 ++--
12 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/qapi/opts-visitor.c b/qapi/opts-visitor.c
index 8f1efab8b9..110e916123 100644
--- a/qapi/opts-visitor.c
+++ b/qapi/opts-visitor.c
@@ -13,7 +13,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu/cutils.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
#include "qapi/opts-visitor.h"
#include "qemu/queue.h"
#include "qemu/option_int.h"
diff --git a/qapi/qapi-clone-visitor.c b/qapi/qapi-clone-visitor.c
index c45c5caa3b..af195b4c60 100644
--- a/qapi/qapi-clone-visitor.c
+++ b/qapi/qapi-clone-visitor.c
@@ -12,7 +12,7 @@
#include "qapi/clone-visitor.h"
#include "qapi/visitor-impl.h"
#include "qapi/error.h"
-#include "qapi/qmp/qnull.h"
+#include "qobject/qnull.h"
struct QapiCloneVisitor {
Visitor visitor;
diff --git a/qapi/qapi-dealloc-visitor.c b/qapi/qapi-dealloc-visitor.c
index ef283f2966..57a2c904bb 100644
--- a/qapi/qapi-dealloc-visitor.c
+++ b/qapi/qapi-dealloc-visitor.c
@@ -14,7 +14,7 @@
#include "qemu/osdep.h"
#include "qapi/dealloc-visitor.h"
-#include "qapi/qmp/qnull.h"
+#include "qobject/qnull.h"
#include "qapi/visitor-impl.h"
struct QapiDeallocVisitor
diff --git a/qapi/qapi-forward-visitor.c b/qapi/qapi-forward-visitor.c
index e36d9bc9ba..54a0044ff8 100644
--- a/qapi/qapi-forward-visitor.c
+++ b/qapi/qapi-forward-visitor.c
@@ -14,14 +14,14 @@
#include "qapi/forward-visitor.h"
#include "qapi/visitor-impl.h"
#include "qemu/queue.h"
-#include "qapi/qmp/qjson.h"
-#include "qapi/qmp/qbool.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qerror.h"
-#include "qapi/qmp/qlist.h"
-#include "qapi/qmp/qnull.h"
-#include "qapi/qmp/qnum.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qjson.h"
+#include "qobject/qbool.h"
+#include "qobject/qdict.h"
+#include "qobject/qerror.h"
+#include "qobject/qlist.h"
+#include "qobject/qnull.h"
+#include "qobject/qnum.h"
+#include "qobject/qstring.h"
#include "qemu/cutils.h"
struct ForwardFieldVisitor {
diff --git a/qapi/qapi-util.c b/qapi/qapi-util.c
index 63596e11c5..4b6e596a33 100644
--- a/qapi/qapi-util.c
+++ b/qapi/qapi-util.c
@@ -14,7 +14,7 @@
#include "qapi/compat-policy.h"
#include "qapi/error.h"
#include "qemu/ctype.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
CompatPolicy compat_policy;
diff --git a/qapi/qapi-visit-core.c b/qapi/qapi-visit-core.c
index 6c13510a2b..326821ed91 100644
--- a/qapi/qapi-visit-core.c
+++ b/qapi/qapi-visit-core.c
@@ -15,7 +15,7 @@
#include "qemu/osdep.h"
#include "qapi/compat-policy.h"
#include "qapi/error.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
#include "qapi/visitor.h"
#include "qapi/visitor-impl.h"
#include "trace.h"
diff --git a/qapi/qmp-dispatch.c b/qapi/qmp-dispatch.c
index 555528b6bb..902481b14c 100644
--- a/qapi/qmp-dispatch.c
+++ b/qapi/qmp-dispatch.c
@@ -16,12 +16,12 @@
#include "block/aio.h"
#include "qapi/compat-policy.h"
#include "qapi/error.h"
-#include "qapi/qmp/dispatch.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qjson.h"
+#include "qapi/qmp-registry.h"
+#include "qobject/qdict.h"
+#include "qobject/qjson.h"
#include "qapi/qobject-input-visitor.h"
#include "qapi/qobject-output-visitor.h"
-#include "qapi/qmp/qbool.h"
+#include "qobject/qbool.h"
#include "qemu/coroutine.h"
#include "qemu/main-loop.h"
diff --git a/qapi/qmp-event.c b/qapi/qmp-event.c
index 0fe0d0a5a6..11cb6ace99 100644
--- a/qapi/qmp-event.c
+++ b/qapi/qmp-event.c
@@ -14,9 +14,9 @@
#include "qemu/osdep.h"
#include "qapi/qmp-event.h"
-#include "qapi/qmp/qstring.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qjson.h"
+#include "qobject/qstring.h"
+#include "qobject/qdict.h"
+#include "qobject/qjson.h"
static void timestamp_put(QDict *qdict)
{
diff --git a/qapi/qmp-registry.c b/qapi/qmp-registry.c
index 485bc5e6fc..ac989074ed 100644
--- a/qapi/qmp-registry.c
+++ b/qapi/qmp-registry.c
@@ -13,7 +13,7 @@
*/
#include "qemu/osdep.h"
-#include "qapi/qmp/dispatch.h"
+#include "qapi/qmp-registry.h"
void qmp_register_command(QmpCommandList *cmds, const char *name,
QmpCommandFunc *fn, QmpCommandOptions options,
diff --git a/qapi/qobject-input-visitor.c b/qapi/qobject-input-visitor.c
index 3e8aca6b15..0f06e54561 100644
--- a/qapi/qobject-input-visitor.c
+++ b/qapi/qobject-input-visitor.c
@@ -19,14 +19,14 @@
#include "qapi/qobject-input-visitor.h"
#include "qapi/visitor-impl.h"
#include "qemu/queue.h"
-#include "qapi/qmp/qjson.h"
-#include "qapi/qmp/qbool.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qerror.h"
-#include "qapi/qmp/qlist.h"
-#include "qapi/qmp/qnull.h"
-#include "qapi/qmp/qnum.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qjson.h"
+#include "qobject/qbool.h"
+#include "qobject/qdict.h"
+#include "qobject/qerror.h"
+#include "qobject/qlist.h"
+#include "qobject/qnull.h"
+#include "qobject/qnum.h"
+#include "qobject/qstring.h"
#include "qemu/cutils.h"
#include "qemu/keyval.h"
diff --git a/qapi/qobject-output-visitor.c b/qapi/qobject-output-visitor.c
index 74770edd73..13d3ae95b7 100644
--- a/qapi/qobject-output-visitor.c
+++ b/qapi/qobject-output-visitor.c
@@ -17,12 +17,12 @@
#include "qapi/qobject-output-visitor.h"
#include "qapi/visitor-impl.h"
#include "qemu/queue.h"
-#include "qapi/qmp/qbool.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qlist.h"
-#include "qapi/qmp/qnull.h"
-#include "qapi/qmp/qnum.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qbool.h"
+#include "qobject/qdict.h"
+#include "qobject/qlist.h"
+#include "qobject/qnull.h"
+#include "qobject/qnum.h"
+#include "qobject/qstring.h"
typedef struct QStackEntry {
QObject *value;
diff --git a/qapi/string-input-visitor.c b/qapi/string-input-visitor.c
index 197139c1c0..28c217fbbd 100644
--- a/qapi/string-input-visitor.c
+++ b/qapi/string-input-visitor.c
@@ -14,8 +14,8 @@
#include "qapi/error.h"
#include "qapi/string-input-visitor.h"
#include "qapi/visitor-impl.h"
-#include "qapi/qmp/qerror.h"
-#include "qapi/qmp/qnull.h"
+#include "qobject/qerror.h"
+#include "qobject/qnull.h"
#include "qemu/option.h"
#include "qemu/cutils.h"
--
2.43.0
next prev parent reply other threads:[~2024-01-08 18:28 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 ` Daniel P. Berrangé [this message]
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 ` [PATCH 23/29] system: " Daniel P. Berrangé
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-15-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).