[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 28/29] util: adapt to new import path for qobject data type heade
From: |
Daniel P . Berrangé |
Subject: |
[PATCH 28/29] util: adapt to new import path for qobject data type headers |
Date: |
Mon, 8 Jan 2024 18:24:04 +0000 |
The qobject data type headers have moved from qapi/qmp/ to
qobject/.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
util/block-helpers.c | 2 +-
util/keyval.c | 6 +++---
util/qemu-config.c | 4 ++--
util/qemu-option.c | 10 +++++-----
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/util/block-helpers.c b/util/block-helpers.c
index c4851432f5..724c4ce8eb 100644
--- a/util/block-helpers.c
+++ b/util/block-helpers.c
@@ -10,7 +10,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
#include "block-helpers.h"
/**
diff --git a/util/keyval.c b/util/keyval.c
index 66a5b4740f..a70629a481 100644
--- a/util/keyval.c
+++ b/util/keyval.c
@@ -91,9 +91,9 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qlist.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qdict.h"
+#include "qobject/qlist.h"
+#include "qobject/qstring.h"
#include "qemu/cutils.h"
#include "qemu/keyval.h"
#include "qemu/help_option.h"
diff --git a/util/qemu-config.c b/util/qemu-config.c
index 42076efe1e..7b8bda1645 100644
--- a/util/qemu-config.c
+++ b/util/qemu-config.c
@@ -2,8 +2,8 @@
#include "block/qdict.h" /* for qdict_extract_subqdict() */
#include "qapi/error.h"
#include "qapi/qapi-commands-misc.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qlist.h"
+#include "qobject/qdict.h"
+#include "qobject/qlist.h"
#include "qemu/error-report.h"
#include "qemu/option.h"
#include "qemu/config-file.h"
diff --git a/util/qemu-option.c b/util/qemu-option.c
index eedd08929b..9399314334 100644
--- a/util/qemu-option.c
+++ b/util/qemu-option.c
@@ -27,11 +27,11 @@
#include "qapi/error.h"
#include "qemu/error-report.h"
-#include "qapi/qmp/qbool.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qnum.h"
-#include "qapi/qmp/qstring.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qbool.h"
+#include "qobject/qdict.h"
+#include "qobject/qnum.h"
+#include "qobject/qstring.h"
+#include "qobject/qerror.h"
#include "qemu/option_int.h"
#include "qemu/cutils.h"
#include "qemu/id.h"
--
2.43.0
- [PATCH 16/29] qobject: adapt to new import path for qobject data type headers, (continued)
- [PATCH 16/29] qobject: adapt to new import path for qobject data type headers, Daniel P . Berrangé, 2024/01/08
- [PATCH 22/29] stubs: adapt to new import path for qobject data type headers, Daniel P . Berrangé, 2024/01/08
- [PATCH 23/29] system: adapt to new import path for qobject data type headers, Daniel P . Berrangé, 2024/01/08
- [PATCH 21/29] stats: adapt to new import path for qobject data type headers, Daniel P . Berrangé, 2024/01/08
- [PATCH 24/29] target: adapt to new import path for qobject data type headers, Daniel P . Berrangé, 2024/01/08
- [PATCH 25/29] tests: adapt to new import path for qobject data type headers, Daniel P . Berrangé, 2024/01/08
- [PATCH 26/29] trace: adapt to new import path for qobject data type headers, Daniel P . Berrangé, 2024/01/08
- [PATCH 27/29] ui: adapt to new import path for qobject data type headers, Daniel P . Berrangé, 2024/01/08
- [PATCH 15/29] qga: adapt to new import path for qobject data type headers, Daniel P . Berrangé, 2024/01/08
- [PATCH 29/29] qapi: remove header file compatibility symlinks, Daniel P . Berrangé, 2024/01/08
- [PATCH 28/29] util: adapt to new import path for qobject data type headers,
Daniel P . Berrangé <=