[v2] include: move include/qapi/qmp/ to include/qobject/

[PATCH v2 15/31] qga: adapt to new import path for qobject data type headers

Posted by Daniel P. Berrangé 5 days, 10 hours ago

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

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 qga/guest-agent-core.h | 2 +-
 qga/main.c             | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/qga/guest-agent-core.h b/qga/guest-agent-core.h
index b4e7c52c61..a536d07d0d 100644
--- a/qga/guest-agent-core.h
+++ b/qga/guest-agent-core.h
@@ -13,7 +13,7 @@
 #ifndef GUEST_AGENT_CORE_H
 #define GUEST_AGENT_CORE_H
 
-#include "qapi/qmp/dispatch.h"
+#include "qapi/qmp-registry.h"
 #include "qga-qapi-types.h"
 
 #define QGA_READ_COUNT_DEFAULT 4096
diff --git a/qga/main.c b/qga/main.c
index 50186760bf..e74c14b3fc 100644
--- a/qga/main.c
+++ b/qga/main.c
@@ -19,9 +19,9 @@
 #include <sys/wait.h>
 #endif
 #include "qemu/help-texts.h"
-#include "qapi/qmp/json-parser.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qjson.h"
+#include "qobject/json-parser.h"
+#include "qobject/qdict.h"
+#include "qobject/qjson.h"
 #include "guest-agent-core.h"
 #include "qga-qapi-init-commands.h"
 #include "qapi/error.h"
-- 
2.46.0

Re: [PATCH v2 15/31] qga: adapt to new import path for qobject data type headers

Posted by Zhao Liu 4 days, 12 hours ago

On Thu, Oct 17, 2024 at 12:33:27PM +0100, Daniel P. Berrangé wrote:
> Date: Thu, 17 Oct 2024 12:33:27 +0100
> From: "Daniel P. Berrangé" <berrange@redhat.com>
> Subject: [PATCH v2 15/31] qga: 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é <berrange@redhat.com>
> ---
>  qga/guest-agent-core.h | 2 +-
>  qga/main.c             | 6 +++---
>  2 files changed, 4 insertions(+), 4 deletions(-)
>

Reviewed-by: Zhao Liu <zhao1.liu@intel.com>