| Message ID | 20241017113344.883424-25-berrange@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | include: move include/qapi/qmp/ to include/qobject/ | expand |
On Thu, Oct 17, 2024 at 12:33:36PM +0100, Daniel P. Berrangé wrote: > Date: Thu, 17 Oct 2024 12:33:36 +0100 > From: "Daniel P. Berrangé" <berrange@redhat.com> > Subject: [PATCH v2 24/31] target: 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> > --- > target/arm/arm-qmp-cmds.c | 2 +- > target/i386/cpu-apic.c | 2 +- > target/i386/cpu-sysemu.c | 2 +- > target/i386/monitor.c | 2 +- > target/loongarch/loongarch-qmp-cmds.c | 2 +- > target/ppc/cpu_init.c | 2 +- > target/riscv/riscv-qmp-cmds.c | 4 ++-- > target/s390x/cpu_models_sysemu.c | 2 +- > 8 files changed, 9 insertions(+), 9 deletions(-) Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
diff --git a/target/arm/arm-qmp-cmds.c b/target/arm/arm-qmp-cmds.c index 3cc8cc738b..c89fd3258f 100644 --- a/target/arm/arm-qmp-cmds.c +++ b/target/arm/arm-qmp-cmds.c @@ -28,7 +28,7 @@ #include "qapi/qobject-input-visitor.h" #include "qapi/qapi-commands-machine-target.h" #include "qapi/qapi-commands-misc-target.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qom/qom-qobject.h" static GICCapability *gic_cap_new(int version) diff --git a/target/i386/cpu-apic.c b/target/i386/cpu-apic.c index d397ec94dc..9fd4d6eab5 100644 --- a/target/i386/cpu-apic.c +++ b/target/i386/cpu-apic.c @@ -7,7 +7,7 @@ */ #include "qemu/osdep.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qapi/error.h" #include "monitor/monitor.h" #include "monitor/hmp-target.h" diff --git a/target/i386/cpu-sysemu.c b/target/i386/cpu-sysemu.c index 227ac021f6..96b8006b27 100644 --- a/target/i386/cpu-sysemu.c +++ b/target/i386/cpu-sysemu.c @@ -21,7 +21,7 @@ #include "cpu.h" #include "qapi/error.h" #include "qapi/qapi-visit-run-state.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qapi/qobject-input-visitor.h" #include "qom/qom-qobject.h" #include "qapi/qapi-commands-machine-target.h" diff --git a/target/i386/monitor.c b/target/i386/monitor.c index 2d766b2637..3ea92b066e 100644 --- a/target/i386/monitor.c +++ b/target/i386/monitor.c @@ -27,7 +27,7 @@ #include "monitor/monitor.h" #include "monitor/hmp-target.h" #include "monitor/hmp.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qapi/error.h" #include "qapi/qapi-commands-misc-target.h" #include "qapi/qapi-commands-misc.h" diff --git a/target/loongarch/loongarch-qmp-cmds.c b/target/loongarch/loongarch-qmp-cmds.c index 8721a5eb13..f45c532e42 100644 --- a/target/loongarch/loongarch-qmp-cmds.c +++ b/target/loongarch/loongarch-qmp-cmds.c @@ -10,7 +10,7 @@ #include "qapi/error.h" #include "qapi/qapi-commands-machine-target.h" #include "cpu.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qapi/qobject-input-visitor.h" #include "qom/qom-qobject.h" diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c index 23881d09e9..b62c49b6d5 100644 --- a/target/ppc/cpu_init.c +++ b/target/ppc/cpu_init.c @@ -32,7 +32,7 @@ #include "qemu/module.h" #include "qemu/qemu-print.h" #include "qapi/error.h" -#include "qapi/qmp/qnull.h" +#include "qobject/qnull.h" #include "qapi/visitor.h" #include "hw/qdev-properties.h" #include "hw/ppc/ppc.h" diff --git a/target/riscv/riscv-qmp-cmds.c b/target/riscv/riscv-qmp-cmds.c index d363dc318d..aff59b83c6 100644 --- a/target/riscv/riscv-qmp-cmds.c +++ b/target/riscv/riscv-qmp-cmds.c @@ -26,8 +26,8 @@ #include "qapi/error.h" #include "qapi/qapi-commands-machine-target.h" -#include "qapi/qmp/qbool.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qbool.h" +#include "qobject/qdict.h" #include "qapi/qobject-input-visitor.h" #include "qapi/visitor.h" #include "qom/qom-qobject.h" diff --git a/target/s390x/cpu_models_sysemu.c b/target/s390x/cpu_models_sysemu.c index f6df691b66..ea595a00d4 100644 --- a/target/s390x/cpu_models_sysemu.c +++ b/target/s390x/cpu_models_sysemu.c @@ -18,7 +18,7 @@ #include "qapi/error.h" #include "qapi/visitor.h" #include "qapi/qobject-input-visitor.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qapi/qapi-commands-machine-target.h" static void list_add_feat(const char *name, void *opaque);
The qobject data type headers have moved from qapi/qmp/ to qobject/. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- target/arm/arm-qmp-cmds.c | 2 +- target/i386/cpu-apic.c | 2 +- target/i386/cpu-sysemu.c | 2 +- target/i386/monitor.c | 2 +- target/loongarch/loongarch-qmp-cmds.c | 2 +- target/ppc/cpu_init.c | 2 +- target/riscv/riscv-qmp-cmds.c | 4 ++-- target/s390x/cpu_models_sysemu.c | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-)