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

[PATCH v2 23/31] system: 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>
---
 system/device_tree.c       | 2 +-
 system/dirtylimit.c        | 2 +-
 system/qdev-monitor.c      | 6 +++---
 system/rtc.c               | 1 +
 system/runstate-hmp-cmds.c | 2 +-
 system/vl.c                | 6 +++---
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/system/device_tree.c b/system/device_tree.c
index 2e38259d34..446e49cef6 100644
--- a/system/device_tree.c
+++ b/system/device_tree.c
@@ -28,7 +28,7 @@
 #include "hw/boards.h"
 #include "qemu/config-file.h"
 #include "qapi/qapi-commands-machine.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
 #include "monitor/hmp.h"
 
 #include <libfdt.h>
diff --git a/system/dirtylimit.c b/system/dirtylimit.c
index ab20da34bb..644b0060ce 100644
--- a/system/dirtylimit.c
+++ b/system/dirtylimit.c
@@ -13,7 +13,7 @@
 #include "qemu/osdep.h"
 #include "qemu/main-loop.h"
 #include "qapi/qapi-commands-migration.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
 #include "qapi/error.h"
 #include "sysemu/dirtyrate.h"
 #include "sysemu/dirtylimit.h"
diff --git a/system/qdev-monitor.c b/system/qdev-monitor.c
index 44994ea0e1..e2f8abed8b 100644
--- a/system/qdev-monitor.c
+++ b/system/qdev-monitor.c
@@ -25,10 +25,10 @@
 #include "sysemu/arch_init.h"
 #include "qapi/error.h"
 #include "qapi/qapi-commands-qdev.h"
-#include "qapi/qmp/dispatch.h"
-#include "qapi/qmp/qdict.h"
+#include "qapi/qmp-registry.h"
+#include "qobject/qdict.h"
 #include "qapi/qmp/qerror.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qstring.h"
 #include "qapi/qobject-input-visitor.h"
 #include "qemu/config-file.h"
 #include "qemu/error-report.h"
diff --git a/system/rtc.c b/system/rtc.c
index 216d2aee3a..e3bc2095f9 100644
--- a/system/rtc.c
+++ b/system/rtc.c
@@ -25,6 +25,7 @@
 #include "qemu/osdep.h"
 #include "qemu/cutils.h"
 #include "qapi/error.h"
+#include "qapi/qmp/qerror.h"
 #include "qemu/error-report.h"
 #include "qemu/option.h"
 #include "qemu/timer.h"
diff --git a/system/runstate-hmp-cmds.c b/system/runstate-hmp-cmds.c
index 2df670f0c0..be1d676992 100644
--- a/system/runstate-hmp-cmds.c
+++ b/system/runstate-hmp-cmds.c
@@ -19,7 +19,7 @@
 #include "monitor/monitor.h"
 #include "qapi/error.h"
 #include "qapi/qapi-commands-run-state.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
 #include "qemu/accel.h"
 
 void hmp_info_status(Monitor *mon, const QDict *qdict)
diff --git a/system/vl.c b/system/vl.c
index e83b3b2608..1e5525c1c7 100644
--- a/system/vl.c
+++ b/system/vl.c
@@ -31,9 +31,9 @@
 #include "hw/qdev-properties.h"
 #include "qapi/compat-policy.h"
 #include "qapi/error.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qstring.h"
-#include "qapi/qmp/qjson.h"
+#include "qobject/qdict.h"
+#include "qobject/qstring.h"
+#include "qobject/qjson.h"
 #include "qemu-version.h"
 #include "qemu/cutils.h"
 #include "qemu/help_option.h"
-- 
2.46.0

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

Posted by Zhao Liu 4 days, 12 hours ago

Hi Daniel,

On Thu, Oct 17, 2024 at 12:33:35PM +0100, Daniel P. Berrangé wrote:
> Date: Thu, 17 Oct 2024 12:33:35 +0100
> From: "Daniel P. Berrangé" <berrange@redhat.com>
> Subject: [PATCH v2 23/31] system: 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>
> ---
>  system/device_tree.c       | 2 +-
>  system/dirtylimit.c        | 2 +-
>  system/qdev-monitor.c      | 6 +++---
>  system/rtc.c               | 1 +
>  system/runstate-hmp-cmds.c | 2 +-
>  system/vl.c                | 6 +++---
>  6 files changed, 10 insertions(+), 9 deletions(-)
> 
> diff --git a/system/rtc.c b/system/rtc.c
> index 216d2aee3a..e3bc2095f9 100644
> --- a/system/rtc.c
> +++ b/system/rtc.c
> @@ -25,6 +25,7 @@
>  #include "qemu/osdep.h"
>  #include "qemu/cutils.h"
>  #include "qapi/error.h"
> +#include "qapi/qmp/qerror.h"

Is this a typo?

>  #include "qemu/error-report.h"
>  #include "qemu/option.h"
>  #include "qemu/timer.h"

Regards,
Zhao

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

Posted by Daniel P. Berrangé 4 days, 12 hours ago

On Fri, Oct 18, 2024 at 06:06:18PM +0800, Zhao Liu wrote:
> Hi Daniel,
> 
> On Thu, Oct 17, 2024 at 12:33:35PM +0100, Daniel P. Berrangé wrote:
> > Date: Thu, 17 Oct 2024 12:33:35 +0100
> > From: "Daniel P. Berrangé" <berrange@redhat.com>
> > Subject: [PATCH v2 23/31] system: 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>
> > ---
> >  system/device_tree.c       | 2 +-
> >  system/dirtylimit.c        | 2 +-
> >  system/qdev-monitor.c      | 6 +++---
> >  system/rtc.c               | 1 +
> >  system/runstate-hmp-cmds.c | 2 +-
> >  system/vl.c                | 6 +++---
> >  6 files changed, 10 insertions(+), 9 deletions(-)
> > 
> > diff --git a/system/rtc.c b/system/rtc.c
> > index 216d2aee3a..e3bc2095f9 100644
> > --- a/system/rtc.c
> > +++ b/system/rtc.c
> > @@ -25,6 +25,7 @@
> >  #include "qemu/osdep.h"
> >  #include "qemu/cutils.h"
> >  #include "qapi/error.h"
> > +#include "qapi/qmp/qerror.h"
> 
> Is this a typo?

Yes, a rebase mistake. This was originally present, but since
removed.

> 
> >  #include "qemu/error-report.h"
> >  #include "qemu/option.h"
> >  #include "qemu/timer.h"
> 
> Regards,
> Zhao
> 

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|