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

Daniel P. Berrangé posted 31 patches 5 days, 10 hours ago
[PATCH v2 13/31] net: 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>
---
 net/net-hmp-cmds.c | 2 +-
 net/net.c          | 2 +-
 net/slirp.c        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/net-hmp-cmds.c b/net/net-hmp-cmds.c
index 41d326bf5f..e7c55d2787 100644
--- a/net/net-hmp-cmds.c
+++ b/net/net-hmp-cmds.c
@@ -22,7 +22,7 @@
 #include "qapi/clone-visitor.h"
 #include "qapi/qapi-commands-net.h"
 #include "qapi/qapi-visit-net.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
 #include "qemu/config-file.h"
 #include "qemu/help_option.h"
 #include "qemu/option.h"
diff --git a/net/net.c b/net/net.c
index d9b23a8f8c..8b4cd01970 100644
--- a/net/net.c
+++ b/net/net.c
@@ -36,7 +36,7 @@
 #include "qemu/help_option.h"
 #include "qapi/qapi-commands-net.h"
 #include "qapi/qapi-visit-net.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu/error-report.h"
 #include "qemu/sockets.h"
diff --git a/net/slirp.c b/net/slirp.c
index eb9a456ed4..9b2784d643 100644
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -43,7 +43,7 @@
 #include "sysemu/sysemu.h"
 #include "qemu/cutils.h"
 #include "qapi/error.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
 #include "util.h"
 #include "migration/register.h"
 #include "migration/vmstate.h"
-- 
2.46.0


Re: [PATCH v2 13/31] net: 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:25PM +0100, Daniel P. Berrangé wrote:
> Date: Thu, 17 Oct 2024 12:33:25 +0100
> From: "Daniel P. Berrangé" <berrange@redhat.com>
> Subject: [PATCH v2 13/31] net: 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>
> ---
>  net/net-hmp-cmds.c | 2 +-
>  net/net.c          | 2 +-
>  net/slirp.c        | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 

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