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 10/29] include: adapt to new import path for qobject data type headers
Date: Mon, 8 Jan 2024 18:23:46 +0000 [thread overview]
Message-ID: <20240108182405.1135436-11-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>
---
include/block/qdict.h | 2 +-
include/qobject/qbool.h | 2 +-
include/qobject/qdict.h | 2 +-
include/qobject/qlist.h | 2 +-
include/qobject/qnull.h | 2 +-
include/qobject/qnum.h | 2 +-
include/qobject/qobject.h | 2 +-
include/qobject/qstring.h | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/include/block/qdict.h b/include/block/qdict.h
index b4c28d96a9..53c4df4cb2 100644
--- a/include/block/qdict.h
+++ b/include/block/qdict.h
@@ -10,7 +10,7 @@
#ifndef BLOCK_QDICT_H
#define BLOCK_QDICT_H
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
QObject *qdict_crumple(const QDict *src, Error **errp);
void qdict_flatten(QDict *qdict);
diff --git a/include/qobject/qbool.h b/include/qobject/qbool.h
index 0d09726939..b348e17867 100644
--- a/include/qobject/qbool.h
+++ b/include/qobject/qbool.h
@@ -14,7 +14,7 @@
#ifndef QBOOL_H
#define QBOOL_H
-#include "qapi/qmp/qobject.h"
+#include "qobject/qobject.h"
struct QBool {
struct QObjectBase_ base;
diff --git a/include/qobject/qdict.h b/include/qobject/qdict.h
index 82e90fc072..903e6e5462 100644
--- a/include/qobject/qdict.h
+++ b/include/qobject/qdict.h
@@ -13,7 +13,7 @@
#ifndef QDICT_H
#define QDICT_H
-#include "qapi/qmp/qobject.h"
+#include "qobject/qobject.h"
#include "qemu/queue.h"
#define QDICT_BUCKET_MAX 512
diff --git a/include/qobject/qlist.h b/include/qobject/qlist.h
index e4e985d435..0377bf824e 100644
--- a/include/qobject/qlist.h
+++ b/include/qobject/qlist.h
@@ -13,7 +13,7 @@
#ifndef QLIST_H
#define QLIST_H
-#include "qapi/qmp/qobject.h"
+#include "qobject/qobject.h"
#include "qemu/queue.h"
typedef struct QListEntry {
diff --git a/include/qobject/qnull.h b/include/qobject/qnull.h
index 7feb7c7d83..4423836a0c 100644
--- a/include/qobject/qnull.h
+++ b/include/qobject/qnull.h
@@ -13,7 +13,7 @@
#ifndef QNULL_H
#define QNULL_H
-#include "qapi/qmp/qobject.h"
+#include "qobject/qobject.h"
struct QNull {
struct QObjectBase_ base;
diff --git a/include/qobject/qnum.h b/include/qobject/qnum.h
index e86788dd2e..1ce24b3668 100644
--- a/include/qobject/qnum.h
+++ b/include/qobject/qnum.h
@@ -15,7 +15,7 @@
#ifndef QNUM_H
#define QNUM_H
-#include "qapi/qmp/qobject.h"
+#include "qobject/qobject.h"
typedef enum {
QNUM_I64,
diff --git a/include/qobject/qobject.h b/include/qobject/qobject.h
index 89b97d88bc..35f9693b84 100644
--- a/include/qobject/qobject.h
+++ b/include/qobject/qobject.h
@@ -34,7 +34,7 @@
#include "qapi/qapi-builtin-types.h"
-/* Not for use outside include/qapi/qmp/ */
+/* Not for use outside include/qobject/ */
struct QObjectBase_ {
QType type;
size_t refcnt;
diff --git a/include/qobject/qstring.h b/include/qobject/qstring.h
index 318d815d6a..1e2abe4032 100644
--- a/include/qobject/qstring.h
+++ b/include/qobject/qstring.h
@@ -13,7 +13,7 @@
#ifndef QSTRING_H
#define QSTRING_H
-#include "qapi/qmp/qobject.h"
+#include "qobject/qobject.h"
struct QString {
struct QObjectBase_ base;
--
2.43.0
next prev parent reply other threads:[~2024-01-08 18:25 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 ` Daniel P. Berrangé [this message]
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 ` [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-11-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).