[v2,17/31] qom: adapt to new import path for qobject data type headers

Commit Message

Daniel P. Berrangé Oct. 17, 2024, 11:33 a.m. UTC

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

Signed-off-by: Daniel P. Berrangé <[e-mail]>
---
 qom/object.c            | 10 +++++-----
 qom/object_interfaces.c |  6 +++---
 qom/qom-hmp-cmds.c      |  4 ++--
 qom/qom-qmp-cmds.c      |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

Comments

Zhao Liu Oct. 18, 2024, 10:01 a.m. UTC | #1

On Thu, Oct 17, 2024 at 12:33:29PM +0100, Daniel P. Berrangé wrote:
> Date: Thu, 17 Oct 2024 12:33:29 +0100
> From: "Daniel P. Berrangé" <[e-mail]>
> Subject: [PATCH v2 17/31] qom: adapt to new import path for qobject data
>  type headers
> 
> The qobject data type headers have moved from qapi/qmp/ to
> qobject/.
> 
> Signed-off-by: Daniel P. Berrangé <[e-mail]>
> ---
>  qom/object.c            | 10 +++++-----
>  qom/object_interfaces.c |  6 +++---
>  qom/qom-hmp-cmds.c      |  4 ++--
>  qom/qom-qmp-cmds.c      |  2 +-
>  4 files changed, 11 insertions(+), 11 deletions(-)
>

Reviewed-by: Zhao Liu <[e-mail]>

Patch

diff --git a/qom/object.c b/qom/object.c
index 11424cf471..f2fd40203e 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -23,16 +23,16 @@ 
 #include "qapi/qobject-input-visitor.h"
 #include "qapi/forward-visitor.h"
 #include "qapi/qapi-builtin-visit.h"
-#include "qapi/qmp/qjson.h"
+#include "qobject/qjson.h"
 #include "trace.h"
 
 /* TODO: replace QObject with a simpler visitor to avoid a dependency
  * of the QOM core on QObject?  */
 #include "qom/qom-qobject.h"
-#include "qapi/qmp/qbool.h"
-#include "qapi/qmp/qlist.h"
-#include "qapi/qmp/qnum.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qbool.h"
+#include "qobject/qlist.h"
+#include "qobject/qnum.h"
+#include "qobject/qstring.h"
 #include "qemu/error-report.h"
 
 #define MAX_INTERFACES 32
diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c
index e0833c8bfe..c752d4f730 100644
--- a/qom/object_interfaces.c
+++ b/qom/object_interfaces.c
@@ -3,10 +3,10 @@ 
 #include "qemu/cutils.h"
 #include "qapi/error.h"
 #include "qapi/qapi-visit-qom.h"
-#include "qapi/qmp/qobject.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qobject.h"
+#include "qobject/qdict.h"
 #include "qapi/qmp/qerror.h"
-#include "qapi/qmp/qjson.h"
+#include "qobject/qjson.h"
 #include "qapi/qobject-input-visitor.h"
 #include "qapi/qobject-output-visitor.h"
 #include "qom/object_interfaces.h"
diff --git a/qom/qom-hmp-cmds.c b/qom/qom-hmp-cmds.c
index 6e3a2175a4..a00a564b1e 100644
--- a/qom/qom-hmp-cmds.c
+++ b/qom/qom-hmp-cmds.c
@@ -11,8 +11,8 @@ 
 #include "monitor/monitor.h"
 #include "qapi/error.h"
 #include "qapi/qapi-commands-qom.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qjson.h"
+#include "qobject/qdict.h"
+#include "qobject/qjson.h"
 #include "qemu/readline.h"
 #include "qom/object.h"
 #include "qom/object_interfaces.h"
diff --git a/qom/qom-qmp-cmds.c b/qom/qom-qmp-cmds.c
index e91a235347..7880da3566 100644
--- a/qom/qom-qmp-cmds.c
+++ b/qom/qom-qmp-cmds.c
@@ -20,7 +20,7 @@ 
 #include "qapi/qapi-commands-qdev.h"
 #include "qapi/qapi-commands-qom.h"
 #include "qapi/qapi-visit-qom.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
 #include "qapi/qmp/qerror.h"
 #include "qapi/qobject-input-visitor.h"
 #include "qapi/qobject-output-visitor.h"