* [PATCH 00/29] include: move include/qapi/qmp/ to include/qobject/
@ 2024-01-08 18:23 Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 01/29] " Daniel P. Berrangé
` (29 more replies)
0 siblings, 30 replies; 37+ messages in thread
From: Daniel P. Berrangé @ 2024-01-08 18:23 UTC (permalink / raw)
To: qemu-devel; +Cc: Markus Armbruster, Michael Roth, Daniel P. Berrangé
To repeat the 1st patch commit message...
The general expectation is that header files should follow the same
file/path naming scheme as the corresponding source file. There are
various historical exceptions to this practice in QEMU, with one of
the most notable being the include/qapi/qmp/ directory. Most of the
headers there correspond to source files in qobject/.
This patch corrects that inconsistency by creating include/qobject/.
The only outlier is include/qapi/qmp/dispatch.h which gets renamed
to include/qapi/qmp-registry.h.
To allow the code to continue to build, symlinks are temporarily
added in $QEMU/qapi/qmp/ to point to the new location. This allows
git to show a simple 'rename' diff in the 1st patch, which isn't
possible if we put the symlinks straight in $QEMU/include/qapi/qmp/.
The 27 patches that follow are mechanical updates to each top level
sub-directory. The final patch removes the temporary compat symlinks.
Since this touches pretty much every subsystem, get_maintainer.pl
wanted to CC everyone in the world. I've trimmed to only the QAPI
and QObject maintainers.
This could invalidate (and/or be invalidated by) a bunch of pending
patch series if they have any #include "qapi/qmp/...", so would be
best to merge in one go, quickly :-)
Daniel P. Berrangé (29):
include: move include/qapi/qmp/ to include/qobject/
audio: adapt to new import path for qobject data type headers
authz: adapt to new import path for qobject data type headers
block: adapt to new import path for qobject data type headers
backends: adapt to new import path for qobject data type headers
chardev: adapt to new import path for qobject data type headers
docs: adapt to new import path for qobject data type headers
dump: adapt to new import path for qobject data type headers
hw: adapt to new import path for qobject data type headers
include: adapt to new import path for qobject data type headers
migration: adapt to new import path for qobject data type headers
monitor: adapt to new import path for qobject data type headers
net: adapt to new import path for qobject data type headers
qapi: adapt to new import path for qobject data type headers
qga: adapt to new import path for qobject data type headers
qobject: adapt to new import path for qobject data type headers
qom: adapt to new import path for qobject data type headers
replay: adapt to new import path for qobject data type headers
scripts: adapt to new import path for qobject data type headers
scsi: adapt to new import path for qobject data type headers
stats: adapt to new import path for qobject data type headers
stubs: adapt to new import path for qobject data type headers
system: adapt to new import path for qobject data type headers
target: adapt to new import path for qobject data type headers
tests: adapt to new import path for qobject data type headers
trace: adapt to new import path for qobject data type headers
ui: adapt to new import path for qobject data type headers
util: adapt to new import path for qobject data type headers
qapi: remove header file compatibility symlinks
MAINTAINERS | 5 +----
audio/audio-hmp-cmds.c | 2 +-
audio/audio.c | 2 +-
authz/listfile.c | 4 ++--
backends/cryptodev-hmp-cmds.c | 2 +-
backends/cryptodev-vhost-user.c | 2 +-
backends/dbus-vmstate.c | 2 +-
backends/iommufd.c | 2 +-
backends/rng-egd.c | 2 +-
backends/rng-random.c | 2 +-
block.c | 8 ++++----
block/blkdebug.c | 6 +++---
block/blkio.c | 2 +-
block/blklogwrites.c | 4 ++--
block/blkverify.c | 4 ++--
block/copy-before-write.c | 2 +-
block/copy-on-read.c | 2 +-
block/curl.c | 4 ++--
block/file-posix.c | 4 ++--
block/file-win32.c | 4 ++--
block/gluster.c | 4 ++--
block/iscsi.c | 4 ++--
block/monitor/block-hmp-cmds.c | 4 ++--
block/nbd.c | 2 +-
block/nfs.c | 4 ++--
block/null.c | 4 ++--
block/nvme.c | 4 ++--
block/parallels.c | 2 +-
block/qapi-sysemu.c | 2 +-
block/qapi.c | 10 +++++-----
block/qcow.c | 4 ++--
block/qcow2.c | 4 ++--
block/qed.c | 2 +-
block/quorum.c | 8 ++++----
block/rbd.c | 8 ++++----
block/replication.c | 2 +-
block/snapshot.c | 6 +++---
block/ssh.c | 4 ++--
block/stream.c | 2 +-
block/vhdx.c | 2 +-
block/vmdk.c | 4 ++--
block/vpc.c | 2 +-
block/vvfat.c | 4 ++--
blockdev.c | 10 +++++-----
blockjob.c | 2 +-
chardev/char-fe.c | 2 +-
chardev/char-hmp-cmds.c | 2 +-
chardev/char.c | 2 +-
docs/devel/qapi-code-gen.rst | 4 ++--
dump/dump-hmp-cmds.c | 2 +-
dump/dump.c | 2 +-
dump/win_dump.c | 2 +-
hw/arm/mps2-tz.c | 2 +-
hw/arm/mps2.c | 2 +-
hw/arm/sbsa-ref.c | 2 +-
hw/arm/stellaris.c | 2 +-
hw/arm/vexpress.c | 2 +-
hw/arm/virt.c | 2 +-
hw/arm/xlnx-versal.c | 2 +-
hw/block/xen-block.c | 4 ++--
hw/core/machine-hmp-cmds.c | 2 +-
hw/core/machine-qmp-cmds.c | 2 +-
hw/core/qdev-properties-system.c | 2 +-
hw/core/qdev-properties.c | 4 ++--
hw/core/qdev.c | 4 ++--
hw/hyperv/hv-balloon.c | 2 +-
hw/i386/acpi-build.c | 2 +-
hw/i386/kvm/xen_evtchn.c | 2 +-
hw/i386/pc.c | 2 +-
hw/intc/openpic.c | 2 +-
hw/net/rocker/rocker-hmp-cmds.c | 2 +-
hw/net/virtio-net.c | 2 +-
hw/net/xen_nic.c | 2 +-
hw/pci/pci-hmp-cmds.c | 2 +-
hw/ppc/pegasos2.c | 2 +-
hw/ppc/spapr_drc.c | 2 +-
hw/ppc/spapr_pci.c | 2 +-
hw/rx/rx62n.c | 2 +-
hw/s390x/s390-skeys.c | 2 +-
hw/s390x/s390-stattrib.c | 2 +-
hw/usb/redirect.c | 2 +-
hw/usb/xen-usb.c | 4 ++--
hw/vfio/pci.c | 2 +-
hw/virtio/virtio-hmp-cmds.c | 2 +-
hw/virtio/virtio-qmp.c | 4 ++--
hw/xen/xen-bus.c | 2 +-
include/block/qdict.h | 2 +-
include/qapi/{qmp/dispatch.h => qmp-registry.h} | 0
include/{qapi/qmp => qobject}/json-parser.h | 0
include/{qapi/qmp => qobject}/json-writer.h | 0
include/{qapi/qmp => qobject}/qbool.h | 2 +-
include/{qapi/qmp => qobject}/qdict.h | 2 +-
include/{qapi/qmp => qobject}/qerror.h | 0
include/{qapi/qmp => qobject}/qjson.h | 0
include/{qapi/qmp => qobject}/qlist.h | 2 +-
include/{qapi/qmp => qobject}/qlit.h | 0
include/{qapi/qmp => qobject}/qnull.h | 2 +-
include/{qapi/qmp => qobject}/qnum.h | 2 +-
include/{qapi/qmp => qobject}/qobject.h | 2 +-
include/{qapi/qmp => qobject}/qstring.h | 2 +-
migration/dirtyrate.c | 2 +-
migration/migration-hmp-cmds.c | 2 +-
migration/migration.c | 4 ++--
migration/migration.h | 2 +-
migration/options.c | 4 ++--
migration/page_cache.c | 2 +-
migration/ram.c | 2 +-
migration/savevm.c | 2 +-
migration/vmstate.c | 2 +-
monitor/fds.c | 2 +-
monitor/hmp-cmds-target.c | 2 +-
monitor/hmp-cmds.c | 2 +-
monitor/hmp.c | 4 ++--
monitor/monitor-internal.h | 4 ++--
monitor/monitor.c | 2 +-
monitor/qmp-cmds.c | 2 +-
monitor/qmp.c | 6 +++---
net/filter-buffer.c | 2 +-
net/filter.c | 2 +-
net/net-hmp-cmds.c | 2 +-
net/net.c | 4 ++--
net/slirp.c | 2 +-
qapi/opts-visitor.c | 2 +-
qapi/qapi-clone-visitor.c | 2 +-
qapi/qapi-dealloc-visitor.c | 2 +-
qapi/qapi-forward-visitor.c | 16 ++++++++--------
qapi/qapi-util.c | 2 +-
qapi/qapi-visit-core.c | 2 +-
qapi/qmp-dispatch.c | 8 ++++----
qapi/qmp-event.c | 6 +++---
qapi/qmp-registry.c | 2 +-
qapi/qobject-input-visitor.c | 16 ++++++++--------
qapi/qobject-output-visitor.c | 12 ++++++------
qapi/string-input-visitor.c | 4 ++--
qemu-img.c | 4 ++--
qemu-io-cmds.c | 2 +-
qemu-io.c | 4 ++--
qemu-nbd.c | 4 ++--
qga/commands-bsd.c | 2 +-
qga/commands-posix.c | 2 +-
qga/commands-win32.c | 2 +-
qga/commands.c | 2 +-
qga/guest-agent-core.h | 2 +-
qga/main.c | 6 +++---
qobject/block-qdict.c | 8 ++++----
qobject/json-parser-int.h | 2 +-
qobject/json-parser.c | 12 ++++++------
qobject/json-writer.c | 2 +-
qobject/qbool.c | 2 +-
qobject/qdict.c | 10 +++++-----
qobject/qjson.c | 16 ++++++++--------
qobject/qlist.c | 10 +++++-----
qobject/qlit.c | 14 +++++++-------
qobject/qnull.c | 2 +-
qobject/qnum.c | 2 +-
qobject/qobject-internal.h | 2 +-
qobject/qobject.c | 12 ++++++------
qobject/qstring.c | 2 +-
qom/object.c | 12 ++++++------
qom/object_interfaces.c | 8 ++++----
qom/qom-hmp-cmds.c | 4 ++--
qom/qom-qmp-cmds.c | 4 ++--
replay/replay-debugging.c | 2 +-
replay/replay-snapshot.c | 2 +-
scripts/qapi/commands.py | 6 +++---
scripts/qapi/events.py | 2 +-
scripts/qapi/introspect.py | 2 +-
scripts/qapi/visit.py | 2 +-
scsi/qemu-pr-helper.c | 2 +-
stats/stats-hmp-cmds.c | 2 +-
storage-daemon/qemu-storage-daemon.c | 4 ++--
stubs/qmp-command-available.c | 2 +-
stubs/qmp-quit.c | 2 +-
system/balloon.c | 2 +-
system/cpus.c | 2 +-
system/device_tree.c | 2 +-
system/dirtylimit.c | 2 +-
system/qdev-monitor.c | 8 ++++----
system/rtc.c | 2 +-
system/runstate-hmp-cmds.c | 2 +-
system/tpm.c | 2 +-
system/vl.c | 8 ++++----
target/arm/arm-qmp-cmds.c | 4 ++--
target/i386/cpu-sysemu.c | 2 +-
target/i386/cpu.c | 2 +-
target/i386/monitor.c | 2 +-
target/loongarch/loongarch-qmp-cmds.c | 4 ++--
target/ppc/cpu_init.c | 2 +-
target/riscv/riscv-qmp-cmds.c | 4 ++--
target/s390x/cpu_models_sysemu.c | 4 ++--
tests/qtest/adm1266-test.c | 4 ++--
tests/qtest/adm1272-test.c | 4 ++--
tests/qtest/ahci-test.c | 2 +-
tests/qtest/arm-cpu-features.c | 4 ++--
tests/qtest/aspeed_gpio-test.c | 2 +-
tests/qtest/boot-order-test.c | 2 +-
tests/qtest/cdrom-test.c | 2 +-
tests/qtest/cpu-plug-test.c | 4 ++--
tests/qtest/device-introspect-test.c | 6 +++---
tests/qtest/device-plug-test.c | 4 ++--
tests/qtest/drive_del-test.c | 4 ++--
tests/qtest/emc141x-test.c | 2 +-
tests/qtest/fdc-test.c | 2 +-
tests/qtest/hd-geo-test.c | 2 +-
tests/qtest/ide-test.c | 2 +-
tests/qtest/isl_pmbus_vr-test.c | 4 ++--
tests/qtest/libqmp.c | 4 ++--
tests/qtest/libqmp.h | 2 +-
tests/qtest/libqos/generic-pcihost.c | 2 +-
tests/qtest/libqos/libqos.c | 2 +-
tests/qtest/libqos/pci-pc.c | 2 +-
tests/qtest/libqos/qos_external.c | 8 ++++----
tests/qtest/libqtest.c | 8 ++++----
tests/qtest/libqtest.h | 4 ++--
tests/qtest/lsm303dlhc-mag-test.c | 2 +-
tests/qtest/machine-none-test.c | 2 +-
tests/qtest/max34451-test.c | 4 ++--
tests/qtest/migration-helpers.c | 2 +-
tests/qtest/migration-test.c | 4 ++--
tests/qtest/netdev-socket.c | 2 +-
tests/qtest/npcm7xx_adc-test.c | 2 +-
tests/qtest/npcm7xx_emc-test.c | 4 ++--
tests/qtest/npcm7xx_pwm-test.c | 4 ++--
tests/qtest/npcm7xx_watchdog_timer-test.c | 2 +-
tests/qtest/numa-test.c | 4 ++--
tests/qtest/pvpanic-pci-test.c | 2 +-
tests/qtest/pvpanic-test.c | 2 +-
tests/qtest/q35-test.c | 2 +-
tests/qtest/qmp-cmd-test.c | 2 +-
tests/qtest/qmp-test.c | 6 +++---
tests/qtest/qom-test.c | 4 ++--
tests/qtest/qos-test.c | 2 +-
tests/qtest/readconfig-test.c | 6 +++---
tests/qtest/tco-test.c | 2 +-
tests/qtest/test-filter-mirror.c | 2 +-
tests/qtest/test-filter-redirector.c | 2 +-
tests/qtest/test-netfilter.c | 2 +-
tests/qtest/test-x86-cpuid-compat.c | 8 ++++----
tests/qtest/tmp105-test.c | 2 +-
tests/qtest/tpm-emu.c | 4 ++--
tests/qtest/tpm-util.c | 2 +-
tests/qtest/vhost-user-test.c | 2 +-
tests/qtest/virtio-net-failover.c | 6 +++---
tests/qtest/virtio-net-test.c | 2 +-
tests/qtest/vmgenid-test.c | 2 +-
tests/qtest/wdt_ib700-test.c | 2 +-
tests/unit/check-block-qdict.c | 4 ++--
tests/unit/check-qdict.c | 6 +++---
tests/unit/check-qjson.c | 12 ++++++------
tests/unit/check-qlist.c | 4 ++--
tests/unit/check-qlit.c | 12 ++++++------
tests/unit/check-qnull.c | 2 +-
tests/unit/check-qnum.c | 2 +-
tests/unit/check-qobject.c | 12 ++++++------
tests/unit/check-qom-proplist.c | 4 ++--
tests/unit/check-qstring.c | 2 +-
tests/unit/test-block-iothread.c | 2 +-
tests/unit/test-blockjob-txn.c | 2 +-
tests/unit/test-blockjob.c | 2 +-
tests/unit/test-char.c | 2 +-
tests/unit/test-forward-visitor.c | 4 ++--
tests/unit/test-image-locking.c | 2 +-
tests/unit/test-keyval.c | 6 +++---
tests/unit/test-qemu-opts.c | 4 ++--
tests/unit/test-qga.c | 4 ++--
tests/unit/test-qmp-cmds.c | 8 ++++----
tests/unit/test-qmp-event.c | 10 +++++-----
tests/unit/test-qobject-input-visitor.c | 12 ++++++------
tests/unit/test-qobject-output-visitor.c | 12 ++++++------
tests/unit/test-replication.c | 2 +-
tests/unit/test-visitor-serialization.c | 4 ++--
trace/trace-hmp-cmds.c | 2 +-
ui/input-barrier.c | 2 +-
ui/ui-hmp-cmds.c | 2 +-
ui/ui-qmp-cmds.c | 2 +-
util/block-helpers.c | 2 +-
util/keyval.c | 6 +++---
util/qemu-config.c | 4 ++--
util/qemu-option.c | 10 +++++-----
279 files changed, 494 insertions(+), 497 deletions(-)
rename include/qapi/{qmp/dispatch.h => qmp-registry.h} (100%)
rename include/{qapi/qmp => qobject}/json-parser.h (100%)
rename include/{qapi/qmp => qobject}/json-writer.h (100%)
rename include/{qapi/qmp => qobject}/qbool.h (94%)
rename include/{qapi/qmp => qobject}/qdict.h (98%)
rename include/{qapi/qmp => qobject}/qerror.h (100%)
rename include/{qapi/qmp => qobject}/qjson.h (100%)
rename include/{qapi/qmp => qobject}/qlist.h (98%)
rename include/{qapi/qmp => qobject}/qlit.h (100%)
rename include/{qapi/qmp => qobject}/qnull.h (94%)
rename include/{qapi/qmp => qobject}/qnum.h (98%)
rename include/{qapi/qmp => qobject}/qobject.h (98%)
rename include/{qapi/qmp => qobject}/qstring.h (96%)
--
2.43.0
^ permalink raw reply [flat|nested] 37+ messages in thread
* [PATCH 01/29] include: move include/qapi/qmp/ to include/qobject/
2024-01-08 18:23 [PATCH 00/29] include: move include/qapi/qmp/ to include/qobject/ Daniel P. Berrangé
@ 2024-01-08 18:23 ` Daniel P. Berrangé
2024-01-08 18:46 ` Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 02/29] audio: adapt to new import path for qobject data type headers Daniel P. Berrangé
` (28 subsequent siblings)
29 siblings, 1 reply; 37+ messages in thread
From: Daniel P. Berrangé @ 2024-01-08 18:23 UTC (permalink / raw)
To: qemu-devel; +Cc: Markus Armbruster, Michael Roth, Daniel P. Berrangé
The general expectation is that header files should follow the same
file/path naming scheme as the corresponding source file. There are
various historical exceptions to this practice in QEMU, with one of
the most notable being the include/qapi/qmp/ directory. Most of the
headers there correspond to source files in qobject/.
This patch corrects that inconsistency by creating include/qobject/.
The only outlier is include/qapi/qmp/dispatch.h which gets renamed
to include/qapi/qmp-registry.h.
To allow the code to continue to build, symlinks are temporarily
added in $QEMU/qapi/qmp/ to point to the new location. They will
be removed in a later commit.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
MAINTAINERS | 5 +----
include/qapi/{qmp/dispatch.h => qmp-registry.h} | 0
include/{qapi/qmp => qobject}/json-parser.h | 0
include/{qapi/qmp => qobject}/json-writer.h | 0
include/{qapi/qmp => qobject}/qbool.h | 0
include/{qapi/qmp => qobject}/qdict.h | 0
include/{qapi/qmp => qobject}/qerror.h | 0
include/{qapi/qmp => qobject}/qjson.h | 0
include/{qapi/qmp => qobject}/qlist.h | 0
include/{qapi/qmp => qobject}/qlit.h | 0
include/{qapi/qmp => qobject}/qnull.h | 0
include/{qapi/qmp => qobject}/qnum.h | 0
include/{qapi/qmp => qobject}/qobject.h | 0
include/{qapi/qmp => qobject}/qstring.h | 0
qapi/qmp/dispatch.h | 1 +
qapi/qmp/json-parser.h | 1 +
qapi/qmp/json-writer.h | 1 +
qapi/qmp/qbool.h | 1 +
qapi/qmp/qdict.h | 1 +
qapi/qmp/qerror.h | 1 +
qapi/qmp/qjson.h | 1 +
qapi/qmp/qlist.h | 1 +
qapi/qmp/qlit.h | 1 +
qapi/qmp/qnull.h | 1 +
qapi/qmp/qnum.h | 1 +
qapi/qmp/qobject.h | 1 +
qapi/qmp/qstring.h | 1 +
27 files changed, 14 insertions(+), 4 deletions(-)
rename include/qapi/{qmp/dispatch.h => qmp-registry.h} (100%)
rename include/{qapi/qmp => qobject}/json-parser.h (100%)
rename include/{qapi/qmp => qobject}/json-writer.h (100%)
rename include/{qapi/qmp => qobject}/qbool.h (100%)
rename include/{qapi/qmp => qobject}/qdict.h (100%)
rename include/{qapi/qmp => qobject}/qerror.h (100%)
rename include/{qapi/qmp => qobject}/qjson.h (100%)
rename include/{qapi/qmp => qobject}/qlist.h (100%)
rename include/{qapi/qmp => qobject}/qlit.h (100%)
rename include/{qapi/qmp => qobject}/qnull.h (100%)
rename include/{qapi/qmp => qobject}/qnum.h (100%)
rename include/{qapi/qmp => qobject}/qobject.h (100%)
rename include/{qapi/qmp => qobject}/qstring.h (100%)
create mode 120000 qapi/qmp/dispatch.h
create mode 120000 qapi/qmp/json-parser.h
create mode 120000 qapi/qmp/json-writer.h
create mode 120000 qapi/qmp/qbool.h
create mode 120000 qapi/qmp/qdict.h
create mode 120000 qapi/qmp/qerror.h
create mode 120000 qapi/qmp/qjson.h
create mode 120000 qapi/qmp/qlist.h
create mode 120000 qapi/qmp/qlit.h
create mode 120000 qapi/qmp/qnull.h
create mode 120000 qapi/qmp/qnum.h
create mode 120000 qapi/qmp/qobject.h
create mode 120000 qapi/qmp/qstring.h
diff --git a/MAINTAINERS b/MAINTAINERS
index 395f26ba86..d72e040a9a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3154,8 +3154,6 @@ S: Supported
F: qapi/
X: qapi/*.json
F: include/qapi/
-X: include/qapi/qmp/
-F: include/qapi/qmp/dispatch.h
F: tests/qapi-schema/
F: tests/unit/test-*-visitor.c
F: tests/unit/test-qapi-*.c
@@ -3178,8 +3176,7 @@ QObject
M: Markus Armbruster <armbru@redhat.com>
S: Supported
F: qobject/
-F: include/qapi/qmp/
-X: include/qapi/qmp/dispatch.h
+F: include/qobject/
F: scripts/coccinelle/qobject.cocci
F: tests/unit/check-qdict.c
F: tests/unit/check-qjson.c
diff --git a/include/qapi/qmp/dispatch.h b/include/qapi/qmp-registry.h
similarity index 100%
rename from include/qapi/qmp/dispatch.h
rename to include/qapi/qmp-registry.h
diff --git a/include/qapi/qmp/json-parser.h b/include/qobject/json-parser.h
similarity index 100%
rename from include/qapi/qmp/json-parser.h
rename to include/qobject/json-parser.h
diff --git a/include/qapi/qmp/json-writer.h b/include/qobject/json-writer.h
similarity index 100%
rename from include/qapi/qmp/json-writer.h
rename to include/qobject/json-writer.h
diff --git a/include/qapi/qmp/qbool.h b/include/qobject/qbool.h
similarity index 100%
rename from include/qapi/qmp/qbool.h
rename to include/qobject/qbool.h
diff --git a/include/qapi/qmp/qdict.h b/include/qobject/qdict.h
similarity index 100%
rename from include/qapi/qmp/qdict.h
rename to include/qobject/qdict.h
diff --git a/include/qapi/qmp/qerror.h b/include/qobject/qerror.h
similarity index 100%
rename from include/qapi/qmp/qerror.h
rename to include/qobject/qerror.h
diff --git a/include/qapi/qmp/qjson.h b/include/qobject/qjson.h
similarity index 100%
rename from include/qapi/qmp/qjson.h
rename to include/qobject/qjson.h
diff --git a/include/qapi/qmp/qlist.h b/include/qobject/qlist.h
similarity index 100%
rename from include/qapi/qmp/qlist.h
rename to include/qobject/qlist.h
diff --git a/include/qapi/qmp/qlit.h b/include/qobject/qlit.h
similarity index 100%
rename from include/qapi/qmp/qlit.h
rename to include/qobject/qlit.h
diff --git a/include/qapi/qmp/qnull.h b/include/qobject/qnull.h
similarity index 100%
rename from include/qapi/qmp/qnull.h
rename to include/qobject/qnull.h
diff --git a/include/qapi/qmp/qnum.h b/include/qobject/qnum.h
similarity index 100%
rename from include/qapi/qmp/qnum.h
rename to include/qobject/qnum.h
diff --git a/include/qapi/qmp/qobject.h b/include/qobject/qobject.h
similarity index 100%
rename from include/qapi/qmp/qobject.h
rename to include/qobject/qobject.h
diff --git a/include/qapi/qmp/qstring.h b/include/qobject/qstring.h
similarity index 100%
rename from include/qapi/qmp/qstring.h
rename to include/qobject/qstring.h
diff --git a/qapi/qmp/dispatch.h b/qapi/qmp/dispatch.h
new file mode 120000
index 0000000000..ffedc3971d
--- /dev/null
+++ b/qapi/qmp/dispatch.h
@@ -0,0 +1 @@
+../../include/qapi/qmp-registry.h
\ No newline at end of file
diff --git a/qapi/qmp/json-parser.h b/qapi/qmp/json-parser.h
new file mode 120000
index 0000000000..059cb73fa8
--- /dev/null
+++ b/qapi/qmp/json-parser.h
@@ -0,0 +1 @@
+../../include/qobject/json-parser.h
\ No newline at end of file
diff --git a/qapi/qmp/json-writer.h b/qapi/qmp/json-writer.h
new file mode 120000
index 0000000000..3e952f4c97
--- /dev/null
+++ b/qapi/qmp/json-writer.h
@@ -0,0 +1 @@
+../../include/qobject/json-writer.h
\ No newline at end of file
diff --git a/qapi/qmp/qbool.h b/qapi/qmp/qbool.h
new file mode 120000
index 0000000000..443c881cf8
--- /dev/null
+++ b/qapi/qmp/qbool.h
@@ -0,0 +1 @@
+../../include/qobject/qbool.h
\ No newline at end of file
diff --git a/qapi/qmp/qdict.h b/qapi/qmp/qdict.h
new file mode 120000
index 0000000000..8183614eae
--- /dev/null
+++ b/qapi/qmp/qdict.h
@@ -0,0 +1 @@
+../../include/qobject/qdict.h
\ No newline at end of file
diff --git a/qapi/qmp/qerror.h b/qapi/qmp/qerror.h
new file mode 120000
index 0000000000..cf210737a3
--- /dev/null
+++ b/qapi/qmp/qerror.h
@@ -0,0 +1 @@
+../../include/qobject/qerror.h
\ No newline at end of file
diff --git a/qapi/qmp/qjson.h b/qapi/qmp/qjson.h
new file mode 120000
index 0000000000..85b48c5bfd
--- /dev/null
+++ b/qapi/qmp/qjson.h
@@ -0,0 +1 @@
+../../include/qobject/qjson.h
\ No newline at end of file
diff --git a/qapi/qmp/qlist.h b/qapi/qmp/qlist.h
new file mode 120000
index 0000000000..d40db0a12b
--- /dev/null
+++ b/qapi/qmp/qlist.h
@@ -0,0 +1 @@
+../../include/qobject/qlist.h
\ No newline at end of file
diff --git a/qapi/qmp/qlit.h b/qapi/qmp/qlit.h
new file mode 120000
index 0000000000..5dd5ac8ccb
--- /dev/null
+++ b/qapi/qmp/qlit.h
@@ -0,0 +1 @@
+../../include/qobject/qlit.h
\ No newline at end of file
diff --git a/qapi/qmp/qnull.h b/qapi/qmp/qnull.h
new file mode 120000
index 0000000000..944769d44b
--- /dev/null
+++ b/qapi/qmp/qnull.h
@@ -0,0 +1 @@
+../../include/qobject/qnull.h
\ No newline at end of file
diff --git a/qapi/qmp/qnum.h b/qapi/qmp/qnum.h
new file mode 120000
index 0000000000..8038e2f4d6
--- /dev/null
+++ b/qapi/qmp/qnum.h
@@ -0,0 +1 @@
+../../include/qobject/qnum.h
\ No newline at end of file
diff --git a/qapi/qmp/qobject.h b/qapi/qmp/qobject.h
new file mode 120000
index 0000000000..89d9118cfd
--- /dev/null
+++ b/qapi/qmp/qobject.h
@@ -0,0 +1 @@
+../../include/qobject/qobject.h
\ No newline at end of file
diff --git a/qapi/qmp/qstring.h b/qapi/qmp/qstring.h
new file mode 120000
index 0000000000..24f48de18a
--- /dev/null
+++ b/qapi/qmp/qstring.h
@@ -0,0 +1 @@
+../../include/qobject/qstring.h
\ No newline at end of file
--
2.43.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH 02/29] audio: adapt to new import path for qobject data type headers
2024-01-08 18:23 [PATCH 00/29] include: move include/qapi/qmp/ to include/qobject/ Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 01/29] " Daniel P. Berrangé
@ 2024-01-08 18:23 ` Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 03/29] authz: " Daniel P. Berrangé
` (27 subsequent siblings)
29 siblings, 0 replies; 37+ messages in thread
From: Daniel P. Berrangé @ 2024-01-08 18:23 UTC (permalink / raw)
To: qemu-devel; +Cc: Markus Armbruster, Michael Roth, Daniel P. Berrangé
The qobject data type headers have moved from qapi/qmp/ to
qobject/.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
audio/audio-hmp-cmds.c | 2 +-
audio/audio.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/audio/audio-hmp-cmds.c b/audio/audio-hmp-cmds.c
index c9608b715b..8774c09f18 100644
--- a/audio/audio-hmp-cmds.c
+++ b/audio/audio-hmp-cmds.c
@@ -27,7 +27,7 @@
#include "monitor/hmp.h"
#include "monitor/monitor.h"
#include "qapi/error.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
static QLIST_HEAD (capture_list_head, CaptureState) capture_head;
diff --git a/audio/audio.c b/audio/audio.c
index a1097bb016..2c262f4668 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -32,7 +32,7 @@
#include "qapi/qobject-input-visitor.h"
#include "qapi/qapi-visit-audio.h"
#include "qapi/qapi-commands-audio.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "qemu/cutils.h"
#include "qemu/error-report.h"
#include "qemu/log.h"
--
2.43.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH 03/29] authz: adapt to new import path for qobject data type headers
2024-01-08 18:23 [PATCH 00/29] include: move include/qapi/qmp/ to include/qobject/ Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 01/29] " Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 02/29] audio: adapt to new import path for qobject data type headers Daniel P. Berrangé
@ 2024-01-08 18:23 ` Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 04/29] block: " Daniel P. Berrangé
` (26 subsequent siblings)
29 siblings, 0 replies; 37+ messages in thread
From: Daniel P. Berrangé @ 2024-01-08 18:23 UTC (permalink / raw)
To: qemu-devel; +Cc: Markus Armbruster, Michael Roth, Daniel P. Berrangé
The qobject data type headers have moved from qapi/qmp/ to
qobject/.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
authz/listfile.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/authz/listfile.c b/authz/listfile.c
index 45a60e987d..d31d9103f7 100644
--- a/authz/listfile.c
+++ b/authz/listfile.c
@@ -28,8 +28,8 @@
#include "qemu/filemonitor.h"
#include "qom/object_interfaces.h"
#include "qapi/qapi-visit-authz.h"
-#include "qapi/qmp/qjson.h"
-#include "qapi/qmp/qobject.h"
+#include "qobject/qjson.h"
+#include "qobject/qobject.h"
#include "qapi/qobject-input-visitor.h"
--
2.43.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH 04/29] block: adapt to new import path for qobject data type headers
2024-01-08 18:23 [PATCH 00/29] include: move include/qapi/qmp/ to include/qobject/ Daniel P. Berrangé
` (2 preceding siblings ...)
2024-01-08 18:23 ` [PATCH 03/29] authz: " Daniel P. Berrangé
@ 2024-01-08 18:23 ` Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 05/29] backends: " Daniel P. Berrangé
` (25 subsequent siblings)
29 siblings, 0 replies; 37+ messages in thread
From: Daniel P. Berrangé @ 2024-01-08 18:23 UTC (permalink / raw)
To: qemu-devel; +Cc: Markus Armbruster, Michael Roth, Daniel P. Berrangé
The qobject data type headers have moved from qapi/qmp/ to
qobject/.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
block.c | 8 ++++----
block/blkdebug.c | 6 +++---
block/blkio.c | 2 +-
block/blklogwrites.c | 4 ++--
block/blkverify.c | 4 ++--
block/copy-before-write.c | 2 +-
block/copy-on-read.c | 2 +-
block/curl.c | 4 ++--
block/file-posix.c | 4 ++--
block/file-win32.c | 4 ++--
block/gluster.c | 4 ++--
block/iscsi.c | 4 ++--
block/monitor/block-hmp-cmds.c | 4 ++--
block/nbd.c | 2 +-
block/nfs.c | 4 ++--
block/null.c | 4 ++--
block/nvme.c | 4 ++--
block/parallels.c | 2 +-
block/qapi-sysemu.c | 2 +-
block/qapi.c | 10 +++++-----
block/qcow.c | 4 ++--
block/qcow2.c | 4 ++--
block/qed.c | 2 +-
block/quorum.c | 8 ++++----
block/rbd.c | 8 ++++----
block/replication.c | 2 +-
block/snapshot.c | 6 +++---
block/ssh.c | 4 ++--
block/stream.c | 2 +-
block/vhdx.c | 2 +-
block/vmdk.c | 4 ++--
block/vpc.c | 2 +-
block/vvfat.c | 4 ++--
blockdev.c | 10 +++++-----
blockjob.c | 2 +-
qemu-img.c | 4 ++--
qemu-io-cmds.c | 2 +-
qemu-io.c | 4 ++--
qemu-nbd.c | 4 ++--
storage-daemon/qemu-storage-daemon.c | 4 ++--
40 files changed, 81 insertions(+), 81 deletions(-)
diff --git a/block.c b/block.c
index a097772238..72bb9d7350 100644
--- a/block.c
+++ b/block.c
@@ -36,10 +36,10 @@
#include "qemu/main-loop.h"
#include "qemu/module.h"
#include "qapi/error.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qjson.h"
-#include "qapi/qmp/qnull.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qdict.h"
+#include "qobject/qjson.h"
+#include "qobject/qnull.h"
+#include "qobject/qstring.h"
#include "qapi/qobject-output-visitor.h"
#include "qapi/qapi-visit-block-core.h"
#include "sysemu/block-backend.h"
diff --git a/block/blkdebug.c b/block/blkdebug.c
index 9da8c9eddc..7f173f6336 100644
--- a/block/blkdebug.c
+++ b/block/blkdebug.c
@@ -33,9 +33,9 @@
#include "qemu/module.h"
#include "qemu/option.h"
#include "qapi/qapi-visit-block-core.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qlist.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qdict.h"
+#include "qobject/qlist.h"
+#include "qobject/qstring.h"
#include "qapi/qobject-input-visitor.h"
#include "sysemu/qtest.h"
diff --git a/block/blkio.c b/block/blkio.c
index 0a0a6c0f5f..5473dac76b 100644
--- a/block/blkio.c
+++ b/block/blkio.c
@@ -16,7 +16,7 @@
#include "qemu/defer-call.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "qemu/module.h"
#include "sysemu/block-backend.h"
#include "exec/memory.h" /* for ram_block_discard_disable() */
diff --git a/block/blklogwrites.c b/block/blklogwrites.c
index 7207b2e757..81452503fa 100644
--- a/block/blklogwrites.c
+++ b/block/blklogwrites.c
@@ -14,8 +14,8 @@
#include "qemu/sockets.h" /* for EINPROGRESS on Windows */
#include "block/block-io.h"
#include "block/block_int.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qdict.h"
+#include "qobject/qstring.h"
#include "qemu/cutils.h"
#include "qemu/module.h"
#include "qemu/option.h"
diff --git a/block/blkverify.c b/block/blkverify.c
index ec45d8335e..b6ced14985 100644
--- a/block/blkverify.c
+++ b/block/blkverify.c
@@ -12,8 +12,8 @@
#include "qemu/sockets.h" /* for EINPROGRESS on Windows */
#include "block/block-io.h"
#include "block/block_int.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qdict.h"
+#include "qobject/qstring.h"
#include "qemu/cutils.h"
#include "qemu/module.h"
#include "qemu/option.h"
diff --git a/block/copy-before-write.c b/block/copy-before-write.c
index 0842a1a6df..9275f5c237 100644
--- a/block/copy-before-write.c
+++ b/block/copy-before-write.c
@@ -24,7 +24,7 @@
*/
#include "qemu/osdep.h"
-#include "qapi/qmp/qjson.h"
+#include "qobject/qjson.h"
#include "sysemu/block-backend.h"
#include "qemu/cutils.h"
diff --git a/block/copy-on-read.c b/block/copy-on-read.c
index c36f253d16..accf1402f0 100644
--- a/block/copy-on-read.c
+++ b/block/copy-on-read.c
@@ -25,7 +25,7 @@
#include "block/block_int.h"
#include "qemu/module.h"
#include "qapi/error.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "block/copy-on-read.h"
diff --git a/block/curl.c b/block/curl.c
index 419f7c89ef..bdca9b0c91 100644
--- a/block/curl.c
+++ b/block/curl.c
@@ -29,8 +29,8 @@
#include "qemu/option.h"
#include "block/block-io.h"
#include "block/block_int.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qdict.h"
+#include "qobject/qstring.h"
#include "crypto/secret.h"
#include <curl/curl.h>
#include "qemu/cutils.h"
diff --git a/block/file-posix.c b/block/file-posix.c
index 35684f7e21..70bec5442f 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -36,8 +36,8 @@
#include "block/thread-pool.h"
#include "qemu/iov.h"
#include "block/raw-aio.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qdict.h"
+#include "qobject/qstring.h"
#include "scsi/pr-manager.h"
#include "scsi/constants.h"
diff --git a/block/file-win32.c b/block/file-win32.c
index 48b790d917..90309574d2 100644
--- a/block/file-win32.c
+++ b/block/file-win32.c
@@ -33,8 +33,8 @@
#include "trace.h"
#include "block/thread-pool.h"
#include "qemu/iov.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qdict.h"
+#include "qobject/qstring.h"
#include <windows.h>
#include <winioctl.h>
diff --git a/block/gluster.c b/block/gluster.c
index cc74af06dc..e2a11baec9 100644
--- a/block/gluster.c
+++ b/block/gluster.c
@@ -15,8 +15,8 @@
#include "block/block_int.h"
#include "block/qdict.h"
#include "qapi/error.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qdict.h"
+#include "qobject/qerror.h"
#include "qemu/uri.h"
#include "qemu/error-report.h"
#include "qemu/module.h"
diff --git a/block/iscsi.c b/block/iscsi.c
index 2ff14b7472..a3d52517d8 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -44,8 +44,8 @@
#include "sysemu/replay.h"
#include "qapi/error.h"
#include "qapi/qapi-commands-machine.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qdict.h"
+#include "qobject/qstring.h"
#include "crypto/secret.h"
#include "scsi/utils.h"
#include "trace.h"
diff --git a/block/monitor/block-hmp-cmds.c b/block/monitor/block-hmp-cmds.c
index bdbb5cb141..51eea4e7c9 100644
--- a/block/monitor/block-hmp-cmds.c
+++ b/block/monitor/block-hmp-cmds.c
@@ -41,9 +41,9 @@
#include "sysemu/blockdev.h"
#include "qapi/qapi-commands-block.h"
#include "qapi/qapi-commands-block-export.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "qapi/error.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
#include "qemu/config-file.h"
#include "qemu/option.h"
#include "qemu/sockets.h"
diff --git a/block/nbd.c b/block/nbd.c
index b9d4f935e0..679988b351 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -37,7 +37,7 @@
#include "qemu/main-loop.h"
#include "qapi/qapi-visit-sockets.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qstring.h"
#include "qapi/clone-visitor.h"
#include "block/qdict.h"
diff --git a/block/nfs.c b/block/nfs.c
index f737e19cd3..a96205841e 100644
--- a/block/nfs.c
+++ b/block/nfs.c
@@ -42,8 +42,8 @@
#include "qemu/cutils.h"
#include "sysemu/replay.h"
#include "qapi/qapi-visit-block-core.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qdict.h"
+#include "qobject/qstring.h"
#include "qapi/qobject-input-visitor.h"
#include "qapi/qobject-output-visitor.h"
#include <nfsc/libnfs.h>
diff --git a/block/null.c b/block/null.c
index 4808704ffd..7313622275 100644
--- a/block/null.c
+++ b/block/null.c
@@ -12,8 +12,8 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qdict.h"
+#include "qobject/qstring.h"
#include "qemu/module.h"
#include "qemu/option.h"
#include "block/block-io.h"
diff --git a/block/nvme.c b/block/nvme.c
index 0a0a0a6b36..1c2e198238 100644
--- a/block/nvme.c
+++ b/block/nvme.c
@@ -14,8 +14,8 @@
#include "qemu/osdep.h"
#include <linux/vfio.h>
#include "qapi/error.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qdict.h"
+#include "qobject/qstring.h"
#include "qemu/defer-call.h"
#include "qemu/error-report.h"
#include "qemu/main-loop.h"
diff --git a/block/parallels.c b/block/parallels.c
index 9205a0864f..402e8b58fd 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -36,7 +36,7 @@
#include "sysemu/block-backend.h"
#include "qemu/module.h"
#include "qemu/option.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "qapi/qobject-input-visitor.h"
#include "qapi/qapi-visit-block-core.h"
#include "qemu/bswap.h"
diff --git a/block/qapi-sysemu.c b/block/qapi-sysemu.c
index e4282631d2..8949f09488 100644
--- a/block/qapi-sysemu.c
+++ b/block/qapi-sysemu.c
@@ -35,7 +35,7 @@
#include "block/block_int.h"
#include "qapi/error.h"
#include "qapi/qapi-commands-block.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "sysemu/block-backend.h"
#include "sysemu/blockdev.h"
diff --git a/block/qapi.c b/block/qapi.c
index 9e806fa230..65eae459b2 100644
--- a/block/qapi.c
+++ b/block/qapi.c
@@ -33,11 +33,11 @@
#include "qapi/qapi-commands-block-core.h"
#include "qapi/qobject-output-visitor.h"
#include "qapi/qapi-visit-block-core.h"
-#include "qapi/qmp/qbool.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qlist.h"
-#include "qapi/qmp/qnum.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qbool.h"
+#include "qobject/qdict.h"
+#include "qobject/qlist.h"
+#include "qobject/qnum.h"
+#include "qobject/qstring.h"
#include "qemu/qemu-print.h"
#include "sysemu/block-backend.h"
diff --git a/block/qcow.c b/block/qcow.c
index c6d0e15f1e..6df5397707 100644
--- a/block/qcow.c
+++ b/block/qcow.c
@@ -34,8 +34,8 @@
#include "qemu/cutils.h"
#include "qemu/memalign.h"
#include <zlib.h>
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qdict.h"
+#include "qobject/qstring.h"
#include "qapi/qobject-input-visitor.h"
#include "qapi/qapi-visit-block-core.h"
#include "crypto/block.h"
diff --git a/block/qcow2.c b/block/qcow2.c
index 9bee66fff5..93b807efa9 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -32,8 +32,8 @@
#include "qemu/error-report.h"
#include "qapi/error.h"
#include "qapi/qapi-events-block-core.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qdict.h"
+#include "qobject/qstring.h"
#include "trace.h"
#include "qemu/option_int.h"
#include "qemu/cutils.h"
diff --git a/block/qed.c b/block/qed.c
index bc2f0a61c0..adc34121c5 100644
--- a/block/qed.c
+++ b/block/qed.c
@@ -24,7 +24,7 @@
#include "trace.h"
#include "qed.h"
#include "sysemu/block-backend.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "qapi/qobject-input-visitor.h"
#include "qapi/qapi-visit-block-core.h"
diff --git a/block/quorum.c b/block/quorum.c
index db8fe891c4..02cf5e197c 100644
--- a/block/quorum.c
+++ b/block/quorum.c
@@ -23,10 +23,10 @@
#include "block/qdict.h"
#include "qapi/error.h"
#include "qapi/qapi-events-block.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qerror.h"
-#include "qapi/qmp/qlist.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qdict.h"
+#include "qobject/qerror.h"
+#include "qobject/qlist.h"
+#include "qobject/qstring.h"
#include "crypto/hash.h"
#define HASH_LENGTH 32
diff --git a/block/rbd.c b/block/rbd.c
index 84bb2fa5d7..ae5918c0df 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -24,10 +24,10 @@
#include "crypto/secret.h"
#include "qemu/cutils.h"
#include "sysemu/replay.h"
-#include "qapi/qmp/qstring.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qjson.h"
-#include "qapi/qmp/qlist.h"
+#include "qobject/qstring.h"
+#include "qobject/qdict.h"
+#include "qobject/qjson.h"
+#include "qobject/qlist.h"
#include "qapi/qobject-input-visitor.h"
#include "qapi/qapi-visit-block-core.h"
diff --git a/block/replication.c b/block/replication.c
index ca6bd0a720..d0af79207e 100644
--- a/block/replication.c
+++ b/block/replication.c
@@ -21,7 +21,7 @@
#include "block/block_backup.h"
#include "sysemu/block-backend.h"
#include "qapi/error.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "block/replication.h"
typedef enum {
diff --git a/block/snapshot.c b/block/snapshot.c
index 8694fc0a3e..a877305a0f 100644
--- a/block/snapshot.c
+++ b/block/snapshot.c
@@ -27,9 +27,9 @@
#include "block/block_int.h"
#include "block/qdict.h"
#include "qapi/error.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qerror.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qdict.h"
+#include "qobject/qerror.h"
+#include "qobject/qstring.h"
#include "qemu/option.h"
#include "sysemu/block-backend.h"
diff --git a/block/ssh.c b/block/ssh.c
index 2748253d4a..e6f31c17cf 100644
--- a/block/ssh.c
+++ b/block/ssh.c
@@ -40,8 +40,8 @@
#include "qemu/uri.h"
#include "qapi/qapi-visit-sockets.h"
#include "qapi/qapi-visit-block-core.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qdict.h"
+#include "qobject/qstring.h"
#include "qapi/qobject-input-visitor.h"
#include "qapi/qobject-output-visitor.h"
#include "trace.h"
diff --git a/block/stream.c b/block/stream.c
index 048c2d282f..4084a54bb7 100644
--- a/block/stream.c
+++ b/block/stream.c
@@ -16,7 +16,7 @@
#include "block/block_int.h"
#include "block/blockjob_int.h"
#include "qapi/error.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "qemu/ratelimit.h"
#include "sysemu/block-backend.h"
#include "block/copy-on-read.h"
diff --git a/block/vhdx.c b/block/vhdx.c
index 5aa1a13506..b76e14ece0 100644
--- a/block/vhdx.c
+++ b/block/vhdx.c
@@ -29,7 +29,7 @@
#include "vhdx.h"
#include "migration/blocker.h"
#include "qemu/uuid.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "qapi/qobject-input-visitor.h"
#include "qapi/qapi-visit-block-core.h"
diff --git a/block/vmdk.c b/block/vmdk.c
index bf78e12383..6283f337d3 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -27,8 +27,8 @@
#include "qapi/error.h"
#include "block/block_int.h"
#include "sysemu/block-backend.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qdict.h"
+#include "qobject/qerror.h"
#include "qemu/error-report.h"
#include "qemu/module.h"
#include "qemu/option.h"
diff --git a/block/vpc.c b/block/vpc.c
index d95a204612..e8e3d9f698 100644
--- a/block/vpc.c
+++ b/block/vpc.c
@@ -34,7 +34,7 @@
#include "qemu/bswap.h"
#include "qemu/uuid.h"
#include "qemu/memalign.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "qapi/qobject-input-visitor.h"
#include "qapi/qapi-visit-block-core.h"
diff --git a/block/vvfat.c b/block/vvfat.c
index 9d050ba3ae..417585575b 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -34,8 +34,8 @@
#include "qemu/option.h"
#include "qemu/bswap.h"
#include "migration/blocker.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qdict.h"
+#include "qobject/qstring.h"
#include "qemu/ctype.h"
#include "qemu/cutils.h"
#include "qemu/error-report.h"
diff --git a/blockdev.c b/blockdev.c
index 3a5e7222ec..90dd8eced4 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -46,12 +46,12 @@
#include "qapi/qapi-commands-block.h"
#include "qapi/qapi-commands-transaction.h"
#include "qapi/qapi-visit-block-core.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qnum.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qdict.h"
+#include "qobject/qnum.h"
+#include "qobject/qstring.h"
#include "qapi/error.h"
-#include "qapi/qmp/qerror.h"
-#include "qapi/qmp/qlist.h"
+#include "qobject/qerror.h"
+#include "qobject/qlist.h"
#include "qapi/qobject-output-visitor.h"
#include "sysemu/sysemu.h"
#include "sysemu/iothread.h"
diff --git a/blockjob.c b/blockjob.c
index d5f29e14af..c4a7efa1db 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -32,7 +32,7 @@
#include "sysemu/block-backend.h"
#include "qapi/error.h"
#include "qapi/qapi-events-block-core.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
#include "qemu/main-loop.h"
#include "qemu/timer.h"
diff --git a/qemu-img.c b/qemu-img.c
index 7668f86769..3cee4e4d23 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -32,8 +32,8 @@
#include "qapi/qapi-commands-block-core.h"
#include "qapi/qapi-visit-block-core.h"
#include "qapi/qobject-output-visitor.h"
-#include "qapi/qmp/qjson.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qjson.h"
+#include "qobject/qdict.h"
#include "qemu/cutils.h"
#include "qemu/config-file.h"
#include "qemu/option.h"
diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c
index f5d7202a13..fa64cc1894 100644
--- a/qemu-io-cmds.c
+++ b/qemu-io-cmds.c
@@ -10,7 +10,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "qemu-io.h"
#include "sysemu/block-backend.h"
#include "block/block.h"
diff --git a/qemu-io.c b/qemu-io.c
index 6cb1e00385..3e30da48cb 100644
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -27,8 +27,8 @@
#include "qemu/readline.h"
#include "qemu/log.h"
#include "qemu/sockets.h"
-#include "qapi/qmp/qstring.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qstring.h"
+#include "qobject/qdict.h"
#include "qom/object_interfaces.h"
#include "sysemu/block-backend.h"
#include "block/block_int.h"
diff --git a/qemu-nbd.c b/qemu-nbd.c
index bac0b5e3ec..25b7987e8c 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -37,8 +37,8 @@
#include "qemu/log.h"
#include "qemu/systemd.h"
#include "block/snapshot.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qdict.h"
+#include "qobject/qstring.h"
#include "qom/object_interfaces.h"
#include "io/channel-socket.h"
#include "io/net-listener.h"
diff --git a/storage-daemon/qemu-storage-daemon.c b/storage-daemon/qemu-storage-daemon.c
index 0e9354faa6..9d5e84674d 100644
--- a/storage-daemon/qemu-storage-daemon.c
+++ b/storage-daemon/qemu-storage-daemon.c
@@ -38,8 +38,8 @@
#include "qapi/qapi-visit-block-core.h"
#include "qapi/qapi-visit-block-export.h"
#include "qapi/qapi-visit-control.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qdict.h"
+#include "qobject/qstring.h"
#include "qapi/qobject-input-visitor.h"
#include "qemu/help-texts.h"
--
2.43.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH 05/29] backends: adapt to new import path for qobject data type headers
2024-01-08 18:23 [PATCH 00/29] include: move include/qapi/qmp/ to include/qobject/ Daniel P. Berrangé
` (3 preceding siblings ...)
2024-01-08 18:23 ` [PATCH 04/29] block: " Daniel P. Berrangé
@ 2024-01-08 18:23 ` Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 06/29] chardev: " Daniel P. Berrangé
` (24 subsequent siblings)
29 siblings, 0 replies; 37+ messages in thread
From: Daniel P. Berrangé @ 2024-01-08 18:23 UTC (permalink / raw)
To: qemu-devel; +Cc: Markus Armbruster, Michael Roth, Daniel P. Berrangé
The qobject data type headers have moved from qapi/qmp/ to
qobject/.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
backends/cryptodev-hmp-cmds.c | 2 +-
backends/cryptodev-vhost-user.c | 2 +-
backends/dbus-vmstate.c | 2 +-
backends/iommufd.c | 2 +-
backends/rng-egd.c | 2 +-
backends/rng-random.c | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/backends/cryptodev-hmp-cmds.c b/backends/cryptodev-hmp-cmds.c
index 4f7220bb13..01396d227c 100644
--- a/backends/cryptodev-hmp-cmds.c
+++ b/backends/cryptodev-hmp-cmds.c
@@ -14,7 +14,7 @@
#include "monitor/hmp.h"
#include "monitor/monitor.h"
#include "qapi/qapi-commands-cryptodev.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
void hmp_info_cryptodev(Monitor *mon, const QDict *qdict)
diff --git a/backends/cryptodev-vhost-user.c b/backends/cryptodev-vhost-user.c
index c3283ba84a..eae00bdc14 100644
--- a/backends/cryptodev-vhost-user.c
+++ b/backends/cryptodev-vhost-user.c
@@ -23,7 +23,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
#include "qemu/error-report.h"
#include "hw/virtio/vhost-user.h"
#include "standard-headers/linux/virtio_crypto.h"
diff --git a/backends/dbus-vmstate.c b/backends/dbus-vmstate.c
index be6c4d8e0a..19f1e1060c 100644
--- a/backends/dbus-vmstate.c
+++ b/backends/dbus-vmstate.c
@@ -16,7 +16,7 @@
#include "qemu/error-report.h"
#include "qapi/error.h"
#include "qom/object_interfaces.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
#include "migration/vmstate.h"
#include "trace.h"
#include "qom/object.h"
diff --git a/backends/iommufd.c b/backends/iommufd.c
index ba58a0eb0d..6d75dbe14a 100644
--- a/backends/iommufd.c
+++ b/backends/iommufd.c
@@ -13,7 +13,7 @@
#include "qemu/osdep.h"
#include "sysemu/iommufd.h"
#include "qapi/error.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
#include "qemu/module.h"
#include "qom/object_interfaces.h"
#include "qemu/error-report.h"
diff --git a/backends/rng-egd.c b/backends/rng-egd.c
index 684c3cf3d6..c4a17cabb1 100644
--- a/backends/rng-egd.c
+++ b/backends/rng-egd.c
@@ -14,7 +14,7 @@
#include "sysemu/rng.h"
#include "chardev/char-fe.h"
#include "qapi/error.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
#include "qemu/module.h"
#include "qom/object.h"
diff --git a/backends/rng-random.c b/backends/rng-random.c
index 80eb5be138..aea79dcb86 100644
--- a/backends/rng-random.c
+++ b/backends/rng-random.c
@@ -14,7 +14,7 @@
#include "sysemu/rng-random.h"
#include "sysemu/rng.h"
#include "qapi/error.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
#include "qemu/main-loop.h"
#include "qemu/module.h"
--
2.43.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH 06/29] chardev: adapt to new import path for qobject data type headers
2024-01-08 18:23 [PATCH 00/29] include: move include/qapi/qmp/ to include/qobject/ Daniel P. Berrangé
` (4 preceding siblings ...)
2024-01-08 18:23 ` [PATCH 05/29] backends: " Daniel P. Berrangé
@ 2024-01-08 18:23 ` Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 07/29] docs: " Daniel P. Berrangé
` (23 subsequent siblings)
29 siblings, 0 replies; 37+ messages in thread
From: Daniel P. Berrangé @ 2024-01-08 18:23 UTC (permalink / raw)
To: qemu-devel; +Cc: Markus Armbruster, Michael Roth, Daniel P. Berrangé
The qobject data type headers have moved from qapi/qmp/ to
qobject/.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
chardev/char-fe.c | 2 +-
chardev/char-hmp-cmds.c | 2 +-
chardev/char.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/chardev/char-fe.c b/chardev/char-fe.c
index 7789f7be9c..6eb1a0e67e 100644
--- a/chardev/char-fe.c
+++ b/chardev/char-fe.c
@@ -24,7 +24,7 @@
#include "qemu/osdep.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
#include "sysemu/replay.h"
#include "chardev/char-fe.h"
diff --git a/chardev/char-hmp-cmds.c b/chardev/char-hmp-cmds.c
index 287c2b1bcd..8e9e1c1c02 100644
--- a/chardev/char-hmp-cmds.c
+++ b/chardev/char-hmp-cmds.c
@@ -19,7 +19,7 @@
#include "monitor/monitor.h"
#include "qapi/error.h"
#include "qapi/qapi-commands-char.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "qemu/config-file.h"
#include "qemu/option.h"
diff --git a/chardev/char.c b/chardev/char.c
index 996a024c7a..f9c96e7ff7 100644
--- a/chardev/char.c
+++ b/chardev/char.c
@@ -32,7 +32,7 @@
#include "chardev/char.h"
#include "qapi/error.h"
#include "qapi/qapi-commands-char.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
#include "sysemu/replay.h"
#include "qemu/help_option.h"
#include "qemu/module.h"
--
2.43.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH 07/29] docs: adapt to new import path for qobject data type headers
2024-01-08 18:23 [PATCH 00/29] include: move include/qapi/qmp/ to include/qobject/ Daniel P. Berrangé
` (5 preceding siblings ...)
2024-01-08 18:23 ` [PATCH 06/29] chardev: " Daniel P. Berrangé
@ 2024-01-08 18:23 ` Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 08/29] dump: " Daniel P. Berrangé
` (22 subsequent siblings)
29 siblings, 0 replies; 37+ messages in thread
From: Daniel P. Berrangé @ 2024-01-08 18:23 UTC (permalink / raw)
To: qemu-devel; +Cc: Markus Armbruster, Michael Roth, Daniel P. Berrangé
The qobject data type headers have moved from qapi/qmp/ to
qobject/.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
docs/devel/qapi-code-gen.rst | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/devel/qapi-code-gen.rst b/docs/devel/qapi-code-gen.rst
index 7f78183cd4..580ff9cbe0 100644
--- a/docs/devel/qapi-code-gen.rst
+++ b/docs/devel/qapi-code-gen.rst
@@ -1797,7 +1797,7 @@ Example::
#ifndef EXAMPLE_QAPI_INIT_COMMANDS_H
#define EXAMPLE_QAPI_INIT_COMMANDS_H
- #include "qapi/qmp/dispatch.h"
+ #include "qapi/qmp-registry.h"
void example_qmp_init_marshal(QmpCommandList *cmds);
@@ -1928,7 +1928,7 @@ Example::
#ifndef EXAMPLE_QAPI_INTROSPECT_H
#define EXAMPLE_QAPI_INTROSPECT_H
- #include "qapi/qmp/qlit.h"
+ #include "qobject/qlit.h"
extern const QLitObject example_qmp_schema_qlit;
--
2.43.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH 08/29] dump: adapt to new import path for qobject data type headers
2024-01-08 18:23 [PATCH 00/29] include: move include/qapi/qmp/ to include/qobject/ Daniel P. Berrangé
` (6 preceding siblings ...)
2024-01-08 18:23 ` [PATCH 07/29] docs: " Daniel P. Berrangé
@ 2024-01-08 18:23 ` Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 09/29] hw: " Daniel P. Berrangé
` (21 subsequent siblings)
29 siblings, 0 replies; 37+ messages in thread
From: Daniel P. Berrangé @ 2024-01-08 18:23 UTC (permalink / raw)
To: qemu-devel; +Cc: Markus Armbruster, Michael Roth, Daniel P. Berrangé
The qobject data type headers have moved from qapi/qmp/ to
qobject/.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
dump/dump-hmp-cmds.c | 2 +-
dump/dump.c | 2 +-
dump/win_dump.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dump/dump-hmp-cmds.c b/dump/dump-hmp-cmds.c
index b428ec33df..68ab383ece 100644
--- a/dump/dump-hmp-cmds.c
+++ b/dump/dump-hmp-cmds.c
@@ -10,7 +10,7 @@
#include "monitor/monitor.h"
#include "qapi/error.h"
#include "qapi/qapi-commands-dump.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
void hmp_dump_guest_memory(Monitor *mon, const QDict *qdict)
{
diff --git a/dump/dump.c b/dump/dump.c
index 4819050764..237ec0d56d 100644
--- a/dump/dump.c
+++ b/dump/dump.c
@@ -23,7 +23,7 @@
#include "qapi/error.h"
#include "qapi/qapi-commands-dump.h"
#include "qapi/qapi-events-dump.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
#include "qemu/error-report.h"
#include "qemu/main-loop.h"
#include "hw/misc/vmcoreinfo.h"
diff --git a/dump/win_dump.c b/dump/win_dump.c
index b7bfaff379..ad45312b6d 100644
--- a/dump/win_dump.c
+++ b/dump/win_dump.c
@@ -12,7 +12,7 @@
#include "sysemu/dump.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
#include "exec/cpu-defs.h"
#include "hw/core/cpu.h"
#include "qemu/win_dump_defs.h"
--
2.43.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH 09/29] hw: adapt to new import path for qobject data type headers
2024-01-08 18:23 [PATCH 00/29] include: move include/qapi/qmp/ to include/qobject/ Daniel P. Berrangé
` (7 preceding siblings ...)
2024-01-08 18:23 ` [PATCH 08/29] dump: " Daniel P. Berrangé
@ 2024-01-08 18:23 ` Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 10/29] include: " Daniel P. Berrangé
` (20 subsequent siblings)
29 siblings, 0 replies; 37+ messages in thread
From: Daniel P. Berrangé @ 2024-01-08 18:23 UTC (permalink / raw)
To: qemu-devel; +Cc: Markus Armbruster, Michael Roth, Daniel P. Berrangé
The qobject data type headers have moved from qapi/qmp/ to
qobject/.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
hw/arm/mps2-tz.c | 2 +-
hw/arm/mps2.c | 2 +-
hw/arm/sbsa-ref.c | 2 +-
hw/arm/stellaris.c | 2 +-
hw/arm/vexpress.c | 2 +-
hw/arm/virt.c | 2 +-
hw/arm/xlnx-versal.c | 2 +-
hw/block/xen-block.c | 4 ++--
hw/core/machine-hmp-cmds.c | 2 +-
hw/core/machine-qmp-cmds.c | 2 +-
hw/core/qdev-properties-system.c | 2 +-
hw/core/qdev-properties.c | 4 ++--
hw/core/qdev.c | 4 ++--
hw/hyperv/hv-balloon.c | 2 +-
hw/i386/acpi-build.c | 2 +-
hw/i386/kvm/xen_evtchn.c | 2 +-
hw/i386/pc.c | 2 +-
hw/intc/openpic.c | 2 +-
hw/net/rocker/rocker-hmp-cmds.c | 2 +-
hw/net/virtio-net.c | 2 +-
hw/net/xen_nic.c | 2 +-
hw/pci/pci-hmp-cmds.c | 2 +-
hw/ppc/pegasos2.c | 2 +-
hw/ppc/spapr_drc.c | 2 +-
hw/ppc/spapr_pci.c | 2 +-
hw/rx/rx62n.c | 2 +-
hw/s390x/s390-skeys.c | 2 +-
hw/s390x/s390-stattrib.c | 2 +-
hw/usb/redirect.c | 2 +-
hw/usb/xen-usb.c | 4 ++--
hw/vfio/pci.c | 2 +-
hw/virtio/virtio-hmp-cmds.c | 2 +-
hw/virtio/virtio-qmp.c | 4 ++--
hw/xen/xen-bus.c | 2 +-
34 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/hw/arm/mps2-tz.c b/hw/arm/mps2-tz.c
index 668db5ed61..b351834c5a 100644
--- a/hw/arm/mps2-tz.c
+++ b/hw/arm/mps2-tz.c
@@ -48,7 +48,7 @@
#include "qemu/units.h"
#include "qemu/cutils.h"
#include "qapi/error.h"
-#include "qapi/qmp/qlist.h"
+#include "qobject/qlist.h"
#include "qemu/error-report.h"
#include "hw/arm/boot.h"
#include "hw/arm/armv7m.h"
diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c
index 292a180ad2..296b814272 100644
--- a/hw/arm/mps2.c
+++ b/hw/arm/mps2.c
@@ -48,7 +48,7 @@
#include "net/net.h"
#include "hw/watchdog/cmsdk-apb-watchdog.h"
#include "hw/qdev-clock.h"
-#include "qapi/qmp/qlist.h"
+#include "qobject/qlist.h"
#include "qom/object.h"
typedef enum MPS2FPGAType {
diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c
index f3c9704693..38f6276cee 100644
--- a/hw/arm/sbsa-ref.c
+++ b/hw/arm/sbsa-ref.c
@@ -48,7 +48,7 @@
#include "hw/char/pl011.h"
#include "hw/watchdog/sbsa_gwdt.h"
#include "net/net.h"
-#include "qapi/qmp/qlist.h"
+#include "qobject/qlist.h"
#include "qom/object.h"
#define RAMLIMIT_GB 8192
diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c
index 729a8bf569..c4463284e9 100644
--- a/hw/arm/stellaris.c
+++ b/hw/arm/stellaris.c
@@ -31,7 +31,7 @@
#include "hw/timer/stellaris-gptm.h"
#include "hw/qdev-clock.h"
#include "qom/object.h"
-#include "qapi/qmp/qlist.h"
+#include "qobject/qlist.h"
#include "ui/input.h"
#define GPIO_A 0
diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c
index fd981f4c33..ddc8934f5f 100644
--- a/hw/arm/vexpress.c
+++ b/hw/arm/vexpress.c
@@ -43,7 +43,7 @@
#include "hw/cpu/a15mpcore.h"
#include "hw/i2c/arm_sbcon_i2c.h"
#include "hw/sd/sd.h"
-#include "qapi/qmp/qlist.h"
+#include "qobject/qlist.h"
#include "qom/object.h"
#include "audio/audio.h"
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 8b69aba189..f769bdfa44 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -69,7 +69,7 @@
#include "hw/firmware/smbios.h"
#include "qapi/visitor.h"
#include "qapi/qapi-visit-common.h"
-#include "qapi/qmp/qlist.h"
+#include "qobject/qlist.h"
#include "standard-headers/linux/input.h"
#include "hw/arm/smmuv3.h"
#include "hw/acpi/acpi.h"
diff --git a/hw/arm/xlnx-versal.c b/hw/arm/xlnx-versal.c
index 9600551c44..2855c8831f 100644
--- a/hw/arm/xlnx-versal.c
+++ b/hw/arm/xlnx-versal.c
@@ -12,7 +12,7 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
#include "qapi/error.h"
-#include "qapi/qmp/qlist.h"
+#include "qobject/qlist.h"
#include "qemu/module.h"
#include "hw/sysbus.h"
#include "net/net.h"
diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c
index aed1d5c330..5c5a5fec19 100644
--- a/hw/block/xen-block.c
+++ b/hw/block/xen-block.c
@@ -16,8 +16,8 @@
#include "qapi/qapi-visit-block-core.h"
#include "qapi/qobject-input-visitor.h"
#include "qapi/visitor.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qdict.h"
+#include "qobject/qstring.h"
#include "qom/object_interfaces.h"
#include "hw/block/xen_blkif.h"
#include "hw/qdev-properties.h"
diff --git a/hw/core/machine-hmp-cmds.c b/hw/core/machine-hmp-cmds.c
index a6ff6a4875..d5fcff53a5 100644
--- a/hw/core/machine-hmp-cmds.c
+++ b/hw/core/machine-hmp-cmds.c
@@ -19,7 +19,7 @@
#include "qapi/error.h"
#include "qapi/qapi-builtin-visit.h"
#include "qapi/qapi-commands-machine.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "qapi/string-output-visitor.h"
#include "qemu/error-report.h"
#include "sysemu/numa.h"
diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c
index 3860a50c3b..edb4d9298b 100644
--- a/hw/core/machine-qmp-cmds.c
+++ b/hw/core/machine-qmp-cmds.c
@@ -16,7 +16,7 @@
#include "qapi/error.h"
#include "qapi/qapi-builtin-visit.h"
#include "qapi/qapi-commands-machine.h"
-#include "qapi/qmp/qobject.h"
+#include "qobject/qobject.h"
#include "qapi/qobject-input-visitor.h"
#include "qapi/type-helpers.h"
#include "qemu/main-loop.h"
diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c
index 1a396521d5..2685ec76c5 100644
--- a/hw/core/qdev-properties-system.c
+++ b/hw/core/qdev-properties-system.c
@@ -19,7 +19,7 @@
#include "qapi/qapi-types-machine.h"
#include "qapi/qapi-types-migration.h"
#include "qapi/qapi-visit-virtio.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
#include "qemu/ctype.h"
#include "qemu/cutils.h"
#include "qemu/units.h"
diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index 7d6fa726fd..68ed53d86f 100644
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -2,8 +2,8 @@
#include "hw/qdev-properties.h"
#include "qapi/error.h"
#include "qapi/qapi-types-misc.h"
-#include "qapi/qmp/qerror.h"
-#include "qapi/qmp/qlist.h"
+#include "qobject/qerror.h"
+#include "qobject/qlist.h"
#include "qemu/ctype.h"
#include "qemu/error-report.h"
#include "qapi/visitor.h"
diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index 43d863b0c5..c76c5393fb 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -28,8 +28,8 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qapi/qapi-events-qdev.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qdict.h"
+#include "qobject/qerror.h"
#include "qapi/visitor.h"
#include "qemu/error-report.h"
#include "qemu/option.h"
diff --git a/hw/hyperv/hv-balloon.c b/hw/hyperv/hv-balloon.c
index 66f297c1d7..1f93101873 100644
--- a/hw/hyperv/hv-balloon.c
+++ b/hw/hyperv/hv-balloon.c
@@ -25,7 +25,7 @@
#include "qapi/qapi-commands-machine.h"
#include "qapi/qapi-events-machine.h"
#include "qapi/qapi-types-machine.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "qapi/visitor.h"
#include "qemu/error-report.h"
#include "qemu/module.h"
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index edc979379c..fe945c9172 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -22,7 +22,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "qapi/qmp/qnum.h"
+#include "qobject/qnum.h"
#include "acpi-build.h"
#include "acpi-common.h"
#include "qemu/bitmap.h"
diff --git a/hw/i386/kvm/xen_evtchn.c b/hw/i386/kvm/xen_evtchn.c
index 9a5f3caa24..368ef10d20 100644
--- a/hw/i386/kvm/xen_evtchn.c
+++ b/hw/i386/kvm/xen_evtchn.c
@@ -20,7 +20,7 @@
#include "monitor/hmp.h"
#include "qapi/error.h"
#include "qapi/qapi-commands-misc-target.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "qom/object.h"
#include "exec/target_page.h"
#include "exec/address-spaces.h"
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 496498df3a..d3824f7718 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -44,7 +44,7 @@
#include "sysemu/reset.h"
#include "kvm/kvm_i386.h"
#include "hw/xen/xen.h"
-#include "qapi/qmp/qlist.h"
+#include "qobject/qlist.h"
#include "qemu/error-report.h"
#include "hw/acpi/cpu_hotplug.h"
#include "acpi-build.h"
diff --git a/hw/intc/openpic.c b/hw/intc/openpic.c
index 9792a11224..59844289ff 100644
--- a/hw/intc/openpic.c
+++ b/hw/intc/openpic.c
@@ -41,7 +41,7 @@
#include "hw/pci/msi.h"
#include "qapi/error.h"
#include "qemu/bitops.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
#include "qemu/module.h"
#include "qemu/timer.h"
#include "qemu/error-report.h"
diff --git a/hw/net/rocker/rocker-hmp-cmds.c b/hw/net/rocker/rocker-hmp-cmds.c
index 197c6e28dc..df40991f6d 100644
--- a/hw/net/rocker/rocker-hmp-cmds.c
+++ b/hw/net/rocker/rocker-hmp-cmds.c
@@ -18,7 +18,7 @@
#include "monitor/monitor.h"
#include "net/eth.h"
#include "qapi/qapi-commands-rocker.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
void hmp_rocker(Monitor *mon, const QDict *qdict)
{
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index 7a2846fa1c..aad6fde6f4 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -26,7 +26,7 @@
#include "qemu/option.h"
#include "qemu/option_int.h"
#include "qemu/config-file.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "hw/virtio/virtio-net.h"
#include "net/vhost_net.h"
#include "net/announce.h"
diff --git a/hw/net/xen_nic.c b/hw/net/xen_nic.c
index 1e2b3baeb1..78fbf2983b 100644
--- a/hw/net/xen_nic.c
+++ b/hw/net/xen_nic.c
@@ -24,7 +24,7 @@
#include "qemu/cutils.h"
#include "qemu/log.h"
#include "qemu/qemu-print.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "qapi/error.h"
#include <sys/socket.h>
diff --git a/hw/pci/pci-hmp-cmds.c b/hw/pci/pci-hmp-cmds.c
index b09fce9377..d59075edd7 100644
--- a/hw/pci/pci-hmp-cmds.c
+++ b/hw/pci/pci-hmp-cmds.c
@@ -20,7 +20,7 @@
#include "monitor/monitor.h"
#include "pci-internal.h"
#include "qapi/error.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "qapi/qapi-commands-pci.h"
#include "qemu/cutils.h"
diff --git a/hw/ppc/pegasos2.c b/hw/ppc/pegasos2.c
index 3203a4a728..f3adccc98b 100644
--- a/hw/ppc/pegasos2.c
+++ b/hw/ppc/pegasos2.c
@@ -32,7 +32,7 @@
#include "kvm_ppc.h"
#include "exec/address-spaces.h"
#include "qom/qom-qobject.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "trace.h"
#include "qemu/datadir.h"
#include "sysemu/device_tree.h"
diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c
index 1484e3209d..4b3dec6e50 100644
--- a/hw/ppc/spapr_drc.c
+++ b/hw/ppc/spapr_drc.c
@@ -12,7 +12,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "qapi/qmp/qnull.h"
+#include "qobject/qnull.h"
#include "qemu/cutils.h"
#include "hw/ppc/spapr_drc.h"
#include "qom/object.h"
diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index 25e0295d6f..6c790a3307 100644
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -39,7 +39,7 @@
#include "trace.h"
#include "qemu/error-report.h"
#include "qemu/module.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
#include "hw/ppc/fdt.h"
#include "hw/pci/pci_bridge.h"
#include "hw/pci/pci_bus.h"
diff --git a/hw/rx/rx62n.c b/hw/rx/rx62n.c
index 4dc44afd9d..1d10bdbd39 100644
--- a/hw/rx/rx62n.c
+++ b/hw/rx/rx62n.c
@@ -28,7 +28,7 @@
#include "hw/sysbus.h"
#include "hw/qdev-properties.h"
#include "sysemu/sysemu.h"
-#include "qapi/qmp/qlist.h"
+#include "qobject/qlist.h"
#include "qom/object.h"
/*
diff --git a/hw/s390x/s390-skeys.c b/hw/s390x/s390-skeys.c
index 8f5159d85d..04b944e770 100644
--- a/hw/s390x/s390-skeys.c
+++ b/hw/s390x/s390-skeys.c
@@ -16,7 +16,7 @@
#include "hw/s390x/storage-keys.h"
#include "qapi/error.h"
#include "qapi/qapi-commands-misc-target.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "qemu/error-report.h"
#include "sysemu/memory_mapping.h"
#include "exec/address-spaces.h"
diff --git a/hw/s390x/s390-stattrib.c b/hw/s390x/s390-stattrib.c
index c483b62a9b..aa25fac6f3 100644
--- a/hw/s390x/s390-stattrib.c
+++ b/hw/s390x/s390-stattrib.c
@@ -18,7 +18,7 @@
#include "qemu/error-report.h"
#include "exec/ram_addr.h"
#include "qapi/error.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
/* 512KiB cover 2GB of guest memory */
#define CMMA_BLOCK_SIZE (512 * KiB)
diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
index 636eb98e41..6c87ced39d 100644
--- a/hw/usb/redirect.c
+++ b/hw/usb/redirect.c
@@ -32,7 +32,7 @@
#include "qemu/timer.h"
#include "sysemu/runstate.h"
#include "sysemu/sysemu.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
#include "qemu/error-report.h"
#include "qemu/iov.h"
#include "qemu/module.h"
diff --git a/hw/usb/xen-usb.c b/hw/usb/xen-usb.c
index 09ec326aea..e305d69882 100644
--- a/hw/usb/xen-usb.c
+++ b/hw/usb/xen-usb.c
@@ -30,8 +30,8 @@
#include "hw/xen/xen-legacy-backend.h"
#include "monitor/qdev.h"
#include "qapi/error.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qdict.h"
+#include "qobject/qstring.h"
#include "hw/xen/interface/io/usbif.h"
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index 9f838978be..eb847a7e9c 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -30,7 +30,7 @@
#include "hw/qdev-properties.h"
#include "hw/qdev-properties-system.h"
#include "migration/vmstate.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "qemu/error-report.h"
#include "qemu/main-loop.h"
#include "qemu/module.h"
diff --git a/hw/virtio/virtio-hmp-cmds.c b/hw/virtio/virtio-hmp-cmds.c
index 477c97dea2..7d8677bcf0 100644
--- a/hw/virtio/virtio-hmp-cmds.c
+++ b/hw/virtio/virtio-hmp-cmds.c
@@ -9,7 +9,7 @@
#include "monitor/hmp.h"
#include "monitor/monitor.h"
#include "qapi/qapi-commands-virtio.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
static void hmp_virtio_dump_protocols(Monitor *mon,
diff --git a/hw/virtio/virtio-qmp.c b/hw/virtio/virtio-qmp.c
index 1dd96ed20f..71316362cd 100644
--- a/hw/virtio/virtio-qmp.c
+++ b/hw/virtio/virtio-qmp.c
@@ -15,8 +15,8 @@
#include "qapi/error.h"
#include "qapi/qapi-commands-virtio.h"
#include "qapi/qapi-commands-qom.h"
-#include "qapi/qmp/qobject.h"
-#include "qapi/qmp/qjson.h"
+#include "qobject/qobject.h"
+#include "qobject/qjson.h"
#include "hw/virtio/vhost-user.h"
#include "standard-headers/linux/virtio_ids.h"
diff --git a/hw/xen/xen-bus.c b/hw/xen/xen-bus.c
index 4973e7d9c9..ed0788d08f 100644
--- a/hw/xen/xen-bus.c
+++ b/hw/xen/xen-bus.c
@@ -17,7 +17,7 @@
#include "hw/xen/xen-bus-helper.h"
#include "monitor/monitor.h"
#include "qapi/error.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "sysemu/sysemu.h"
#include "trace.h"
--
2.43.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH 10/29] include: adapt to new import path for qobject data type headers
2024-01-08 18:23 [PATCH 00/29] include: move include/qapi/qmp/ to include/qobject/ Daniel P. Berrangé
` (8 preceding siblings ...)
2024-01-08 18:23 ` [PATCH 09/29] hw: " Daniel P. Berrangé
@ 2024-01-08 18:23 ` Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 11/29] migration: " Daniel P. Berrangé
` (19 subsequent siblings)
29 siblings, 0 replies; 37+ messages in thread
From: Daniel P. Berrangé @ 2024-01-08 18:23 UTC (permalink / raw)
To: qemu-devel; +Cc: Markus Armbruster, Michael Roth, Daniel P. Berrangé
The qobject data type headers have moved from qapi/qmp/ to
qobject/.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
include/block/qdict.h | 2 +-
include/qobject/qbool.h | 2 +-
include/qobject/qdict.h | 2 +-
include/qobject/qlist.h | 2 +-
include/qobject/qnull.h | 2 +-
include/qobject/qnum.h | 2 +-
include/qobject/qobject.h | 2 +-
include/qobject/qstring.h | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/include/block/qdict.h b/include/block/qdict.h
index b4c28d96a9..53c4df4cb2 100644
--- a/include/block/qdict.h
+++ b/include/block/qdict.h
@@ -10,7 +10,7 @@
#ifndef BLOCK_QDICT_H
#define BLOCK_QDICT_H
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
QObject *qdict_crumple(const QDict *src, Error **errp);
void qdict_flatten(QDict *qdict);
diff --git a/include/qobject/qbool.h b/include/qobject/qbool.h
index 0d09726939..b348e17867 100644
--- a/include/qobject/qbool.h
+++ b/include/qobject/qbool.h
@@ -14,7 +14,7 @@
#ifndef QBOOL_H
#define QBOOL_H
-#include "qapi/qmp/qobject.h"
+#include "qobject/qobject.h"
struct QBool {
struct QObjectBase_ base;
diff --git a/include/qobject/qdict.h b/include/qobject/qdict.h
index 82e90fc072..903e6e5462 100644
--- a/include/qobject/qdict.h
+++ b/include/qobject/qdict.h
@@ -13,7 +13,7 @@
#ifndef QDICT_H
#define QDICT_H
-#include "qapi/qmp/qobject.h"
+#include "qobject/qobject.h"
#include "qemu/queue.h"
#define QDICT_BUCKET_MAX 512
diff --git a/include/qobject/qlist.h b/include/qobject/qlist.h
index e4e985d435..0377bf824e 100644
--- a/include/qobject/qlist.h
+++ b/include/qobject/qlist.h
@@ -13,7 +13,7 @@
#ifndef QLIST_H
#define QLIST_H
-#include "qapi/qmp/qobject.h"
+#include "qobject/qobject.h"
#include "qemu/queue.h"
typedef struct QListEntry {
diff --git a/include/qobject/qnull.h b/include/qobject/qnull.h
index 7feb7c7d83..4423836a0c 100644
--- a/include/qobject/qnull.h
+++ b/include/qobject/qnull.h
@@ -13,7 +13,7 @@
#ifndef QNULL_H
#define QNULL_H
-#include "qapi/qmp/qobject.h"
+#include "qobject/qobject.h"
struct QNull {
struct QObjectBase_ base;
diff --git a/include/qobject/qnum.h b/include/qobject/qnum.h
index e86788dd2e..1ce24b3668 100644
--- a/include/qobject/qnum.h
+++ b/include/qobject/qnum.h
@@ -15,7 +15,7 @@
#ifndef QNUM_H
#define QNUM_H
-#include "qapi/qmp/qobject.h"
+#include "qobject/qobject.h"
typedef enum {
QNUM_I64,
diff --git a/include/qobject/qobject.h b/include/qobject/qobject.h
index 89b97d88bc..35f9693b84 100644
--- a/include/qobject/qobject.h
+++ b/include/qobject/qobject.h
@@ -34,7 +34,7 @@
#include "qapi/qapi-builtin-types.h"
-/* Not for use outside include/qapi/qmp/ */
+/* Not for use outside include/qobject/ */
struct QObjectBase_ {
QType type;
size_t refcnt;
diff --git a/include/qobject/qstring.h b/include/qobject/qstring.h
index 318d815d6a..1e2abe4032 100644
--- a/include/qobject/qstring.h
+++ b/include/qobject/qstring.h
@@ -13,7 +13,7 @@
#ifndef QSTRING_H
#define QSTRING_H
-#include "qapi/qmp/qobject.h"
+#include "qobject/qobject.h"
struct QString {
struct QObjectBase_ base;
--
2.43.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH 11/29] migration: adapt to new import path for qobject data type headers
2024-01-08 18:23 [PATCH 00/29] include: move include/qapi/qmp/ to include/qobject/ Daniel P. Berrangé
` (9 preceding siblings ...)
2024-01-08 18:23 ` [PATCH 10/29] include: " Daniel P. Berrangé
@ 2024-01-08 18:23 ` Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 12/29] monitor: " Daniel P. Berrangé
` (18 subsequent siblings)
29 siblings, 0 replies; 37+ messages in thread
From: Daniel P. Berrangé @ 2024-01-08 18:23 UTC (permalink / raw)
To: qemu-devel; +Cc: Markus Armbruster, Michael Roth, Daniel P. Berrangé
The qobject data type headers have moved from qapi/qmp/ to
qobject/.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
migration/dirtyrate.c | 2 +-
migration/migration-hmp-cmds.c | 2 +-
migration/migration.c | 4 ++--
migration/migration.h | 2 +-
migration/options.c | 4 ++--
migration/page_cache.c | 2 +-
migration/ram.c | 2 +-
migration/savevm.c | 2 +-
migration/vmstate.c | 2 +-
9 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c
index 62d86b8be2..a6ec21222d 100644
--- a/migration/dirtyrate.c
+++ b/migration/dirtyrate.c
@@ -25,7 +25,7 @@
#include "dirtyrate.h"
#include "monitor/hmp.h"
#include "monitor/monitor.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "sysemu/kvm.h"
#include "sysemu/runstate.h"
#include "exec/memory.h"
diff --git a/migration/migration-hmp-cmds.c b/migration/migration-hmp-cmds.c
index 99710c8ffb..fda69726f6 100644
--- a/migration/migration-hmp-cmds.c
+++ b/migration/migration-hmp-cmds.c
@@ -21,7 +21,7 @@
#include "qapi/error.h"
#include "qapi/qapi-commands-migration.h"
#include "qapi/qapi-visit-migration.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "qapi/string-input-visitor.h"
#include "qapi/string-output-visitor.h"
#include "qemu/cutils.h"
diff --git a/migration/migration.c b/migration/migration.c
index 3ce04b2aaf..2eb6341b49 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -43,8 +43,8 @@
#include "qapi/qapi-visit-sockets.h"
#include "qapi/qapi-commands-migration.h"
#include "qapi/qapi-events-migration.h"
-#include "qapi/qmp/qerror.h"
-#include "qapi/qmp/qnull.h"
+#include "qobject/qerror.h"
+#include "qobject/qnull.h"
#include "qemu/rcu.h"
#include "block.h"
#include "postcopy-ram.h"
diff --git a/migration/migration.h b/migration/migration.h
index cf2c9c88e0..e1e4b3e8d9 100644
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -17,7 +17,7 @@
#include "exec/cpu-common.h"
#include "hw/qdev-core.h"
#include "qapi/qapi-types-migration.h"
-#include "qapi/qmp/json-writer.h"
+#include "qobject/json-writer.h"
#include "qemu/thread.h"
#include "qemu/coroutine_int.h"
#include "io/channel.h"
diff --git a/migration/options.c b/migration/options.c
index 8d8ec73ad9..66b980a102 100644
--- a/migration/options.c
+++ b/migration/options.c
@@ -18,8 +18,8 @@
#include "qapi/error.h"
#include "qapi/qapi-commands-migration.h"
#include "qapi/qapi-visit-migration.h"
-#include "qapi/qmp/qerror.h"
-#include "qapi/qmp/qnull.h"
+#include "qobject/qerror.h"
+#include "qobject/qnull.h"
#include "sysemu/runstate.h"
#include "migration/colo.h"
#include "migration/misc.h"
diff --git a/migration/page_cache.c b/migration/page_cache.c
index 6d4f7a9bbc..f262f90675 100644
--- a/migration/page_cache.c
+++ b/migration/page_cache.c
@@ -14,7 +14,7 @@
#include "qemu/osdep.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
#include "qapi/error.h"
#include "qemu/host-utils.h"
#include "page_cache.h"
diff --git a/migration/ram.c b/migration/ram.c
index 8c7886ab79..8cc1626351 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -47,7 +47,7 @@
#include "qapi/qapi-types-migration.h"
#include "qapi/qapi-events-migration.h"
#include "qapi/qapi-commands-migration.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
#include "trace.h"
#include "exec/ram_addr.h"
#include "exec/target_page.h"
diff --git a/migration/savevm.c b/migration/savevm.c
index c8d08fa079..bdc30caf5b 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -45,7 +45,7 @@
#include "qapi/qapi-commands-migration.h"
#include "qapi/clone-visitor.h"
#include "qapi/qapi-builtin-visit.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
#include "qemu/error-report.h"
#include "sysemu/cpus.h"
#include "exec/memory.h"
diff --git a/migration/vmstate.c b/migration/vmstate.c
index ef26f26ccd..2e439a7336 100644
--- a/migration/vmstate.c
+++ b/migration/vmstate.c
@@ -15,7 +15,7 @@
#include "migration/vmstate.h"
#include "savevm.h"
#include "qapi/error.h"
-#include "qapi/qmp/json-writer.h"
+#include "qobject/json-writer.h"
#include "qemu-file.h"
#include "qemu/bitops.h"
#include "qemu/error-report.h"
--
2.43.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH 12/29] monitor: adapt to new import path for qobject data type headers
2024-01-08 18:23 [PATCH 00/29] include: move include/qapi/qmp/ to include/qobject/ Daniel P. Berrangé
` (10 preceding siblings ...)
2024-01-08 18:23 ` [PATCH 11/29] migration: " Daniel P. Berrangé
@ 2024-01-08 18:23 ` Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 13/29] net: " Daniel P. Berrangé
` (17 subsequent siblings)
29 siblings, 0 replies; 37+ messages in thread
From: Daniel P. Berrangé @ 2024-01-08 18:23 UTC (permalink / raw)
To: qemu-devel; +Cc: Markus Armbruster, Michael Roth, Daniel P. Berrangé
The qobject data type headers have moved from qapi/qmp/ to
qobject/.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
monitor/fds.c | 2 +-
monitor/hmp-cmds-target.c | 2 +-
monitor/hmp-cmds.c | 2 +-
monitor/hmp.c | 4 ++--
monitor/monitor-internal.h | 4 ++--
monitor/monitor.c | 2 +-
monitor/qmp-cmds.c | 2 +-
monitor/qmp.c | 6 +++---
8 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/monitor/fds.c b/monitor/fds.c
index d86c2c674c..0d4c54140e 100644
--- a/monitor/fds.c
+++ b/monitor/fds.c
@@ -26,7 +26,7 @@
#include "monitor-internal.h"
#include "qapi/error.h"
#include "qapi/qapi-commands-misc.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
#include "qemu/ctype.h"
#include "qemu/cutils.h"
#include "sysemu/runstate.h"
diff --git a/monitor/hmp-cmds-target.c b/monitor/hmp-cmds-target.c
index d9fbcac08d..fb258e614c 100644
--- a/monitor/hmp-cmds-target.c
+++ b/monitor/hmp-cmds-target.c
@@ -28,7 +28,7 @@
#include "monitor/hmp-target.h"
#include "monitor/monitor-internal.h"
#include "qapi/error.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "sysemu/hw_accel.h"
/* Set the current CPU defined by the user. Callers must hold BQL. */
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index 871898ac46..ae05b41724 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -23,7 +23,7 @@
#include "qapi/error.h"
#include "qapi/qapi-commands-control.h"
#include "qapi/qapi-commands-misc.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "qemu/cutils.h"
#include "hw/intc/intc.h"
#include "qemu/log.h"
diff --git a/monitor/hmp.c b/monitor/hmp.c
index 69c1b7e98a..707abfbe4e 100644
--- a/monitor/hmp.c
+++ b/monitor/hmp.c
@@ -27,8 +27,8 @@
#include "hw/qdev-core.h"
#include "monitor-internal.h"
#include "monitor/hmp.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qnum.h"
+#include "qobject/qdict.h"
+#include "qobject/qnum.h"
#include "qemu/config-file.h"
#include "qemu/ctype.h"
#include "qemu/cutils.h"
diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h
index 252de85681..92c8cb3b66 100644
--- a/monitor/monitor-internal.h
+++ b/monitor/monitor-internal.h
@@ -28,8 +28,8 @@
#include "chardev/char-fe.h"
#include "monitor/monitor.h"
#include "qapi/qapi-types-control.h"
-#include "qapi/qmp/dispatch.h"
-#include "qapi/qmp/json-parser.h"
+#include "qapi/qmp-registry.h"
+#include "qobject/json-parser.h"
#include "qemu/readline.h"
#include "sysemu/iothread.h"
diff --git a/monitor/monitor.c b/monitor/monitor.c
index 01ede1babd..1c4ad4fd3d 100644
--- a/monitor/monitor.c
+++ b/monitor/monitor.c
@@ -28,7 +28,7 @@
#include "qapi/opts-visitor.h"
#include "qapi/qapi-emit-events.h"
#include "qapi/qapi-visit-control.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "qemu/error-report.h"
#include "qemu/option.h"
#include "sysemu/qtest.h"
diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c
index b0f948d337..a79262f68d 100644
--- a/monitor/qmp-cmds.c
+++ b/monitor/qmp-cmds.c
@@ -27,7 +27,7 @@
#include "qapi/qapi-init-commands.h"
#include "qapi/qapi-commands-control.h"
#include "qapi/qapi-commands-misc.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
#include "qapi/type-helpers.h"
#include "hw/mem/memory-device.h"
#include "hw/intc/intc.h"
diff --git a/monitor/qmp.c b/monitor/qmp.c
index 6eee450fe4..354941ea26 100644
--- a/monitor/qmp.c
+++ b/monitor/qmp.c
@@ -28,9 +28,9 @@
#include "monitor-internal.h"
#include "qapi/error.h"
#include "qapi/qapi-commands-control.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qjson.h"
-#include "qapi/qmp/qlist.h"
+#include "qobject/qdict.h"
+#include "qobject/qjson.h"
+#include "qobject/qlist.h"
#include "trace.h"
/*
--
2.43.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH 13/29] net: adapt to new import path for qobject data type headers
2024-01-08 18:23 [PATCH 00/29] include: move include/qapi/qmp/ to include/qobject/ Daniel P. Berrangé
` (11 preceding siblings ...)
2024-01-08 18:23 ` [PATCH 12/29] monitor: " Daniel P. Berrangé
@ 2024-01-08 18:23 ` Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 14/29] qapi: " Daniel P. Berrangé
` (16 subsequent siblings)
29 siblings, 0 replies; 37+ messages in thread
From: Daniel P. Berrangé @ 2024-01-08 18:23 UTC (permalink / raw)
To: qemu-devel; +Cc: Markus Armbruster, Michael Roth, Daniel P. Berrangé
The qobject data type headers have moved from qapi/qmp/ to
qobject/.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
net/filter-buffer.c | 2 +-
net/filter.c | 2 +-
net/net-hmp-cmds.c | 2 +-
net/net.c | 4 ++--
net/slirp.c | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/net/filter-buffer.c b/net/filter-buffer.c
index 283dc9cbe6..c7672cc4ff 100644
--- a/net/filter-buffer.c
+++ b/net/filter-buffer.c
@@ -13,7 +13,7 @@
#include "qemu/timer.h"
#include "qemu/iov.h"
#include "qapi/qapi-builtin-visit.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
#include "qom/object.h"
#define TYPE_FILTER_BUFFER "filter-buffer"
diff --git a/net/filter.c b/net/filter.c
index 3335908771..d6330aaefc 100644
--- a/net/filter.c
+++ b/net/filter.c
@@ -8,7 +8,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
#include "qemu/error-report.h"
#include "net/filter.h"
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 0520bc1681..4303e11a0f 100644
--- a/net/net.c
+++ b/net/net.c
@@ -36,8 +36,8 @@
#include "qemu/help_option.h"
#include "qapi/qapi-commands-net.h"
#include "qapi/qapi-visit-net.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qdict.h"
+#include "qobject/qerror.h"
#include "qemu/error-report.h"
#include "qemu/sockets.h"
#include "qemu/cutils.h"
diff --git a/net/slirp.c b/net/slirp.c
index 25b49c4526..4f0c23409a 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.43.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH 14/29] qapi: adapt to new import path for qobject data type headers
2024-01-08 18:23 [PATCH 00/29] include: move include/qapi/qmp/ to include/qobject/ Daniel P. Berrangé
` (12 preceding siblings ...)
2024-01-08 18:23 ` [PATCH 13/29] net: " Daniel P. Berrangé
@ 2024-01-08 18:23 ` Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 15/29] qga: " Daniel P. Berrangé
` (15 subsequent siblings)
29 siblings, 0 replies; 37+ messages in thread
From: Daniel P. Berrangé @ 2024-01-08 18:23 UTC (permalink / raw)
To: qemu-devel; +Cc: Markus Armbruster, Michael Roth, Daniel P. Berrangé
The qobject data type headers have moved from qapi/qmp/ to
qobject/.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
qapi/opts-visitor.c | 2 +-
qapi/qapi-clone-visitor.c | 2 +-
qapi/qapi-dealloc-visitor.c | 2 +-
qapi/qapi-forward-visitor.c | 16 ++++++++--------
qapi/qapi-util.c | 2 +-
qapi/qapi-visit-core.c | 2 +-
qapi/qmp-dispatch.c | 8 ++++----
qapi/qmp-event.c | 6 +++---
qapi/qmp-registry.c | 2 +-
qapi/qobject-input-visitor.c | 16 ++++++++--------
qapi/qobject-output-visitor.c | 12 ++++++------
qapi/string-input-visitor.c | 4 ++--
12 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/qapi/opts-visitor.c b/qapi/opts-visitor.c
index 8f1efab8b9..110e916123 100644
--- a/qapi/opts-visitor.c
+++ b/qapi/opts-visitor.c
@@ -13,7 +13,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu/cutils.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
#include "qapi/opts-visitor.h"
#include "qemu/queue.h"
#include "qemu/option_int.h"
diff --git a/qapi/qapi-clone-visitor.c b/qapi/qapi-clone-visitor.c
index c45c5caa3b..af195b4c60 100644
--- a/qapi/qapi-clone-visitor.c
+++ b/qapi/qapi-clone-visitor.c
@@ -12,7 +12,7 @@
#include "qapi/clone-visitor.h"
#include "qapi/visitor-impl.h"
#include "qapi/error.h"
-#include "qapi/qmp/qnull.h"
+#include "qobject/qnull.h"
struct QapiCloneVisitor {
Visitor visitor;
diff --git a/qapi/qapi-dealloc-visitor.c b/qapi/qapi-dealloc-visitor.c
index ef283f2966..57a2c904bb 100644
--- a/qapi/qapi-dealloc-visitor.c
+++ b/qapi/qapi-dealloc-visitor.c
@@ -14,7 +14,7 @@
#include "qemu/osdep.h"
#include "qapi/dealloc-visitor.h"
-#include "qapi/qmp/qnull.h"
+#include "qobject/qnull.h"
#include "qapi/visitor-impl.h"
struct QapiDeallocVisitor
diff --git a/qapi/qapi-forward-visitor.c b/qapi/qapi-forward-visitor.c
index e36d9bc9ba..54a0044ff8 100644
--- a/qapi/qapi-forward-visitor.c
+++ b/qapi/qapi-forward-visitor.c
@@ -14,14 +14,14 @@
#include "qapi/forward-visitor.h"
#include "qapi/visitor-impl.h"
#include "qemu/queue.h"
-#include "qapi/qmp/qjson.h"
-#include "qapi/qmp/qbool.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qerror.h"
-#include "qapi/qmp/qlist.h"
-#include "qapi/qmp/qnull.h"
-#include "qapi/qmp/qnum.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qjson.h"
+#include "qobject/qbool.h"
+#include "qobject/qdict.h"
+#include "qobject/qerror.h"
+#include "qobject/qlist.h"
+#include "qobject/qnull.h"
+#include "qobject/qnum.h"
+#include "qobject/qstring.h"
#include "qemu/cutils.h"
struct ForwardFieldVisitor {
diff --git a/qapi/qapi-util.c b/qapi/qapi-util.c
index 63596e11c5..4b6e596a33 100644
--- a/qapi/qapi-util.c
+++ b/qapi/qapi-util.c
@@ -14,7 +14,7 @@
#include "qapi/compat-policy.h"
#include "qapi/error.h"
#include "qemu/ctype.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
CompatPolicy compat_policy;
diff --git a/qapi/qapi-visit-core.c b/qapi/qapi-visit-core.c
index 6c13510a2b..326821ed91 100644
--- a/qapi/qapi-visit-core.c
+++ b/qapi/qapi-visit-core.c
@@ -15,7 +15,7 @@
#include "qemu/osdep.h"
#include "qapi/compat-policy.h"
#include "qapi/error.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
#include "qapi/visitor.h"
#include "qapi/visitor-impl.h"
#include "trace.h"
diff --git a/qapi/qmp-dispatch.c b/qapi/qmp-dispatch.c
index 555528b6bb..902481b14c 100644
--- a/qapi/qmp-dispatch.c
+++ b/qapi/qmp-dispatch.c
@@ -16,12 +16,12 @@
#include "block/aio.h"
#include "qapi/compat-policy.h"
#include "qapi/error.h"
-#include "qapi/qmp/dispatch.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qjson.h"
+#include "qapi/qmp-registry.h"
+#include "qobject/qdict.h"
+#include "qobject/qjson.h"
#include "qapi/qobject-input-visitor.h"
#include "qapi/qobject-output-visitor.h"
-#include "qapi/qmp/qbool.h"
+#include "qobject/qbool.h"
#include "qemu/coroutine.h"
#include "qemu/main-loop.h"
diff --git a/qapi/qmp-event.c b/qapi/qmp-event.c
index 0fe0d0a5a6..11cb6ace99 100644
--- a/qapi/qmp-event.c
+++ b/qapi/qmp-event.c
@@ -14,9 +14,9 @@
#include "qemu/osdep.h"
#include "qapi/qmp-event.h"
-#include "qapi/qmp/qstring.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qjson.h"
+#include "qobject/qstring.h"
+#include "qobject/qdict.h"
+#include "qobject/qjson.h"
static void timestamp_put(QDict *qdict)
{
diff --git a/qapi/qmp-registry.c b/qapi/qmp-registry.c
index 485bc5e6fc..ac989074ed 100644
--- a/qapi/qmp-registry.c
+++ b/qapi/qmp-registry.c
@@ -13,7 +13,7 @@
*/
#include "qemu/osdep.h"
-#include "qapi/qmp/dispatch.h"
+#include "qapi/qmp-registry.h"
void qmp_register_command(QmpCommandList *cmds, const char *name,
QmpCommandFunc *fn, QmpCommandOptions options,
diff --git a/qapi/qobject-input-visitor.c b/qapi/qobject-input-visitor.c
index 3e8aca6b15..0f06e54561 100644
--- a/qapi/qobject-input-visitor.c
+++ b/qapi/qobject-input-visitor.c
@@ -19,14 +19,14 @@
#include "qapi/qobject-input-visitor.h"
#include "qapi/visitor-impl.h"
#include "qemu/queue.h"
-#include "qapi/qmp/qjson.h"
-#include "qapi/qmp/qbool.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qerror.h"
-#include "qapi/qmp/qlist.h"
-#include "qapi/qmp/qnull.h"
-#include "qapi/qmp/qnum.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qjson.h"
+#include "qobject/qbool.h"
+#include "qobject/qdict.h"
+#include "qobject/qerror.h"
+#include "qobject/qlist.h"
+#include "qobject/qnull.h"
+#include "qobject/qnum.h"
+#include "qobject/qstring.h"
#include "qemu/cutils.h"
#include "qemu/keyval.h"
diff --git a/qapi/qobject-output-visitor.c b/qapi/qobject-output-visitor.c
index 74770edd73..13d3ae95b7 100644
--- a/qapi/qobject-output-visitor.c
+++ b/qapi/qobject-output-visitor.c
@@ -17,12 +17,12 @@
#include "qapi/qobject-output-visitor.h"
#include "qapi/visitor-impl.h"
#include "qemu/queue.h"
-#include "qapi/qmp/qbool.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qlist.h"
-#include "qapi/qmp/qnull.h"
-#include "qapi/qmp/qnum.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qbool.h"
+#include "qobject/qdict.h"
+#include "qobject/qlist.h"
+#include "qobject/qnull.h"
+#include "qobject/qnum.h"
+#include "qobject/qstring.h"
typedef struct QStackEntry {
QObject *value;
diff --git a/qapi/string-input-visitor.c b/qapi/string-input-visitor.c
index 197139c1c0..28c217fbbd 100644
--- a/qapi/string-input-visitor.c
+++ b/qapi/string-input-visitor.c
@@ -14,8 +14,8 @@
#include "qapi/error.h"
#include "qapi/string-input-visitor.h"
#include "qapi/visitor-impl.h"
-#include "qapi/qmp/qerror.h"
-#include "qapi/qmp/qnull.h"
+#include "qobject/qerror.h"
+#include "qobject/qnull.h"
#include "qemu/option.h"
#include "qemu/cutils.h"
--
2.43.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH 15/29] qga: adapt to new import path for qobject data type headers
2024-01-08 18:23 [PATCH 00/29] include: move include/qapi/qmp/ to include/qobject/ Daniel P. Berrangé
` (13 preceding siblings ...)
2024-01-08 18:23 ` [PATCH 14/29] qapi: " Daniel P. Berrangé
@ 2024-01-08 18:23 ` Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 16/29] qobject: " Daniel P. Berrangé
` (14 subsequent siblings)
29 siblings, 0 replies; 37+ messages in thread
From: Daniel P. Berrangé @ 2024-01-08 18:23 UTC (permalink / raw)
To: qemu-devel; +Cc: Markus Armbruster, Michael Roth, Daniel P. Berrangé
The qobject data type headers have moved from qapi/qmp/ to
qobject/.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
qga/commands-bsd.c | 2 +-
qga/commands-posix.c | 2 +-
qga/commands-win32.c | 2 +-
qga/commands.c | 2 +-
qga/guest-agent-core.h | 2 +-
qga/main.c | 6 +++---
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/qga/commands-bsd.c b/qga/commands-bsd.c
index 17bddda1cf..fed97203ff 100644
--- a/qga/commands-bsd.c
+++ b/qga/commands-bsd.c
@@ -12,7 +12,7 @@
#include "qemu/osdep.h"
#include "qga-qapi-commands.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
#include "qapi/error.h"
#include "qemu/queue.h"
#include "commands-common.h"
diff --git a/qga/commands-posix.c b/qga/commands-posix.c
index 6169bbf7a0..316a658be2 100644
--- a/qga/commands-posix.c
+++ b/qga/commands-posix.c
@@ -18,7 +18,7 @@
#include <dirent.h>
#include "qga-qapi-commands.h"
#include "qapi/error.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
#include "qemu/host-utils.h"
#include "qemu/sockets.h"
#include "qemu/base64.h"
diff --git a/qga/commands-win32.c b/qga/commands-win32.c
index 697c65507c..116cc798c6 100644
--- a/qga/commands-win32.c
+++ b/qga/commands-win32.c
@@ -32,7 +32,7 @@
#include "vss-win32.h"
#include "qga-qapi-commands.h"
#include "qapi/error.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
#include "qemu/queue.h"
#include "qemu/host-utils.h"
#include "qemu/base64.h"
diff --git a/qga/commands.c b/qga/commands.c
index 88c1c99fe5..5438474ae5 100644
--- a/qga/commands.c
+++ b/qga/commands.c
@@ -15,7 +15,7 @@
#include "guest-agent-core.h"
#include "qga-qapi-commands.h"
#include "qapi/error.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
#include "qemu/base64.h"
#include "qemu/cutils.h"
#include "commands-common.h"
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 8668b9f3d3..43e7e3a8f0 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.43.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH 16/29] qobject: adapt to new import path for qobject data type headers
2024-01-08 18:23 [PATCH 00/29] include: move include/qapi/qmp/ to include/qobject/ Daniel P. Berrangé
` (14 preceding siblings ...)
2024-01-08 18:23 ` [PATCH 15/29] qga: " Daniel P. Berrangé
@ 2024-01-08 18:23 ` Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 17/29] qom: " Daniel P. Berrangé
` (13 subsequent siblings)
29 siblings, 0 replies; 37+ messages in thread
From: Daniel P. Berrangé @ 2024-01-08 18:23 UTC (permalink / raw)
To: qemu-devel; +Cc: Markus Armbruster, Michael Roth, Daniel P. Berrangé
The qobject data type headers have moved from qapi/qmp/ to
qobject/.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
qobject/block-qdict.c | 8 ++++----
qobject/json-parser-int.h | 2 +-
qobject/json-parser.c | 12 ++++++------
qobject/json-writer.c | 2 +-
qobject/qbool.c | 2 +-
qobject/qdict.c | 10 +++++-----
qobject/qjson.c | 16 ++++++++--------
qobject/qlist.c | 10 +++++-----
qobject/qlit.c | 14 +++++++-------
qobject/qnull.c | 2 +-
qobject/qnum.c | 2 +-
qobject/qobject-internal.h | 2 +-
qobject/qobject.c | 12 ++++++------
qobject/qstring.c | 2 +-
14 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/qobject/block-qdict.c b/qobject/block-qdict.c
index 4a83bda2c3..d0e1c63cf6 100644
--- a/qobject/block-qdict.c
+++ b/qobject/block-qdict.c
@@ -9,10 +9,10 @@
#include "qemu/osdep.h"
#include "block/qdict.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 "qapi/qobject-input-visitor.h"
#include "qemu/cutils.h"
#include "qapi/error.h"
diff --git a/qobject/json-parser-int.h b/qobject/json-parser-int.h
index 16a25d00bb..8c01f23627 100644
--- a/qobject/json-parser-int.h
+++ b/qobject/json-parser-int.h
@@ -14,7 +14,7 @@
#ifndef JSON_PARSER_INT_H
#define JSON_PARSER_INT_H
-#include "qapi/qmp/json-parser.h"
+#include "qobject/json-parser.h"
typedef enum json_token_type {
JSON_ERROR = 0, /* must be zero, see json_lexer[] */
diff --git a/qobject/json-parser.c b/qobject/json-parser.c
index d498db6e70..7483e582fe 100644
--- a/qobject/json-parser.c
+++ b/qobject/json-parser.c
@@ -16,12 +16,12 @@
#include "qemu/cutils.h"
#include "qemu/unicode.h"
#include "qapi/error.h"
-#include "qapi/qmp/qbool.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qlist.h"
-#include "qapi/qmp/qnull.h"
-#include "qapi/qmp/qnum.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qbool.h"
+#include "qobject/qdict.h"
+#include "qobject/qlist.h"
+#include "qobject/qnull.h"
+#include "qobject/qnum.h"
+#include "qobject/qstring.h"
#include "json-parser-int.h"
struct JSONToken {
diff --git a/qobject/json-writer.c b/qobject/json-writer.c
index 309a31d57a..aac2c6ab71 100644
--- a/qobject/json-writer.c
+++ b/qobject/json-writer.c
@@ -14,7 +14,7 @@
*/
#include "qemu/osdep.h"
-#include "qapi/qmp/json-writer.h"
+#include "qobject/json-writer.h"
#include "qemu/unicode.h"
struct JSONWriter {
diff --git a/qobject/qbool.c b/qobject/qbool.c
index c7049c0c50..00d7066aae 100644
--- a/qobject/qbool.c
+++ b/qobject/qbool.c
@@ -12,7 +12,7 @@
*/
#include "qemu/osdep.h"
-#include "qapi/qmp/qbool.h"
+#include "qobject/qbool.h"
#include "qobject-internal.h"
/**
diff --git a/qobject/qdict.c b/qobject/qdict.c
index 8faff230d3..a90ac9ae2f 100644
--- a/qobject/qdict.c
+++ b/qobject/qdict.c
@@ -11,11 +11,11 @@
*/
#include "qemu/osdep.h"
-#include "qapi/qmp/qnum.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qbool.h"
-#include "qapi/qmp/qnull.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qnum.h"
+#include "qobject/qdict.h"
+#include "qobject/qbool.h"
+#include "qobject/qnull.h"
+#include "qobject/qstring.h"
#include "qobject-internal.h"
/**
diff --git a/qobject/qjson.c b/qobject/qjson.c
index 167fcb429c..c858dafb5e 100644
--- a/qobject/qjson.c
+++ b/qobject/qjson.c
@@ -13,14 +13,14 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "qapi/qmp/json-parser.h"
-#include "qapi/qmp/json-writer.h"
-#include "qapi/qmp/qjson.h"
-#include "qapi/qmp/qbool.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qlist.h"
-#include "qapi/qmp/qnum.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/json-parser.h"
+#include "qobject/json-writer.h"
+#include "qobject/qjson.h"
+#include "qobject/qbool.h"
+#include "qobject/qdict.h"
+#include "qobject/qlist.h"
+#include "qobject/qnum.h"
+#include "qobject/qstring.h"
typedef struct JSONParsingState {
JSONMessageParser parser;
diff --git a/qobject/qlist.c b/qobject/qlist.c
index 356ad946b0..41e6876d5b 100644
--- a/qobject/qlist.c
+++ b/qobject/qlist.c
@@ -11,11 +11,11 @@
*/
#include "qemu/osdep.h"
-#include "qapi/qmp/qbool.h"
-#include "qapi/qmp/qlist.h"
-#include "qapi/qmp/qnull.h"
-#include "qapi/qmp/qnum.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qbool.h"
+#include "qobject/qlist.h"
+#include "qobject/qnull.h"
+#include "qobject/qnum.h"
+#include "qobject/qstring.h"
#include "qemu/queue.h"
#include "qobject-internal.h"
diff --git a/qobject/qlit.c b/qobject/qlit.c
index be8332136c..2028cbffb5 100644
--- a/qobject/qlit.c
+++ b/qobject/qlit.c
@@ -15,13 +15,13 @@
#include "qemu/osdep.h"
-#include "qapi/qmp/qlit.h"
-#include "qapi/qmp/qbool.h"
-#include "qapi/qmp/qlist.h"
-#include "qapi/qmp/qnum.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qstring.h"
-#include "qapi/qmp/qnull.h"
+#include "qobject/qlit.h"
+#include "qobject/qbool.h"
+#include "qobject/qlist.h"
+#include "qobject/qnum.h"
+#include "qobject/qdict.h"
+#include "qobject/qstring.h"
+#include "qobject/qnull.h"
static bool qlit_equal_qdict(const QLitObject *lhs, const QDict *qdict)
{
diff --git a/qobject/qnull.c b/qobject/qnull.c
index 445a5db7f3..0fb78cbd0a 100644
--- a/qobject/qnull.c
+++ b/qobject/qnull.c
@@ -11,7 +11,7 @@
*/
#include "qemu/osdep.h"
-#include "qapi/qmp/qnull.h"
+#include "qobject/qnull.h"
#include "qobject-internal.h"
QNull qnull_ = {
diff --git a/qobject/qnum.c b/qobject/qnum.c
index 2bbeaedc7b..7df7a7418c 100644
--- a/qobject/qnum.c
+++ b/qobject/qnum.c
@@ -13,7 +13,7 @@
*/
#include "qemu/osdep.h"
-#include "qapi/qmp/qnum.h"
+#include "qobject/qnum.h"
#include "qobject-internal.h"
/**
diff --git a/qobject/qobject-internal.h b/qobject/qobject-internal.h
index b310c8e1b5..0c7679fe98 100644
--- a/qobject/qobject-internal.h
+++ b/qobject/qobject-internal.h
@@ -10,7 +10,7 @@
#ifndef QOBJECT_INTERNAL_H
#define QOBJECT_INTERNAL_H
-#include "qapi/qmp/qobject.h"
+#include "qobject/qobject.h"
static inline void qobject_init(QObject *obj, QType type)
{
diff --git a/qobject/qobject.c b/qobject/qobject.c
index d7077b8f2a..78d1e057c1 100644
--- a/qobject/qobject.c
+++ b/qobject/qobject.c
@@ -8,12 +8,12 @@
*/
#include "qemu/osdep.h"
-#include "qapi/qmp/qbool.h"
-#include "qapi/qmp/qnull.h"
-#include "qapi/qmp/qnum.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qlist.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qbool.h"
+#include "qobject/qnull.h"
+#include "qobject/qnum.h"
+#include "qobject/qdict.h"
+#include "qobject/qlist.h"
+#include "qobject/qstring.h"
#include "qobject-internal.h"
QEMU_BUILD_BUG_MSG(
diff --git a/qobject/qstring.c b/qobject/qstring.c
index 794f8c9357..d316604914 100644
--- a/qobject/qstring.c
+++ b/qobject/qstring.c
@@ -11,7 +11,7 @@
*/
#include "qemu/osdep.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qstring.h"
#include "qobject-internal.h"
/**
--
2.43.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH 17/29] qom: adapt to new import path for qobject data type headers
2024-01-08 18:23 [PATCH 00/29] include: move include/qapi/qmp/ to include/qobject/ Daniel P. Berrangé
` (15 preceding siblings ...)
2024-01-08 18:23 ` [PATCH 16/29] qobject: " Daniel P. Berrangé
@ 2024-01-08 18:23 ` Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 18/29] replay: " Daniel P. Berrangé
` (12 subsequent siblings)
29 siblings, 0 replies; 37+ messages in thread
From: Daniel P. Berrangé @ 2024-01-08 18:23 UTC (permalink / raw)
To: qemu-devel; +Cc: Markus Armbruster, Michael Roth, Daniel P. Berrangé
The qobject data type headers have moved from qapi/qmp/ to
qobject/.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
qom/object.c | 12 ++++++------
qom/object_interfaces.c | 8 ++++----
qom/qom-hmp-cmds.c | 4 ++--
qom/qom-qmp-cmds.c | 4 ++--
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/qom/object.c b/qom/object.c
index 654e1afaf2..16c2b467fc 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -23,17 +23,17 @@
#include "qapi/qobject-input-visitor.h"
#include "qapi/forward-visitor.h"
#include "qapi/qapi-builtin-visit.h"
-#include "qapi/qmp/qerror.h"
-#include "qapi/qmp/qjson.h"
+#include "qobject/qerror.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..756edd04d6 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 "qapi/qmp/qerror.h"
-#include "qapi/qmp/qjson.h"
+#include "qobject/qobject.h"
+#include "qobject/qdict.h"
+#include "qobject/qerror.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 7c087299de..1e36d4a8ce 100644
--- a/qom/qom-qmp-cmds.c
+++ b/qom/qom-qmp-cmds.c
@@ -20,8 +20,8 @@
#include "qapi/qapi-commands-qdev.h"
#include "qapi/qapi-commands-qom.h"
#include "qapi/qapi-visit-qom.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qdict.h"
+#include "qobject/qerror.h"
#include "qapi/qobject-input-visitor.h"
#include "qapi/qobject-output-visitor.h"
#include "qemu/cutils.h"
--
2.43.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH 18/29] replay: adapt to new import path for qobject data type headers
2024-01-08 18:23 [PATCH 00/29] include: move include/qapi/qmp/ to include/qobject/ Daniel P. Berrangé
` (16 preceding siblings ...)
2024-01-08 18:23 ` [PATCH 17/29] qom: " Daniel P. Berrangé
@ 2024-01-08 18:23 ` Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 19/29] scripts: " Daniel P. Berrangé
` (11 subsequent siblings)
29 siblings, 0 replies; 37+ messages in thread
From: Daniel P. Berrangé @ 2024-01-08 18:23 UTC (permalink / raw)
To: qemu-devel; +Cc: Markus Armbruster, Michael Roth, Daniel P. Berrangé
The qobject data type headers have moved from qapi/qmp/ to
qobject/.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
replay/replay-debugging.c | 2 +-
replay/replay-snapshot.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/replay/replay-debugging.c b/replay/replay-debugging.c
index 82c66fff26..fd46a948d2 100644
--- a/replay/replay-debugging.c
+++ b/replay/replay-debugging.c
@@ -17,7 +17,7 @@
#include "monitor/hmp.h"
#include "monitor/monitor.h"
#include "qapi/qapi-commands-replay.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "qemu/timer.h"
#include "block/snapshot.h"
#include "migration/snapshot.h"
diff --git a/replay/replay-snapshot.c b/replay/replay-snapshot.c
index e5e39161e3..18ae1f43a1 100644
--- a/replay/replay-snapshot.c
+++ b/replay/replay-snapshot.c
@@ -14,7 +14,7 @@
#include "sysemu/replay.h"
#include "replay-internal.h"
#include "monitor/monitor.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qstring.h"
#include "qemu/error-report.h"
#include "migration/vmstate.h"
#include "migration/snapshot.h"
--
2.43.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH 19/29] scripts: adapt to new import path for qobject data type headers
2024-01-08 18:23 [PATCH 00/29] include: move include/qapi/qmp/ to include/qobject/ Daniel P. Berrangé
` (17 preceding siblings ...)
2024-01-08 18:23 ` [PATCH 18/29] replay: " Daniel P. Berrangé
@ 2024-01-08 18:23 ` Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 20/29] scsi: " Daniel P. Berrangé
` (10 subsequent siblings)
29 siblings, 0 replies; 37+ messages in thread
From: Daniel P. Berrangé @ 2024-01-08 18:23 UTC (permalink / raw)
To: qemu-devel; +Cc: Markus Armbruster, Michael Roth, Daniel P. Berrangé
The qobject data type headers have moved from qapi/qmp/ to
qobject/.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
scripts/qapi/commands.py | 6 +++---
scripts/qapi/events.py | 2 +-
scripts/qapi/introspect.py | 2 +-
scripts/qapi/visit.py | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/scripts/qapi/commands.py b/scripts/qapi/commands.py
index d1fdf4182c..c2b1eec144 100644
--- a/scripts/qapi/commands.py
+++ b/scripts/qapi/commands.py
@@ -320,7 +320,7 @@ def _begin_user_module(self, name: str) -> None:
#include "qemu/osdep.h"
#include "qapi/compat-policy.h"
#include "qapi/visitor.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "qapi/dealloc-visitor.h"
#include "qapi/error.h"
#include "%(visit)s.h"
@@ -330,7 +330,7 @@ def _begin_user_module(self, name: str) -> None:
if self._gen_tracing and commands != 'qapi-commands':
self._genc.add(mcgen('''
-#include "qapi/qmp/qjson.h"
+#include "qobject/qjson.h"
#include "trace/trace-%(nm)s_trace_events.h"
''',
nm=c_name(commands, protect=False)))
@@ -346,7 +346,7 @@ def _begin_user_module(self, name: str) -> None:
def visit_begin(self, schema: QAPISchema) -> None:
self._add_module('./init', ' * QAPI Commands initialization')
self._genh.add(mcgen('''
-#include "qapi/qmp/dispatch.h"
+#include "qapi/qmp-registry.h"
void %(c_prefix)sqmp_init_marshal(QmpCommandList *cmds);
''',
diff --git a/scripts/qapi/events.py b/scripts/qapi/events.py
index 3cf01e96b6..10044ba4b0 100644
--- a/scripts/qapi/events.py
+++ b/scripts/qapi/events.py
@@ -194,7 +194,7 @@ def _begin_user_module(self, name: str) -> None:
#include "%(visit)s.h"
#include "qapi/compat-policy.h"
#include "qapi/error.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "qapi/qmp-event.h"
''',
events=events, visit=visit,
diff --git a/scripts/qapi/introspect.py b/scripts/qapi/introspect.py
index 67c7d89aae..bcd2402d82 100644
--- a/scripts/qapi/introspect.py
+++ b/scripts/qapi/introspect.py
@@ -196,7 +196,7 @@ def visit_end(self) -> None:
# generate C
name = c_name(self._prefix, protect=False) + 'qmp_schema_qlit'
self._genh.add(mcgen('''
-#include "qapi/qmp/qlit.h"
+#include "qobject/qlit.h"
extern const QLitObject %(c_name)s;
''',
diff --git a/scripts/qapi/visit.py b/scripts/qapi/visit.py
index c56ea4d724..ec0638acdf 100644
--- a/scripts/qapi/visit.py
+++ b/scripts/qapi/visit.py
@@ -356,7 +356,7 @@ def _begin_user_module(self, name: str) -> None:
self._genc.preamble_add(mcgen('''
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
#include "%(visit)s.h"
''',
visit=visit))
--
2.43.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH 20/29] scsi: adapt to new import path for qobject data type headers
2024-01-08 18:23 [PATCH 00/29] include: move include/qapi/qmp/ to include/qobject/ Daniel P. Berrangé
` (18 preceding siblings ...)
2024-01-08 18:23 ` [PATCH 19/29] scripts: " Daniel P. Berrangé
@ 2024-01-08 18:23 ` Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 21/29] stats: " Daniel P. Berrangé
` (9 subsequent siblings)
29 siblings, 0 replies; 37+ messages in thread
From: Daniel P. Berrangé @ 2024-01-08 18:23 UTC (permalink / raw)
To: qemu-devel; +Cc: Markus Armbruster, Michael Roth, Daniel P. Berrangé
The qobject data type headers have moved from qapi/qmp/ to
qobject/.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
scsi/qemu-pr-helper.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scsi/qemu-pr-helper.c b/scsi/qemu-pr-helper.c
index c6c6347e9b..b69dd982d6 100644
--- a/scsi/qemu-pr-helper.c
+++ b/scsi/qemu-pr-helper.c
@@ -47,7 +47,7 @@
#include "qemu/log.h"
#include "qemu/systemd.h"
#include "qapi/util.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qstring.h"
#include "io/channel-socket.h"
#include "trace/control.h"
#include "qemu-version.h"
--
2.43.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH 21/29] stats: adapt to new import path for qobject data type headers
2024-01-08 18:23 [PATCH 00/29] include: move include/qapi/qmp/ to include/qobject/ Daniel P. Berrangé
` (19 preceding siblings ...)
2024-01-08 18:23 ` [PATCH 20/29] scsi: " Daniel P. Berrangé
@ 2024-01-08 18:23 ` Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 22/29] stubs: " Daniel P. Berrangé
` (8 subsequent siblings)
29 siblings, 0 replies; 37+ messages in thread
From: Daniel P. Berrangé @ 2024-01-08 18:23 UTC (permalink / raw)
To: qemu-devel; +Cc: Markus Armbruster, Michael Roth, Daniel P. Berrangé
The qobject data type headers have moved from qapi/qmp/ to
qobject/.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
stats/stats-hmp-cmds.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/stats/stats-hmp-cmds.c b/stats/stats-hmp-cmds.c
index 1f91bf8bd5..b93b471b1b 100644
--- a/stats/stats-hmp-cmds.c
+++ b/stats/stats-hmp-cmds.c
@@ -11,7 +11,7 @@
#include "monitor/monitor.h"
#include "qemu/cutils.h"
#include "hw/core/cpu.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "qapi/error.h"
static void print_stats_schema_value(Monitor *mon, StatsSchemaValue *value)
--
2.43.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH 22/29] stubs: adapt to new import path for qobject data type headers
2024-01-08 18:23 [PATCH 00/29] include: move include/qapi/qmp/ to include/qobject/ Daniel P. Berrangé
` (20 preceding siblings ...)
2024-01-08 18:23 ` [PATCH 21/29] stats: " Daniel P. Berrangé
@ 2024-01-08 18:23 ` Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 23/29] system: " Daniel P. Berrangé
` (7 subsequent siblings)
29 siblings, 0 replies; 37+ messages in thread
From: Daniel P. Berrangé @ 2024-01-08 18:23 UTC (permalink / raw)
To: qemu-devel; +Cc: Markus Armbruster, Michael Roth, Daniel P. Berrangé
The qobject data type headers have moved from qapi/qmp/ to
qobject/.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
stubs/qmp-command-available.c | 2 +-
stubs/qmp-quit.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/stubs/qmp-command-available.c b/stubs/qmp-command-available.c
index 46540af7bf..8851faced1 100644
--- a/stubs/qmp-command-available.c
+++ b/stubs/qmp-command-available.c
@@ -1,5 +1,5 @@
#include "qemu/osdep.h"
-#include "qapi/qmp/dispatch.h"
+#include "qapi/qmp-registry.h"
bool qmp_command_available(const QmpCommand *cmd, Error **errp)
{
diff --git a/stubs/qmp-quit.c b/stubs/qmp-quit.c
index a3ff47f7bd..8fb523e905 100644
--- a/stubs/qmp-quit.c
+++ b/stubs/qmp-quit.c
@@ -1,6 +1,6 @@
#include "qemu/osdep.h"
#include "qapi/qapi-commands-control.h"
-#include "qapi/qmp/dispatch.h"
+#include "qapi/qmp-registry.h"
void qmp_quit(Error **errp)
{
--
2.43.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH 23/29] system: adapt to new import path for qobject data type headers
2024-01-08 18:23 [PATCH 00/29] include: move include/qapi/qmp/ to include/qobject/ Daniel P. Berrangé
` (21 preceding siblings ...)
2024-01-08 18:23 ` [PATCH 22/29] stubs: " Daniel P. Berrangé
@ 2024-01-08 18:23 ` Daniel P. Berrangé
2024-01-08 18:24 ` [PATCH 24/29] target: " Daniel P. Berrangé
` (6 subsequent siblings)
29 siblings, 0 replies; 37+ messages in thread
From: Daniel P. Berrangé @ 2024-01-08 18:23 UTC (permalink / raw)
To: qemu-devel; +Cc: Markus Armbruster, Michael Roth, Daniel P. Berrangé
The qobject data type headers have moved from qapi/qmp/ to
qobject/.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
system/balloon.c | 2 +-
system/cpus.c | 2 +-
system/device_tree.c | 2 +-
system/dirtylimit.c | 2 +-
system/qdev-monitor.c | 8 ++++----
system/rtc.c | 2 +-
system/runstate-hmp-cmds.c | 2 +-
system/tpm.c | 2 +-
system/vl.c | 8 ++++----
9 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/system/balloon.c b/system/balloon.c
index fda7af832e..0b6220d1d6 100644
--- a/system/balloon.c
+++ b/system/balloon.c
@@ -30,7 +30,7 @@
#include "sysemu/balloon.h"
#include "qapi/error.h"
#include "qapi/qapi-commands-machine.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
#include "trace.h"
static QEMUBalloonEvent *balloon_event_fn;
diff --git a/system/cpus.c b/system/cpus.c
index a444a747f0..f1df174d9a 100644
--- a/system/cpus.c
+++ b/system/cpus.c
@@ -29,7 +29,7 @@
#include "qapi/qapi-commands-machine.h"
#include "qapi/qapi-commands-misc.h"
#include "qapi/qapi-events-run-state.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
#include "exec/gdbstub.h"
#include "sysemu/hw_accel.h"
#include "exec/cpu-common.h"
diff --git a/system/device_tree.c b/system/device_tree.c
index eb5166ca36..045cfece3e 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 495c7a7082..6ffeff7cdb 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 a13db763e5..a66abd4c4c 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/qerror.h"
-#include "qapi/qmp/qstring.h"
+#include "qapi/qmp-registry.h"
+#include "qobject/qdict.h"
+#include "qobject/qerror.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 4904581abe..7fb9ec1e4c 100644
--- a/system/rtc.c
+++ b/system/rtc.c
@@ -25,7 +25,7 @@
#include "qemu/osdep.h"
#include "qemu/cutils.h"
#include "qapi/error.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/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/tpm.c b/system/tpm.c
index 7164ea7ff1..fe6782e620 100644
--- a/system/tpm.c
+++ b/system/tpm.c
@@ -16,7 +16,7 @@
#include "qapi/error.h"
#include "qapi/qapi-commands-tpm.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
#include "sysemu/tpm_backend.h"
#include "sysemu/tpm.h"
#include "qemu/config-file.h"
diff --git a/system/vl.c b/system/vl.c
index 6b87bfa32c..810ab180aa 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"
@@ -129,7 +129,7 @@
#include "qapi/qapi-visit-qom.h"
#include "qapi/qapi-commands-ui.h"
#include "block/qdict.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
#include "sysemu/iothread.h"
#include "qemu/guest-random.h"
#include "qemu/keyval.h"
--
2.43.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH 24/29] target: adapt to new import path for qobject data type headers
2024-01-08 18:23 [PATCH 00/29] include: move include/qapi/qmp/ to include/qobject/ Daniel P. Berrangé
` (22 preceding siblings ...)
2024-01-08 18:23 ` [PATCH 23/29] system: " Daniel P. Berrangé
@ 2024-01-08 18:24 ` Daniel P. Berrangé
2024-01-08 18:24 ` [PATCH 25/29] tests: " Daniel P. Berrangé
` (5 subsequent siblings)
29 siblings, 0 replies; 37+ messages in thread
From: Daniel P. Berrangé @ 2024-01-08 18:24 UTC (permalink / raw)
To: qemu-devel; +Cc: Markus Armbruster, Michael Roth, Daniel P. Berrangé
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 | 4 ++--
target/i386/cpu-sysemu.c | 2 +-
target/i386/cpu.c | 2 +-
target/i386/monitor.c | 2 +-
target/loongarch/loongarch-qmp-cmds.c | 4 ++--
target/ppc/cpu_init.c | 2 +-
target/riscv/riscv-qmp-cmds.c | 4 ++--
target/s390x/cpu_models_sysemu.c | 4 ++--
8 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/target/arm/arm-qmp-cmds.c b/target/arm/arm-qmp-cmds.c
index b53d5efe13..94d28e2fc3 100644
--- a/target/arm/arm-qmp-cmds.c
+++ b/target/arm/arm-qmp-cmds.c
@@ -28,8 +28,8 @@
#include "qapi/qobject-input-visitor.h"
#include "qapi/qapi-commands-machine-target.h"
#include "qapi/qapi-commands-misc-target.h"
-#include "qapi/qmp/qerror.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qerror.h"
+#include "qobject/qdict.h"
#include "qom/qom-qobject.h"
static GICCapability *gic_cap_new(int version)
diff --git a/target/i386/cpu-sysemu.c b/target/i386/cpu-sysemu.c
index 2375e48178..35d6fe4a41 100644
--- a/target/i386/cpu-sysemu.c
+++ b/target/i386/cpu-sysemu.c
@@ -24,7 +24,7 @@
#include "sysemu/whpx.h"
#include "qapi/error.h"
#include "qapi/qapi-visit-run-state.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "qom/qom-qobject.h"
#include "qapi/qapi-commands-machine-target.h"
#include "hw/qdev-properties.h"
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 95d5f16cd5..fb4a12b3e6 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -31,7 +31,7 @@
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "qapi/qapi-visit-machine.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
#include "standard-headers/asm-x86/kvm_para.h"
#include "hw/qdev-properties.h"
#include "hw/i386/topology.h"
diff --git a/target/i386/monitor.c b/target/i386/monitor.c
index 950ff9ccbc..4a8db98475 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 "sysemu/hw_accel.h"
#include "sysemu/kvm.h"
#include "qapi/error.h"
diff --git a/target/loongarch/loongarch-qmp-cmds.c b/target/loongarch/loongarch-qmp-cmds.c
index 645672ff59..90d579f006 100644
--- a/target/loongarch/loongarch-qmp-cmds.c
+++ b/target/loongarch/loongarch-qmp-cmds.c
@@ -10,8 +10,8 @@
#include "qapi/error.h"
#include "qapi/qapi-commands-machine-target.h"
#include "cpu.h"
-#include "qapi/qmp/qerror.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qerror.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 40fe14a6c2..d7986e29d0 100644
--- a/target/ppc/cpu_init.c
+++ b/target/ppc/cpu_init.c
@@ -31,7 +31,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 2f2dbae7c8..f0f10d6540 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/qdict.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qdict.h"
+#include "qobject/qerror.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 63981bf36b..96fd83a596 100644
--- a/target/s390x/cpu_models_sysemu.c
+++ b/target/s390x/cpu_models_sysemu.c
@@ -17,9 +17,9 @@
#include "sysemu/kvm.h"
#include "qapi/error.h"
#include "qapi/visitor.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.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);
--
2.43.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH 25/29] tests: adapt to new import path for qobject data type headers
2024-01-08 18:23 [PATCH 00/29] include: move include/qapi/qmp/ to include/qobject/ Daniel P. Berrangé
` (23 preceding siblings ...)
2024-01-08 18:24 ` [PATCH 24/29] target: " Daniel P. Berrangé
@ 2024-01-08 18:24 ` Daniel P. Berrangé
2024-01-08 18:24 ` [PATCH 26/29] trace: " Daniel P. Berrangé
` (4 subsequent siblings)
29 siblings, 0 replies; 37+ messages in thread
From: Daniel P. Berrangé @ 2024-01-08 18:24 UTC (permalink / raw)
To: qemu-devel; +Cc: Markus Armbruster, Michael Roth, Daniel P. Berrangé
The qobject data type headers have moved from qapi/qmp/ to
qobject/.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
tests/qtest/adm1266-test.c | 4 ++--
tests/qtest/adm1272-test.c | 4 ++--
tests/qtest/ahci-test.c | 2 +-
tests/qtest/arm-cpu-features.c | 4 ++--
tests/qtest/aspeed_gpio-test.c | 2 +-
tests/qtest/boot-order-test.c | 2 +-
tests/qtest/cdrom-test.c | 2 +-
tests/qtest/cpu-plug-test.c | 4 ++--
tests/qtest/device-introspect-test.c | 6 +++---
tests/qtest/device-plug-test.c | 4 ++--
tests/qtest/drive_del-test.c | 4 ++--
tests/qtest/emc141x-test.c | 2 +-
tests/qtest/fdc-test.c | 2 +-
tests/qtest/hd-geo-test.c | 2 +-
tests/qtest/ide-test.c | 2 +-
tests/qtest/isl_pmbus_vr-test.c | 4 ++--
tests/qtest/libqmp.c | 4 ++--
tests/qtest/libqmp.h | 2 +-
tests/qtest/libqos/generic-pcihost.c | 2 +-
tests/qtest/libqos/libqos.c | 2 +-
tests/qtest/libqos/pci-pc.c | 2 +-
tests/qtest/libqos/qos_external.c | 8 ++++----
tests/qtest/libqtest.c | 8 ++++----
tests/qtest/libqtest.h | 4 ++--
tests/qtest/lsm303dlhc-mag-test.c | 2 +-
tests/qtest/machine-none-test.c | 2 +-
tests/qtest/max34451-test.c | 4 ++--
tests/qtest/migration-helpers.c | 2 +-
tests/qtest/migration-test.c | 4 ++--
tests/qtest/netdev-socket.c | 2 +-
tests/qtest/npcm7xx_adc-test.c | 2 +-
tests/qtest/npcm7xx_emc-test.c | 4 ++--
tests/qtest/npcm7xx_pwm-test.c | 4 ++--
tests/qtest/npcm7xx_watchdog_timer-test.c | 2 +-
tests/qtest/numa-test.c | 4 ++--
tests/qtest/pvpanic-pci-test.c | 2 +-
tests/qtest/pvpanic-test.c | 2 +-
tests/qtest/q35-test.c | 2 +-
tests/qtest/qmp-cmd-test.c | 2 +-
tests/qtest/qmp-test.c | 6 +++---
tests/qtest/qom-test.c | 4 ++--
tests/qtest/qos-test.c | 2 +-
tests/qtest/readconfig-test.c | 6 +++---
tests/qtest/tco-test.c | 2 +-
tests/qtest/test-filter-mirror.c | 2 +-
tests/qtest/test-filter-redirector.c | 2 +-
tests/qtest/test-netfilter.c | 2 +-
tests/qtest/test-x86-cpuid-compat.c | 8 ++++----
tests/qtest/tmp105-test.c | 2 +-
tests/qtest/tpm-emu.c | 4 ++--
tests/qtest/tpm-util.c | 2 +-
tests/qtest/vhost-user-test.c | 2 +-
tests/qtest/virtio-net-failover.c | 6 +++---
tests/qtest/virtio-net-test.c | 2 +-
tests/qtest/vmgenid-test.c | 2 +-
tests/qtest/wdt_ib700-test.c | 2 +-
tests/unit/check-block-qdict.c | 4 ++--
tests/unit/check-qdict.c | 6 +++---
tests/unit/check-qjson.c | 12 ++++++------
tests/unit/check-qlist.c | 4 ++--
tests/unit/check-qlit.c | 12 ++++++------
tests/unit/check-qnull.c | 2 +-
tests/unit/check-qnum.c | 2 +-
tests/unit/check-qobject.c | 12 ++++++------
tests/unit/check-qom-proplist.c | 4 ++--
tests/unit/check-qstring.c | 2 +-
tests/unit/test-block-iothread.c | 2 +-
tests/unit/test-blockjob-txn.c | 2 +-
tests/unit/test-blockjob.c | 2 +-
tests/unit/test-char.c | 2 +-
tests/unit/test-forward-visitor.c | 4 ++--
tests/unit/test-image-locking.c | 2 +-
tests/unit/test-keyval.c | 6 +++---
tests/unit/test-qemu-opts.c | 4 ++--
tests/unit/test-qga.c | 4 ++--
tests/unit/test-qmp-cmds.c | 8 ++++----
tests/unit/test-qmp-event.c | 10 +++++-----
tests/unit/test-qobject-input-visitor.c | 12 ++++++------
tests/unit/test-qobject-output-visitor.c | 12 ++++++------
tests/unit/test-replication.c | 2 +-
tests/unit/test-visitor-serialization.c | 4 ++--
81 files changed, 157 insertions(+), 157 deletions(-)
diff --git a/tests/qtest/adm1266-test.c b/tests/qtest/adm1266-test.c
index 6c312c499f..5ae8206234 100644
--- a/tests/qtest/adm1266-test.c
+++ b/tests/qtest/adm1266-test.c
@@ -13,8 +13,8 @@
#include "libqtest-single.h"
#include "libqos/qgraph.h"
#include "libqos/i2c.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qnum.h"
+#include "qobject/qdict.h"
+#include "qobject/qnum.h"
#include "qemu/bitops.h"
#define TEST_ID "adm1266-test"
diff --git a/tests/qtest/adm1272-test.c b/tests/qtest/adm1272-test.c
index 63f8514801..2abda8d5be 100644
--- a/tests/qtest/adm1272-test.c
+++ b/tests/qtest/adm1272-test.c
@@ -12,8 +12,8 @@
#include "libqtest-single.h"
#include "libqos/qgraph.h"
#include "libqos/i2c.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qnum.h"
+#include "qobject/qdict.h"
+#include "qobject/qnum.h"
#include "qemu/bitops.h"
#define TEST_ID "adm1272-test"
diff --git a/tests/qtest/ahci-test.c b/tests/qtest/ahci-test.c
index 5a1923f721..88ac6c66ce 100644
--- a/tests/qtest/ahci-test.c
+++ b/tests/qtest/ahci-test.c
@@ -30,7 +30,7 @@
#include "libqos/ahci.h"
#include "libqos/pci-pc.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "qemu/host-utils.h"
#include "hw/pci/pci_ids.h"
diff --git a/tests/qtest/arm-cpu-features.c b/tests/qtest/arm-cpu-features.c
index a8a4c668ad..0dd96b8dbe 100644
--- a/tests/qtest/arm-cpu-features.c
+++ b/tests/qtest/arm-cpu-features.c
@@ -11,8 +11,8 @@
#include "qemu/osdep.h"
#include "qemu/bitops.h"
#include "libqtest.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qjson.h"
+#include "qobject/qdict.h"
+#include "qobject/qjson.h"
/*
* We expect the SVE max-vq to be 16. Also it must be <= 64
diff --git a/tests/qtest/aspeed_gpio-test.c b/tests/qtest/aspeed_gpio-test.c
index d38f51d719..12675d4cbb 100644
--- a/tests/qtest/aspeed_gpio-test.c
+++ b/tests/qtest/aspeed_gpio-test.c
@@ -25,7 +25,7 @@
#include "qemu/osdep.h"
#include "qemu/bitops.h"
#include "qemu/timer.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "libqtest-single.h"
#define AST2600_GPIO_BASE 0x1E780000
diff --git a/tests/qtest/boot-order-test.c b/tests/qtest/boot-order-test.c
index 8f2b6ef05a..68169bcac4 100644
--- a/tests/qtest/boot-order-test.c
+++ b/tests/qtest/boot-order-test.c
@@ -13,7 +13,7 @@
#include "qemu/osdep.h"
#include "libqos/fw_cfg.h"
#include "libqtest.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "standard-headers/linux/qemu_fw_cfg.h"
typedef struct {
diff --git a/tests/qtest/cdrom-test.c b/tests/qtest/cdrom-test.c
index 0945383789..23441a6a7b 100644
--- a/tests/qtest/cdrom-test.c
+++ b/tests/qtest/cdrom-test.c
@@ -13,7 +13,7 @@
#include "qemu/osdep.h"
#include "libqtest.h"
#include "boot-sector.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
static char isoimage[] = "cdrom-boot-iso-XXXXXX";
diff --git a/tests/qtest/cpu-plug-test.c b/tests/qtest/cpu-plug-test.c
index 7f5dd5f85a..6633abfc10 100644
--- a/tests/qtest/cpu-plug-test.c
+++ b/tests/qtest/cpu-plug-test.c
@@ -10,8 +10,8 @@
#include "qemu/osdep.h"
#include "libqtest-single.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qlist.h"
+#include "qobject/qdict.h"
+#include "qobject/qlist.h"
struct PlugTestData {
char *machine;
diff --git a/tests/qtest/device-introspect-test.c b/tests/qtest/device-introspect-test.c
index 5b0ffe43f5..999b8da149 100644
--- a/tests/qtest/device-introspect-test.c
+++ b/tests/qtest/device-introspect-test.c
@@ -18,9 +18,9 @@
*/
#include "qemu/osdep.h"
-#include "qapi/qmp/qstring.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qlist.h"
+#include "qobject/qstring.h"
+#include "qobject/qdict.h"
+#include "qobject/qlist.h"
#include "libqtest.h"
const char common_args[] = "-nodefaults -machine none";
diff --git a/tests/qtest/device-plug-test.c b/tests/qtest/device-plug-test.c
index c6f33153eb..7124f17a0f 100644
--- a/tests/qtest/device-plug-test.c
+++ b/tests/qtest/device-plug-test.c
@@ -12,8 +12,8 @@
#include "qemu/osdep.h"
#include "libqtest.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qdict.h"
+#include "qobject/qstring.h"
static void system_reset(QTestState *qtest)
{
diff --git a/tests/qtest/drive_del-test.c b/tests/qtest/drive_del-test.c
index 8a6f3ac963..da7b348ace 100644
--- a/tests/qtest/drive_del-test.c
+++ b/tests/qtest/drive_del-test.c
@@ -13,8 +13,8 @@
#include "qemu/osdep.h"
#include "libqtest.h"
#include "libqos/virtio.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qlist.h"
+#include "qobject/qdict.h"
+#include "qobject/qlist.h"
static const char *qvirtio_get_dev_type(void);
diff --git a/tests/qtest/emc141x-test.c b/tests/qtest/emc141x-test.c
index 8c86694091..a24103e2cd 100644
--- a/tests/qtest/emc141x-test.c
+++ b/tests/qtest/emc141x-test.c
@@ -10,7 +10,7 @@
#include "libqtest-single.h"
#include "libqos/qgraph.h"
#include "libqos/i2c.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "hw/sensor/emc141x_regs.h"
#define EMC1414_TEST_ID "emc1414-test"
diff --git a/tests/qtest/fdc-test.c b/tests/qtest/fdc-test.c
index 5e8fbda9df..f8a98a9f4b 100644
--- a/tests/qtest/fdc-test.c
+++ b/tests/qtest/fdc-test.c
@@ -26,7 +26,7 @@
#include "libqtest-single.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#define DRIVE_FLOPPY_BLANK \
"-drive if=floppy,file=null-co://,file.read-zeroes=on,format=raw,size=1440k"
diff --git a/tests/qtest/hd-geo-test.c b/tests/qtest/hd-geo-test.c
index d08bffad91..037e43f9f8 100644
--- a/tests/qtest/hd-geo-test.c
+++ b/tests/qtest/hd-geo-test.c
@@ -17,7 +17,7 @@
#include "qemu/osdep.h"
#include "qemu/bswap.h"
-#include "qapi/qmp/qlist.h"
+#include "qobject/qlist.h"
#include "libqtest.h"
#include "libqos/fw_cfg.h"
#include "libqos/libqos.h"
diff --git a/tests/qtest/ide-test.c b/tests/qtest/ide-test.c
index d6b4f6e36a..a0ff4fe327 100644
--- a/tests/qtest/ide-test.c
+++ b/tests/qtest/ide-test.c
@@ -29,7 +29,7 @@
#include "libqos/libqos.h"
#include "libqos/pci-pc.h"
#include "libqos/malloc-pc.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "qemu/bswap.h"
#include "hw/pci/pci_ids.h"
#include "hw/pci/pci_regs.h"
diff --git a/tests/qtest/isl_pmbus_vr-test.c b/tests/qtest/isl_pmbus_vr-test.c
index 5553ea410a..1ff840c6b7 100644
--- a/tests/qtest/isl_pmbus_vr-test.c
+++ b/tests/qtest/isl_pmbus_vr-test.c
@@ -21,8 +21,8 @@
#include "libqtest-single.h"
#include "libqos/qgraph.h"
#include "libqos/i2c.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qnum.h"
+#include "qobject/qdict.h"
+#include "qobject/qnum.h"
#include "qemu/bitops.h"
#define TEST_ID "isl_pmbus_vr-test"
diff --git a/tests/qtest/libqmp.c b/tests/qtest/libqmp.c
index a89cab03c3..16fe546885 100644
--- a/tests/qtest/libqmp.c
+++ b/tests/qtest/libqmp.c
@@ -25,8 +25,8 @@
#include "qemu/cutils.h"
#include "qemu/sockets.h"
#include "qapi/error.h"
-#include "qapi/qmp/json-parser.h"
-#include "qapi/qmp/qjson.h"
+#include "qobject/json-parser.h"
+#include "qobject/qjson.h"
#define SOCKET_MAX_FDS 16
diff --git a/tests/qtest/libqmp.h b/tests/qtest/libqmp.h
index 3445b753ff..4a931c93ab 100644
--- a/tests/qtest/libqmp.h
+++ b/tests/qtest/libqmp.h
@@ -18,7 +18,7 @@
#ifndef LIBQMP_H
#define LIBQMP_H
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
QDict *qmp_fd_receive(int fd);
#ifndef _WIN32
diff --git a/tests/qtest/libqos/generic-pcihost.c b/tests/qtest/libqos/generic-pcihost.c
index 3124b0e46b..4bbeb5ff50 100644
--- a/tests/qtest/libqos/generic-pcihost.c
+++ b/tests/qtest/libqos/generic-pcihost.c
@@ -13,7 +13,7 @@
#include "qemu/osdep.h"
#include "../libqtest.h"
#include "generic-pcihost.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "hw/pci/pci_regs.h"
#include "qemu/host-utils.h"
diff --git a/tests/qtest/libqos/libqos.c b/tests/qtest/libqos/libqos.c
index 5c0fa1f7c5..0cc8c511f0 100644
--- a/tests/qtest/libqos/libqos.c
+++ b/tests/qtest/libqos/libqos.c
@@ -2,7 +2,7 @@
#include "../libqtest.h"
#include "libqos.h"
#include "pci.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
/*** Test Setup & Teardown ***/
diff --git a/tests/qtest/libqos/pci-pc.c b/tests/qtest/libqos/pci-pc.c
index 96046287ac..147009f4f4 100644
--- a/tests/qtest/libqos/pci-pc.c
+++ b/tests/qtest/libqos/pci-pc.c
@@ -13,7 +13,7 @@
#include "qemu/osdep.h"
#include "../libqtest.h"
#include "pci-pc.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "hw/pci/pci_regs.h"
#include "qemu/module.h"
diff --git a/tests/qtest/libqos/qos_external.c b/tests/qtest/libqos/qos_external.c
index c6bb8bff09..493ab747de 100644
--- a/tests/qtest/libqos/qos_external.c
+++ b/tests/qtest/libqos/qos_external.c
@@ -19,11 +19,11 @@
#include "qemu/osdep.h"
#include <getopt.h>
#include "../libqtest.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qbool.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qdict.h"
+#include "qobject/qbool.h"
+#include "qobject/qstring.h"
#include "qemu/module.h"
-#include "qapi/qmp/qlist.h"
+#include "qobject/qlist.h"
#include "libqos-malloc.h"
#include "qgraph.h"
#include "qgraph_internal.h"
diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c
index f33a210861..ede3ea68ed 100644
--- a/tests/qtest/libqtest.c
+++ b/tests/qtest/libqtest.c
@@ -33,10 +33,10 @@
#include "qemu/ctype.h"
#include "qemu/cutils.h"
#include "qemu/sockets.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qjson.h"
-#include "qapi/qmp/qlist.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qdict.h"
+#include "qobject/qjson.h"
+#include "qobject/qlist.h"
+#include "qobject/qstring.h"
#define MAX_IRQ 256
diff --git a/tests/qtest/libqtest.h b/tests/qtest/libqtest.h
index 6e3d3525bf..b8508a43c0 100644
--- a/tests/qtest/libqtest.h
+++ b/tests/qtest/libqtest.h
@@ -17,8 +17,8 @@
#ifndef LIBQTEST_H
#define LIBQTEST_H
-#include "qapi/qmp/qobject.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qobject.h"
+#include "qobject/qdict.h"
#include "libqmp.h"
typedef struct QTestState QTestState;
diff --git a/tests/qtest/lsm303dlhc-mag-test.c b/tests/qtest/lsm303dlhc-mag-test.c
index 0f64e7fc67..55ef4594f9 100644
--- a/tests/qtest/lsm303dlhc-mag-test.c
+++ b/tests/qtest/lsm303dlhc-mag-test.c
@@ -13,7 +13,7 @@
#include "libqtest-single.h"
#include "libqos/qgraph.h"
#include "libqos/i2c.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#define LSM303DLHC_MAG_TEST_ID "lsm303dlhc_mag-test"
#define LSM303DLHC_MAG_REG_CRA 0x00
diff --git a/tests/qtest/machine-none-test.c b/tests/qtest/machine-none-test.c
index 31cc0bfb01..897b36c94b 100644
--- a/tests/qtest/machine-none-test.c
+++ b/tests/qtest/machine-none-test.c
@@ -14,7 +14,7 @@
#include "qemu/cutils.h"
#include "libqtest.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
struct arch2cpu {
diff --git a/tests/qtest/max34451-test.c b/tests/qtest/max34451-test.c
index dbf6ddc829..5e0878c923 100644
--- a/tests/qtest/max34451-test.c
+++ b/tests/qtest/max34451-test.c
@@ -11,8 +11,8 @@
#include "libqtest-single.h"
#include "libqos/qgraph.h"
#include "libqos/i2c.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qnum.h"
+#include "qobject/qdict.h"
+#include "qobject/qnum.h"
#include "qemu/bitops.h"
#define TEST_ID "max34451-test"
diff --git a/tests/qtest/migration-helpers.c b/tests/qtest/migration-helpers.c
index 24fb7b3525..55b9e2c429 100644
--- a/tests/qtest/migration-helpers.c
+++ b/tests/qtest/migration-helpers.c
@@ -12,7 +12,7 @@
#include "qemu/osdep.h"
#include "qemu/ctype.h"
-#include "qapi/qmp/qjson.h"
+#include "qobject/qjson.h"
#include "migration-helpers.h"
diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
index d520c587f7..c61817285b 100644
--- a/tests/qtest/migration-test.c
+++ b/tests/qtest/migration-test.c
@@ -14,7 +14,7 @@
#include "libqtest.h"
#include "qapi/error.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "qemu/module.h"
#include "qemu/option.h"
#include "qemu/range.h"
@@ -24,7 +24,7 @@
#include "qapi/qobject-input-visitor.h"
#include "qapi/qobject-output-visitor.h"
#include "crypto/tlscredspsk.h"
-#include "qapi/qmp/qlist.h"
+#include "qobject/qlist.h"
#include "migration-helpers.h"
#include "tests/migration/migration-test.h"
diff --git a/tests/qtest/netdev-socket.c b/tests/qtest/netdev-socket.c
index bb99d08b5e..85a538f50c 100644
--- a/tests/qtest/netdev-socket.c
+++ b/tests/qtest/netdev-socket.c
@@ -11,7 +11,7 @@
#include <glib/gstdio.h>
#include "../unit/socket-helpers.h"
#include "libqtest.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qstring.h"
#include "qemu/sockets.h"
#include "qapi/qobject-input-visitor.h"
#include "qapi/qapi-visit-sockets.h"
diff --git a/tests/qtest/npcm7xx_adc-test.c b/tests/qtest/npcm7xx_adc-test.c
index e751a72e36..8bc89b8a8b 100644
--- a/tests/qtest/npcm7xx_adc-test.c
+++ b/tests/qtest/npcm7xx_adc-test.c
@@ -18,7 +18,7 @@
#include "qemu/bitops.h"
#include "qemu/timer.h"
#include "libqtest.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#define REF_HZ (25000000)
diff --git a/tests/qtest/npcm7xx_emc-test.c b/tests/qtest/npcm7xx_emc-test.c
index b046f1d76a..706c801d47 100644
--- a/tests/qtest/npcm7xx_emc-test.c
+++ b/tests/qtest/npcm7xx_emc-test.c
@@ -16,8 +16,8 @@
#include "qemu/osdep.h"
#include "libqos/libqos.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qnum.h"
+#include "qobject/qdict.h"
+#include "qobject/qnum.h"
#include "qemu/bitops.h"
#include "qemu/iov.h"
diff --git a/tests/qtest/npcm7xx_pwm-test.c b/tests/qtest/npcm7xx_pwm-test.c
index b53a43c417..052ea87662 100644
--- a/tests/qtest/npcm7xx_pwm-test.c
+++ b/tests/qtest/npcm7xx_pwm-test.c
@@ -17,8 +17,8 @@
#include "qemu/osdep.h"
#include "qemu/bitops.h"
#include "libqtest.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qnum.h"
+#include "qobject/qdict.h"
+#include "qobject/qnum.h"
static int verbosity_level;
diff --git a/tests/qtest/npcm7xx_watchdog_timer-test.c b/tests/qtest/npcm7xx_watchdog_timer-test.c
index 4773a673b2..f69cd73ac3 100644
--- a/tests/qtest/npcm7xx_watchdog_timer-test.c
+++ b/tests/qtest/npcm7xx_watchdog_timer-test.c
@@ -18,7 +18,7 @@
#include "qemu/timer.h"
#include "libqtest.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#define WTCR_OFFSET 0x1c
#define REF_HZ (25000000)
diff --git a/tests/qtest/numa-test.c b/tests/qtest/numa-test.c
index 4f4404a4b1..d6179f280a 100644
--- a/tests/qtest/numa-test.c
+++ b/tests/qtest/numa-test.c
@@ -11,8 +11,8 @@
#include "qemu/osdep.h"
#include "libqtest.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qlist.h"
+#include "qobject/qdict.h"
+#include "qobject/qlist.h"
static char *make_cli(const GString *generic_cli, const char *test_cli)
{
diff --git a/tests/qtest/pvpanic-pci-test.c b/tests/qtest/pvpanic-pci-test.c
index 2c05b376ba..7ee8aa2069 100644
--- a/tests/qtest/pvpanic-pci-test.c
+++ b/tests/qtest/pvpanic-pci-test.c
@@ -13,7 +13,7 @@
#include "qemu/osdep.h"
#include "libqtest.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "libqos/pci.h"
#include "libqos/pci-pc.h"
#include "hw/pci/pci_regs.h"
diff --git a/tests/qtest/pvpanic-test.c b/tests/qtest/pvpanic-test.c
index 78f1cf8186..f6a4deafb9 100644
--- a/tests/qtest/pvpanic-test.c
+++ b/tests/qtest/pvpanic-test.c
@@ -9,7 +9,7 @@
#include "qemu/osdep.h"
#include "libqtest.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
static void test_panic_nopause(void)
{
diff --git a/tests/qtest/q35-test.c b/tests/qtest/q35-test.c
index c922d81bc0..4636a40e99 100644
--- a/tests/qtest/q35-test.c
+++ b/tests/qtest/q35-test.c
@@ -14,7 +14,7 @@
#include "libqos/pci.h"
#include "libqos/pci-pc.h"
#include "hw/pci-host/q35.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#define TSEG_SIZE_TEST_GUEST_RAM_MBYTES 128
diff --git a/tests/qtest/qmp-cmd-test.c b/tests/qtest/qmp-cmd-test.c
index 2c15f60958..15c88248b7 100644
--- a/tests/qtest/qmp-cmd-test.c
+++ b/tests/qtest/qmp-cmd-test.c
@@ -14,7 +14,7 @@
#include "libqtest.h"
#include "qapi/error.h"
#include "qapi/qapi-visit-introspect.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "qapi/qobject-input-visitor.h"
const char common_args[] = "-nodefaults -machine none";
diff --git a/tests/qtest/qmp-test.c b/tests/qtest/qmp-test.c
index 22957fa49c..edf0886787 100644
--- a/tests/qtest/qmp-test.c
+++ b/tests/qtest/qmp-test.c
@@ -14,10 +14,10 @@
#include "libqtest.h"
#include "qapi/error.h"
#include "qapi/qapi-visit-control.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qlist.h"
+#include "qobject/qdict.h"
+#include "qobject/qlist.h"
#include "qapi/qobject-input-visitor.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qstring.h"
const char common_args[] = "-nodefaults -machine none";
diff --git a/tests/qtest/qom-test.c b/tests/qtest/qom-test.c
index d677f87c8e..1e30a5bfe8 100644
--- a/tests/qtest/qom-test.c
+++ b/tests/qtest/qom-test.c
@@ -9,8 +9,8 @@
#include "qemu/osdep.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qlist.h"
+#include "qobject/qdict.h"
+#include "qobject/qlist.h"
#include "qemu/cutils.h"
#include "libqtest.h"
diff --git a/tests/qtest/qos-test.c b/tests/qtest/qos-test.c
index 5da4091ec3..43e01113f7 100644
--- a/tests/qtest/qos-test.c
+++ b/tests/qtest/qos-test.c
@@ -20,7 +20,7 @@
#include <getopt.h>
#include "libqtest-single.h"
#include "qapi/error.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "qemu/module.h"
#include "qapi/qobject-input-visitor.h"
#include "qapi/qapi-visit-machine.h"
diff --git a/tests/qtest/readconfig-test.c b/tests/qtest/readconfig-test.c
index 760f974e63..c6f32a4e14 100644
--- a/tests/qtest/readconfig-test.c
+++ b/tests/qtest/readconfig-test.c
@@ -13,10 +13,10 @@
#include "qapi/qapi-visit-machine.h"
#include "qapi/qapi-visit-qom.h"
#include "qapi/qapi-visit-ui.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qlist.h"
+#include "qobject/qdict.h"
+#include "qobject/qlist.h"
#include "qapi/qobject-input-visitor.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qstring.h"
#include "qemu/units.h"
static QTestState *qtest_init_with_config(const char *cfgdata)
diff --git a/tests/qtest/tco-test.c b/tests/qtest/tco-test.c
index 0547d41173..20ccefabcb 100644
--- a/tests/qtest/tco-test.c
+++ b/tests/qtest/tco-test.c
@@ -12,7 +12,7 @@
#include "libqtest.h"
#include "libqos/pci.h"
#include "libqos/pci-pc.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "hw/pci/pci_regs.h"
#include "hw/southbridge/ich9.h"
#include "hw/acpi/ich9.h"
diff --git a/tests/qtest/test-filter-mirror.c b/tests/qtest/test-filter-mirror.c
index f3865f7519..723d2c2f29 100644
--- a/tests/qtest/test-filter-mirror.c
+++ b/tests/qtest/test-filter-mirror.c
@@ -10,7 +10,7 @@
#include "qemu/osdep.h"
#include "libqtest.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "qemu/iov.h"
#include "qemu/sockets.h"
#include "qemu/error-report.h"
diff --git a/tests/qtest/test-filter-redirector.c b/tests/qtest/test-filter-redirector.c
index a77d5fd8ec..a996a80c1c 100644
--- a/tests/qtest/test-filter-redirector.c
+++ b/tests/qtest/test-filter-redirector.c
@@ -52,7 +52,7 @@
#include "qemu/osdep.h"
#include "libqtest.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "qemu/iov.h"
#include "qemu/sockets.h"
#include "qemu/error-report.h"
diff --git a/tests/qtest/test-netfilter.c b/tests/qtest/test-netfilter.c
index b09ef7fae9..326d4bd85f 100644
--- a/tests/qtest/test-netfilter.c
+++ b/tests/qtest/test-netfilter.c
@@ -10,7 +10,7 @@
#include "qemu/osdep.h"
#include "libqtest-single.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
/* add a netfilter to a netdev and then remove it */
static void add_one_netfilter(void)
diff --git a/tests/qtest/test-x86-cpuid-compat.c b/tests/qtest/test-x86-cpuid-compat.c
index 6a39454fce..2990e8fa22 100644
--- a/tests/qtest/test-x86-cpuid-compat.c
+++ b/tests/qtest/test-x86-cpuid-compat.c
@@ -1,8 +1,8 @@
#include "qemu/osdep.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qlist.h"
-#include "qapi/qmp/qnum.h"
-#include "qapi/qmp/qbool.h"
+#include "qobject/qdict.h"
+#include "qobject/qlist.h"
+#include "qobject/qnum.h"
+#include "qobject/qbool.h"
#include "libqtest-single.h"
static char *get_cpu0_qom_path(void)
diff --git a/tests/qtest/tmp105-test.c b/tests/qtest/tmp105-test.c
index 3678646df5..eaf059705d 100644
--- a/tests/qtest/tmp105-test.c
+++ b/tests/qtest/tmp105-test.c
@@ -12,7 +12,7 @@
#include "libqtest-single.h"
#include "libqos/qgraph.h"
#include "libqos/i2c.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "hw/sensor/tmp105_regs.h"
#define TMP105_TEST_ID "tmp105-test"
diff --git a/tests/qtest/tpm-emu.c b/tests/qtest/tpm-emu.c
index 2bf8ff4c86..9e4c2005d0 100644
--- a/tests/qtest/tpm-emu.c
+++ b/tests/qtest/tpm-emu.c
@@ -16,8 +16,8 @@
#include "backends/tpm/tpm_ioctl.h"
#include "io/channel-socket.h"
#include "qapi/error.h"
-#include "qapi/qmp/qlist.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qlist.h"
+#include "qobject/qstring.h"
#include "tpm-emu.h"
void tpm_emu_test_wait_cond(TPMTestState *s)
diff --git a/tests/qtest/tpm-util.c b/tests/qtest/tpm-util.c
index 1c0319e6e7..2cb2dd4796 100644
--- a/tests/qtest/tpm-util.c
+++ b/tests/qtest/tpm-util.c
@@ -18,7 +18,7 @@
#include "hw/acpi/tpm.h"
#include "libqtest.h"
#include "tpm-util.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
void tpm_util_crb_transfer(QTestState *s,
const unsigned char *req, size_t req_size,
diff --git a/tests/qtest/vhost-user-test.c b/tests/qtest/vhost-user-test.c
index d4e437265f..85a7275d3b 100644
--- a/tests/qtest/vhost-user-test.c
+++ b/tests/qtest/vhost-user-test.c
@@ -12,7 +12,7 @@
#include "libqtest-single.h"
#include "qapi/error.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "qemu/config-file.h"
#include "qemu/option.h"
#include "qemu/range.h"
diff --git a/tests/qtest/virtio-net-failover.c b/tests/qtest/virtio-net-failover.c
index 0d40bc1f2d..7695f2d09f 100644
--- a/tests/qtest/virtio-net-failover.c
+++ b/tests/qtest/virtio-net-failover.c
@@ -12,9 +12,9 @@
#include "libqos/pci.h"
#include "libqos/pci-pc.h"
#include "migration-helpers.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qlist.h"
-#include "qapi/qmp/qjson.h"
+#include "qobject/qdict.h"
+#include "qobject/qlist.h"
+#include "qobject/qjson.h"
#include "libqos/malloc-pc.h"
#include "libqos/virtio-pci.h"
#include "hw/pci/pci.h"
diff --git a/tests/qtest/virtio-net-test.c b/tests/qtest/virtio-net-test.c
index 2df75c9780..60e5229a3d 100644
--- a/tests/qtest/virtio-net-test.c
+++ b/tests/qtest/virtio-net-test.c
@@ -11,7 +11,7 @@
#include "libqtest-single.h"
#include "qemu/iov.h"
#include "qemu/module.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "hw/virtio/virtio-net.h"
#include "libqos/qgraph.h"
#include "libqos/virtio-net.h"
diff --git a/tests/qtest/vmgenid-test.c b/tests/qtest/vmgenid-test.c
index 29fee9e7c0..e613374665 100644
--- a/tests/qtest/vmgenid-test.c
+++ b/tests/qtest/vmgenid-test.c
@@ -15,7 +15,7 @@
#include "boot-sector.h"
#include "acpi-utils.h"
#include "libqtest.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#define VGID_GUID "324e6eaf-d1d1-4bf6-bf41-b9bb6c91fb87"
#define VMGENID_GUID_OFFSET 40 /* allow space for
diff --git a/tests/qtest/wdt_ib700-test.c b/tests/qtest/wdt_ib700-test.c
index 797288d939..1754757162 100644
--- a/tests/qtest/wdt_ib700-test.c
+++ b/tests/qtest/wdt_ib700-test.c
@@ -9,7 +9,7 @@
#include "qemu/osdep.h"
#include "libqtest.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "qemu/timer.h"
static void qmp_check_no_event(QTestState *s)
diff --git a/tests/unit/check-block-qdict.c b/tests/unit/check-block-qdict.c
index 751c58e737..0036d85cfa 100644
--- a/tests/unit/check-block-qdict.c
+++ b/tests/unit/check-block-qdict.c
@@ -9,8 +9,8 @@
#include "qemu/osdep.h"
#include "block/qdict.h"
-#include "qapi/qmp/qlist.h"
-#include "qapi/qmp/qnum.h"
+#include "qobject/qlist.h"
+#include "qobject/qnum.h"
#include "qapi/error.h"
static void qdict_defaults_test(void)
diff --git a/tests/unit/check-qdict.c b/tests/unit/check-qdict.c
index b5efa859b0..a1312be30a 100644
--- a/tests/unit/check-qdict.c
+++ b/tests/unit/check-qdict.c
@@ -11,9 +11,9 @@
*/
#include "qemu/osdep.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qnum.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qdict.h"
+#include "qobject/qnum.h"
+#include "qobject/qstring.h"
/*
* Public Interface test-cases
diff --git a/tests/unit/check-qjson.c b/tests/unit/check-qjson.c
index a89293ce51..780a3654d0 100644
--- a/tests/unit/check-qjson.c
+++ b/tests/unit/check-qjson.c
@@ -14,12 +14,12 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "qapi/qmp/qbool.h"
-#include "qapi/qmp/qjson.h"
-#include "qapi/qmp/qlit.h"
-#include "qapi/qmp/qnull.h"
-#include "qapi/qmp/qnum.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qbool.h"
+#include "qobject/qjson.h"
+#include "qobject/qlit.h"
+#include "qobject/qnull.h"
+#include "qobject/qnum.h"
+#include "qobject/qstring.h"
#include "qemu/unicode.h"
static QString *from_json_str(const char *jstr, bool single, Error **errp)
diff --git a/tests/unit/check-qlist.c b/tests/unit/check-qlist.c
index 3cd0ccbf19..1388aeede3 100644
--- a/tests/unit/check-qlist.c
+++ b/tests/unit/check-qlist.c
@@ -11,8 +11,8 @@
*/
#include "qemu/osdep.h"
-#include "qapi/qmp/qnum.h"
-#include "qapi/qmp/qlist.h"
+#include "qobject/qnum.h"
+#include "qobject/qlist.h"
/*
* Public Interface test-cases
diff --git a/tests/unit/check-qlit.c b/tests/unit/check-qlit.c
index bd6798d912..ea7a0d9119 100644
--- a/tests/unit/check-qlit.c
+++ b/tests/unit/check-qlit.c
@@ -9,12 +9,12 @@
#include "qemu/osdep.h"
-#include "qapi/qmp/qbool.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qlist.h"
-#include "qapi/qmp/qlit.h"
-#include "qapi/qmp/qnum.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qbool.h"
+#include "qobject/qdict.h"
+#include "qobject/qlist.h"
+#include "qobject/qlit.h"
+#include "qobject/qnum.h"
+#include "qobject/qstring.h"
static QLitObject qlit = QLIT_QDICT(((QLitDictEntry[]) {
{ "foo", QLIT_QNUM(42) },
diff --git a/tests/unit/check-qnull.c b/tests/unit/check-qnull.c
index 5ceacc65d7..724a66d0bd 100644
--- a/tests/unit/check-qnull.c
+++ b/tests/unit/check-qnull.c
@@ -8,7 +8,7 @@
*/
#include "qemu/osdep.h"
-#include "qapi/qmp/qnull.h"
+#include "qobject/qnull.h"
#include "qapi/qobject-input-visitor.h"
#include "qapi/qobject-output-visitor.h"
#include "qapi/error.h"
diff --git a/tests/unit/check-qnum.c b/tests/unit/check-qnum.c
index bf7fe45bac..a40120e8d3 100644
--- a/tests/unit/check-qnum.c
+++ b/tests/unit/check-qnum.c
@@ -14,7 +14,7 @@
#include "qemu/osdep.h"
-#include "qapi/qmp/qnum.h"
+#include "qobject/qnum.h"
/*
* Public Interface test-cases
diff --git a/tests/unit/check-qobject.c b/tests/unit/check-qobject.c
index 022b7c74fe..ccb25660f2 100644
--- a/tests/unit/check-qobject.c
+++ b/tests/unit/check-qobject.c
@@ -9,12 +9,12 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "qapi/qmp/qbool.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qlist.h"
-#include "qapi/qmp/qnull.h"
-#include "qapi/qmp/qnum.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qbool.h"
+#include "qobject/qdict.h"
+#include "qobject/qlist.h"
+#include "qobject/qnull.h"
+#include "qobject/qnum.h"
+#include "qobject/qstring.h"
#include <math.h>
diff --git a/tests/unit/check-qom-proplist.c b/tests/unit/check-qom-proplist.c
index 79d4a8b89d..b814ded957 100644
--- a/tests/unit/check-qom-proplist.c
+++ b/tests/unit/check-qom-proplist.c
@@ -22,8 +22,8 @@
#include "qapi/error.h"
#include "qapi/qobject-input-visitor.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qobject.h"
+#include "qobject/qdict.h"
+#include "qobject/qobject.h"
#include "qom/object.h"
#include "qemu/module.h"
#include "qemu/option.h"
diff --git a/tests/unit/check-qstring.c b/tests/unit/check-qstring.c
index bd861f4f8b..2e6a00570f 100644
--- a/tests/unit/check-qstring.c
+++ b/tests/unit/check-qstring.c
@@ -11,7 +11,7 @@
*/
#include "qemu/osdep.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qstring.h"
/*
* Public Interface test-cases
diff --git a/tests/unit/test-block-iothread.c b/tests/unit/test-block-iothread.c
index 3766d5de6b..5c227b2e3f 100644
--- a/tests/unit/test-block-iothread.c
+++ b/tests/unit/test-block-iothread.c
@@ -28,7 +28,7 @@
#include "block/blockjob_int.h"
#include "sysemu/block-backend.h"
#include "qapi/error.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "qemu/main-loop.h"
#include "iothread.h"
diff --git a/tests/unit/test-blockjob-txn.c b/tests/unit/test-blockjob-txn.c
index d3b0bb24be..199f6f5291 100644
--- a/tests/unit/test-blockjob-txn.c
+++ b/tests/unit/test-blockjob-txn.c
@@ -15,7 +15,7 @@
#include "qemu/main-loop.h"
#include "block/blockjob_int.h"
#include "sysemu/block-backend.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
typedef struct {
BlockJob common;
diff --git a/tests/unit/test-blockjob.c b/tests/unit/test-blockjob.c
index fe3e0d2d38..918d212661 100644
--- a/tests/unit/test-blockjob.c
+++ b/tests/unit/test-blockjob.c
@@ -15,7 +15,7 @@
#include "qemu/main-loop.h"
#include "block/blockjob_int.h"
#include "sysemu/block-backend.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "iothread.h"
static const BlockJobDriver test_block_job_driver = {
diff --git a/tests/unit/test-char.c b/tests/unit/test-char.c
index 649fdf64e1..d3b20cc2ea 100644
--- a/tests/unit/test-char.c
+++ b/tests/unit/test-char.c
@@ -9,7 +9,7 @@
#include "sysemu/sysemu.h"
#include "qapi/error.h"
#include "qapi/qapi-commands-char.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "qom/qom-qobject.h"
#include "io/channel-socket.h"
#include "qapi/qobject-input-visitor.h"
diff --git a/tests/unit/test-forward-visitor.c b/tests/unit/test-forward-visitor.c
index eea8ffc072..aad1c89f13 100644
--- a/tests/unit/test-forward-visitor.c
+++ b/tests/unit/test-forward-visitor.c
@@ -12,8 +12,8 @@
#include "qapi/forward-visitor.h"
#include "qapi/qobject-input-visitor.h"
#include "qapi/error.h"
-#include "qapi/qmp/qobject.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qobject.h"
+#include "qobject/qdict.h"
#include "test-qapi-visit.h"
#include "qemu/keyval.h"
diff --git a/tests/unit/test-image-locking.c b/tests/unit/test-image-locking.c
index 2624cec6a0..7801876a01 100644
--- a/tests/unit/test-image-locking.c
+++ b/tests/unit/test-image-locking.c
@@ -28,7 +28,7 @@
#include "block/block.h"
#include "sysemu/block-backend.h"
#include "qapi/error.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "qemu/main-loop.h"
static BlockBackend *open_image(const char *path,
diff --git a/tests/unit/test-keyval.c b/tests/unit/test-keyval.c
index 4dc52c7a1a..c6e8f4fe37 100644
--- a/tests/unit/test-keyval.c
+++ b/tests/unit/test-keyval.c
@@ -13,9 +13,9 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
#include "qapi/error.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qlist.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qdict.h"
+#include "qobject/qlist.h"
+#include "qobject/qstring.h"
#include "qapi/qobject-input-visitor.h"
#include "test-qapi-visit.h"
#include "qemu/cutils.h"
diff --git a/tests/unit/test-qemu-opts.c b/tests/unit/test-qemu-opts.c
index 828d40e928..8d03a69f7c 100644
--- a/tests/unit/test-qemu-opts.c
+++ b/tests/unit/test-qemu-opts.c
@@ -12,8 +12,8 @@
#include "qemu/option.h"
#include "qemu/option_int.h"
#include "qapi/error.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qdict.h"
+#include "qobject/qstring.h"
#include "qemu/config-file.h"
diff --git a/tests/unit/test-qga.c b/tests/unit/test-qga.c
index 671e83cb86..1cd3fa8673 100644
--- a/tests/unit/test-qga.c
+++ b/tests/unit/test-qga.c
@@ -5,8 +5,8 @@
#include <sys/un.h>
#include "../qtest/libqtest.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qlist.h"
+#include "qobject/qdict.h"
+#include "qobject/qlist.h"
typedef struct {
char *test_dir;
diff --git a/tests/unit/test-qmp-cmds.c b/tests/unit/test-qmp-cmds.c
index 6d52b4e5d8..ad53886886 100644
--- a/tests/unit/test-qmp-cmds.c
+++ b/tests/unit/test-qmp-cmds.c
@@ -1,9 +1,9 @@
#include "qemu/osdep.h"
#include "qapi/compat-policy.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qjson.h"
-#include "qapi/qmp/qnum.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qdict.h"
+#include "qobject/qjson.h"
+#include "qobject/qnum.h"
+#include "qobject/qstring.h"
#include "qapi/error.h"
#include "qapi/qobject-input-visitor.h"
#include "tests/test-qapi-types.h"
diff --git a/tests/unit/test-qmp-event.c b/tests/unit/test-qmp-event.c
index 08e95a382b..2aac27163d 100644
--- a/tests/unit/test-qmp-event.c
+++ b/tests/unit/test-qmp-event.c
@@ -15,11 +15,11 @@
#include "qapi/compat-policy.h"
#include "qapi/error.h"
-#include "qapi/qmp/qbool.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qjson.h"
-#include "qapi/qmp/qnum.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qbool.h"
+#include "qobject/qdict.h"
+#include "qobject/qjson.h"
+#include "qobject/qnum.h"
+#include "qobject/qstring.h"
#include "qapi/qmp-event.h"
#include "test-qapi-events.h"
#include "test-qapi-emit-events.h"
diff --git a/tests/unit/test-qobject-input-visitor.c b/tests/unit/test-qobject-input-visitor.c
index 024e26c49e..559e9bfc02 100644
--- a/tests/unit/test-qobject-input-visitor.c
+++ b/tests/unit/test-qobject-input-visitor.c
@@ -17,12 +17,12 @@
#include "qapi/qapi-visit-introspect.h"
#include "qapi/qobject-input-visitor.h"
#include "test-qapi-visit.h"
-#include "qapi/qmp/qbool.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qnull.h"
-#include "qapi/qmp/qnum.h"
-#include "qapi/qmp/qstring.h"
-#include "qapi/qmp/qjson.h"
+#include "qobject/qbool.h"
+#include "qobject/qdict.h"
+#include "qobject/qnull.h"
+#include "qobject/qnum.h"
+#include "qobject/qstring.h"
+#include "qobject/qjson.h"
#include "test-qapi-introspect.h"
#include "qapi/qapi-introspect.h"
diff --git a/tests/unit/test-qobject-output-visitor.c b/tests/unit/test-qobject-output-visitor.c
index 1535b3ad17..513a24d113 100644
--- a/tests/unit/test-qobject-output-visitor.c
+++ b/tests/unit/test-qobject-output-visitor.c
@@ -15,12 +15,12 @@
#include "qapi/error.h"
#include "qapi/qobject-output-visitor.h"
#include "test-qapi-visit.h"
-#include "qapi/qmp/qbool.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qlist.h"
-#include "qapi/qmp/qnull.h"
-#include "qapi/qmp/qnum.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qbool.h"
+#include "qobject/qdict.h"
+#include "qobject/qlist.h"
+#include "qobject/qnull.h"
+#include "qobject/qnum.h"
+#include "qobject/qstring.h"
typedef struct TestOutputVisitorData {
Visitor *ov;
diff --git a/tests/unit/test-replication.c b/tests/unit/test-replication.c
index 5d2003b8ce..32f2fbff6a 100644
--- a/tests/unit/test-replication.c
+++ b/tests/unit/test-replication.c
@@ -11,7 +11,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "qemu/option.h"
#include "qemu/main-loop.h"
#include "block/replication.h"
diff --git a/tests/unit/test-visitor-serialization.c b/tests/unit/test-visitor-serialization.c
index c2056c3eaa..2d365999fc 100644
--- a/tests/unit/test-visitor-serialization.c
+++ b/tests/unit/test-visitor-serialization.c
@@ -16,8 +16,8 @@
#include "test-qapi-visit.h"
#include "qapi/error.h"
-#include "qapi/qmp/qjson.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qjson.h"
+#include "qobject/qstring.h"
#include "qapi/qobject-input-visitor.h"
#include "qapi/qobject-output-visitor.h"
#include "qapi/string-input-visitor.h"
--
2.43.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH 26/29] trace: adapt to new import path for qobject data type headers
2024-01-08 18:23 [PATCH 00/29] include: move include/qapi/qmp/ to include/qobject/ Daniel P. Berrangé
` (24 preceding siblings ...)
2024-01-08 18:24 ` [PATCH 25/29] tests: " Daniel P. Berrangé
@ 2024-01-08 18:24 ` Daniel P. Berrangé
2024-01-08 18:24 ` [PATCH 27/29] ui: " Daniel P. Berrangé
` (3 subsequent siblings)
29 siblings, 0 replies; 37+ messages in thread
From: Daniel P. Berrangé @ 2024-01-08 18:24 UTC (permalink / raw)
To: qemu-devel; +Cc: Markus Armbruster, Michael Roth, Daniel P. Berrangé
The qobject data type headers have moved from qapi/qmp/ to
qobject/.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
trace/trace-hmp-cmds.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/trace/trace-hmp-cmds.c b/trace/trace-hmp-cmds.c
index 86211fce27..c561b18e23 100644
--- a/trace/trace-hmp-cmds.c
+++ b/trace/trace-hmp-cmds.c
@@ -27,7 +27,7 @@
#include "monitor/monitor.h"
#include "qapi/error.h"
#include "qapi/qapi-commands-trace.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "trace/control.h"
#ifdef CONFIG_TRACE_SIMPLE
#include "trace/simple.h"
--
2.43.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH 27/29] ui: adapt to new import path for qobject data type headers
2024-01-08 18:23 [PATCH 00/29] include: move include/qapi/qmp/ to include/qobject/ Daniel P. Berrangé
` (25 preceding siblings ...)
2024-01-08 18:24 ` [PATCH 26/29] trace: " Daniel P. Berrangé
@ 2024-01-08 18:24 ` Daniel P. Berrangé
2024-01-08 18:24 ` [PATCH 28/29] util: " Daniel P. Berrangé
` (2 subsequent siblings)
29 siblings, 0 replies; 37+ messages in thread
From: Daniel P. Berrangé @ 2024-01-08 18:24 UTC (permalink / raw)
To: qemu-devel; +Cc: Markus Armbruster, Michael Roth, Daniel P. Berrangé
The qobject data type headers have moved from qapi/qmp/ to
qobject/.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
ui/input-barrier.c | 2 +-
ui/ui-hmp-cmds.c | 2 +-
ui/ui-qmp-cmds.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ui/input-barrier.c b/ui/input-barrier.c
index 2d57ca7079..713392170c 100644
--- a/ui/input-barrier.c
+++ b/ui/input-barrier.c
@@ -21,7 +21,7 @@
#include "qom/object.h"
#include "ui/vnc_keysym.h" /* use name2keysym from VNC as we use X11 values */
#include "qemu/cutils.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
#include "input-barrier.h"
#define TYPE_INPUT_BARRIER "input-barrier"
diff --git a/ui/ui-hmp-cmds.c b/ui/ui-hmp-cmds.c
index 26c8ced1f2..980a8bbc51 100644
--- a/ui/ui-hmp-cmds.c
+++ b/ui/ui-hmp-cmds.c
@@ -21,7 +21,7 @@
#include "monitor/monitor-internal.h"
#include "qapi/error.h"
#include "qapi/qapi-commands-ui.h"
-#include "qapi/qmp/qdict.h"
+#include "qobject/qdict.h"
#include "qemu/cutils.h"
#include "ui/console.h"
#include "ui/input.h"
diff --git a/ui/ui-qmp-cmds.c b/ui/ui-qmp-cmds.c
index 74fa6c6ec5..97baf2166d 100644
--- a/ui/ui-qmp-cmds.c
+++ b/ui/ui-qmp-cmds.c
@@ -18,7 +18,7 @@
#include "io/channel-file.h"
#include "monitor/qmp-helpers.h"
#include "qapi/qapi-commands-ui.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
#include "qemu/coroutine.h"
#include "qemu/cutils.h"
#include "trace.h"
--
2.43.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH 28/29] util: adapt to new import path for qobject data type headers
2024-01-08 18:23 [PATCH 00/29] include: move include/qapi/qmp/ to include/qobject/ Daniel P. Berrangé
` (26 preceding siblings ...)
2024-01-08 18:24 ` [PATCH 27/29] ui: " Daniel P. Berrangé
@ 2024-01-08 18:24 ` Daniel P. Berrangé
2024-01-08 18:24 ` [PATCH 29/29] qapi: remove header file compatibility symlinks Daniel P. Berrangé
2024-03-19 15:50 ` [PATCH 00/29] include: move include/qapi/qmp/ to include/qobject/ Daniel P. Berrangé
29 siblings, 0 replies; 37+ messages in thread
From: Daniel P. Berrangé @ 2024-01-08 18:24 UTC (permalink / raw)
To: qemu-devel; +Cc: Markus Armbruster, Michael Roth, Daniel P. Berrangé
The qobject data type headers have moved from qapi/qmp/ to
qobject/.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
util/block-helpers.c | 2 +-
util/keyval.c | 6 +++---
util/qemu-config.c | 4 ++--
util/qemu-option.c | 10 +++++-----
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/util/block-helpers.c b/util/block-helpers.c
index c4851432f5..724c4ce8eb 100644
--- a/util/block-helpers.c
+++ b/util/block-helpers.c
@@ -10,7 +10,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qerror.h"
#include "block-helpers.h"
/**
diff --git a/util/keyval.c b/util/keyval.c
index 66a5b4740f..a70629a481 100644
--- a/util/keyval.c
+++ b/util/keyval.c
@@ -91,9 +91,9 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qlist.h"
-#include "qapi/qmp/qstring.h"
+#include "qobject/qdict.h"
+#include "qobject/qlist.h"
+#include "qobject/qstring.h"
#include "qemu/cutils.h"
#include "qemu/keyval.h"
#include "qemu/help_option.h"
diff --git a/util/qemu-config.c b/util/qemu-config.c
index 42076efe1e..7b8bda1645 100644
--- a/util/qemu-config.c
+++ b/util/qemu-config.c
@@ -2,8 +2,8 @@
#include "block/qdict.h" /* for qdict_extract_subqdict() */
#include "qapi/error.h"
#include "qapi/qapi-commands-misc.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qlist.h"
+#include "qobject/qdict.h"
+#include "qobject/qlist.h"
#include "qemu/error-report.h"
#include "qemu/option.h"
#include "qemu/config-file.h"
diff --git a/util/qemu-option.c b/util/qemu-option.c
index eedd08929b..9399314334 100644
--- a/util/qemu-option.c
+++ b/util/qemu-option.c
@@ -27,11 +27,11 @@
#include "qapi/error.h"
#include "qemu/error-report.h"
-#include "qapi/qmp/qbool.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qnum.h"
-#include "qapi/qmp/qstring.h"
-#include "qapi/qmp/qerror.h"
+#include "qobject/qbool.h"
+#include "qobject/qdict.h"
+#include "qobject/qnum.h"
+#include "qobject/qstring.h"
+#include "qobject/qerror.h"
#include "qemu/option_int.h"
#include "qemu/cutils.h"
#include "qemu/id.h"
--
2.43.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [PATCH 29/29] qapi: remove header file compatibility symlinks
2024-01-08 18:23 [PATCH 00/29] include: move include/qapi/qmp/ to include/qobject/ Daniel P. Berrangé
` (27 preceding siblings ...)
2024-01-08 18:24 ` [PATCH 28/29] util: " Daniel P. Berrangé
@ 2024-01-08 18:24 ` Daniel P. Berrangé
2024-03-19 15:50 ` [PATCH 00/29] include: move include/qapi/qmp/ to include/qobject/ Daniel P. Berrangé
29 siblings, 0 replies; 37+ messages in thread
From: Daniel P. Berrangé @ 2024-01-08 18:24 UTC (permalink / raw)
To: qemu-devel; +Cc: Markus Armbruster, Michael Roth, Daniel P. Berrangé
All code is converted to the new 'qobject/' import path, so
the temporary header file compatibility symlinks are now
redundant.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
qapi/qmp/dispatch.h | 1 -
qapi/qmp/json-parser.h | 1 -
qapi/qmp/json-writer.h | 1 -
qapi/qmp/qbool.h | 1 -
qapi/qmp/qdict.h | 1 -
qapi/qmp/qerror.h | 1 -
qapi/qmp/qjson.h | 1 -
qapi/qmp/qlist.h | 1 -
qapi/qmp/qlit.h | 1 -
qapi/qmp/qnull.h | 1 -
qapi/qmp/qnum.h | 1 -
qapi/qmp/qobject.h | 1 -
qapi/qmp/qstring.h | 1 -
13 files changed, 13 deletions(-)
delete mode 120000 qapi/qmp/dispatch.h
delete mode 120000 qapi/qmp/json-parser.h
delete mode 120000 qapi/qmp/json-writer.h
delete mode 120000 qapi/qmp/qbool.h
delete mode 120000 qapi/qmp/qdict.h
delete mode 120000 qapi/qmp/qerror.h
delete mode 120000 qapi/qmp/qjson.h
delete mode 120000 qapi/qmp/qlist.h
delete mode 120000 qapi/qmp/qlit.h
delete mode 120000 qapi/qmp/qnull.h
delete mode 120000 qapi/qmp/qnum.h
delete mode 120000 qapi/qmp/qobject.h
delete mode 120000 qapi/qmp/qstring.h
diff --git a/qapi/qmp/dispatch.h b/qapi/qmp/dispatch.h
deleted file mode 120000
index ffedc3971d..0000000000
--- a/qapi/qmp/dispatch.h
+++ /dev/null
@@ -1 +0,0 @@
-../../include/qapi/qmp-registry.h
\ No newline at end of file
diff --git a/qapi/qmp/json-parser.h b/qapi/qmp/json-parser.h
deleted file mode 120000
index 059cb73fa8..0000000000
--- a/qapi/qmp/json-parser.h
+++ /dev/null
@@ -1 +0,0 @@
-../../include/qobject/json-parser.h
\ No newline at end of file
diff --git a/qapi/qmp/json-writer.h b/qapi/qmp/json-writer.h
deleted file mode 120000
index 3e952f4c97..0000000000
--- a/qapi/qmp/json-writer.h
+++ /dev/null
@@ -1 +0,0 @@
-../../include/qobject/json-writer.h
\ No newline at end of file
diff --git a/qapi/qmp/qbool.h b/qapi/qmp/qbool.h
deleted file mode 120000
index 443c881cf8..0000000000
--- a/qapi/qmp/qbool.h
+++ /dev/null
@@ -1 +0,0 @@
-../../include/qobject/qbool.h
\ No newline at end of file
diff --git a/qapi/qmp/qdict.h b/qapi/qmp/qdict.h
deleted file mode 120000
index 8183614eae..0000000000
--- a/qapi/qmp/qdict.h
+++ /dev/null
@@ -1 +0,0 @@
-../../include/qobject/qdict.h
\ No newline at end of file
diff --git a/qapi/qmp/qerror.h b/qapi/qmp/qerror.h
deleted file mode 120000
index cf210737a3..0000000000
--- a/qapi/qmp/qerror.h
+++ /dev/null
@@ -1 +0,0 @@
-../../include/qobject/qerror.h
\ No newline at end of file
diff --git a/qapi/qmp/qjson.h b/qapi/qmp/qjson.h
deleted file mode 120000
index 85b48c5bfd..0000000000
--- a/qapi/qmp/qjson.h
+++ /dev/null
@@ -1 +0,0 @@
-../../include/qobject/qjson.h
\ No newline at end of file
diff --git a/qapi/qmp/qlist.h b/qapi/qmp/qlist.h
deleted file mode 120000
index d40db0a12b..0000000000
--- a/qapi/qmp/qlist.h
+++ /dev/null
@@ -1 +0,0 @@
-../../include/qobject/qlist.h
\ No newline at end of file
diff --git a/qapi/qmp/qlit.h b/qapi/qmp/qlit.h
deleted file mode 120000
index 5dd5ac8ccb..0000000000
--- a/qapi/qmp/qlit.h
+++ /dev/null
@@ -1 +0,0 @@
-../../include/qobject/qlit.h
\ No newline at end of file
diff --git a/qapi/qmp/qnull.h b/qapi/qmp/qnull.h
deleted file mode 120000
index 944769d44b..0000000000
--- a/qapi/qmp/qnull.h
+++ /dev/null
@@ -1 +0,0 @@
-../../include/qobject/qnull.h
\ No newline at end of file
diff --git a/qapi/qmp/qnum.h b/qapi/qmp/qnum.h
deleted file mode 120000
index 8038e2f4d6..0000000000
--- a/qapi/qmp/qnum.h
+++ /dev/null
@@ -1 +0,0 @@
-../../include/qobject/qnum.h
\ No newline at end of file
diff --git a/qapi/qmp/qobject.h b/qapi/qmp/qobject.h
deleted file mode 120000
index 89d9118cfd..0000000000
--- a/qapi/qmp/qobject.h
+++ /dev/null
@@ -1 +0,0 @@
-../../include/qobject/qobject.h
\ No newline at end of file
diff --git a/qapi/qmp/qstring.h b/qapi/qmp/qstring.h
deleted file mode 120000
index 24f48de18a..0000000000
--- a/qapi/qmp/qstring.h
+++ /dev/null
@@ -1 +0,0 @@
-../../include/qobject/qstring.h
\ No newline at end of file
--
2.43.0
^ permalink raw reply related [flat|nested] 37+ messages in thread
* Re: [PATCH 01/29] include: move include/qapi/qmp/ to include/qobject/
2024-01-08 18:23 ` [PATCH 01/29] " Daniel P. Berrangé
@ 2024-01-08 18:46 ` Daniel P. Berrangé
2024-01-16 3:34 ` Zhao Liu
2024-04-25 9:34 ` Markus Armbruster
0 siblings, 2 replies; 37+ messages in thread
From: Daniel P. Berrangé @ 2024-01-08 18:46 UTC (permalink / raw)
To: qemu-devel; +Cc: Markus Armbruster, Michael Roth
On Mon, Jan 08, 2024 at 06:23:37PM +0000, Daniel P. Berrangé wrote:
> The general expectation is that header files should follow the same
> file/path naming scheme as the corresponding source file. There are
> various historical exceptions to this practice in QEMU, with one of
> the most notable being the include/qapi/qmp/ directory. Most of the
> headers there correspond to source files in qobject/.
>
> This patch corrects that inconsistency by creating include/qobject/.
> The only outlier is include/qapi/qmp/dispatch.h which gets renamed
> to include/qapi/qmp-registry.h.
>
> To allow the code to continue to build, symlinks are temporarily
> added in $QEMU/qapi/qmp/ to point to the new location. They will
> be removed in a later commit.
>
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
> MAINTAINERS | 5 +----
> include/qapi/{qmp/dispatch.h => qmp-registry.h} | 0
> include/{qapi/qmp => qobject}/json-parser.h | 0
> include/{qapi/qmp => qobject}/json-writer.h | 0
> include/{qapi/qmp => qobject}/qbool.h | 0
> include/{qapi/qmp => qobject}/qdict.h | 0
> include/{qapi/qmp => qobject}/qerror.h | 0
Of course just after sending this I decided that moving qerror.h
to qobject/ is probably not optimal. It only contains a set of
(deprecated) error message strings. Perhaps it could just move
from qapi/qmp/qerror.h to just qapi/qerror.h ? Other suggestions ?
> include/{qapi/qmp => qobject}/qjson.h | 0
> include/{qapi/qmp => qobject}/qlist.h | 0
> include/{qapi/qmp => qobject}/qlit.h | 0
> include/{qapi/qmp => qobject}/qnull.h | 0
> include/{qapi/qmp => qobject}/qnum.h | 0
> include/{qapi/qmp => qobject}/qobject.h | 0
> include/{qapi/qmp => qobject}/qstring.h | 0
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 :|
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PATCH 01/29] include: move include/qapi/qmp/ to include/qobject/
2024-01-08 18:46 ` Daniel P. Berrangé
@ 2024-01-16 3:34 ` Zhao Liu
2024-04-25 9:34 ` Markus Armbruster
1 sibling, 0 replies; 37+ messages in thread
From: Zhao Liu @ 2024-01-16 3:34 UTC (permalink / raw)
To: Daniel P. Berrangé; +Cc: qemu-devel, Markus Armbruster, Michael Roth
On Mon, Jan 08, 2024 at 06:46:38PM +0000, Daniel P. Berrangé wrote:
> Date: Mon, 8 Jan 2024 18:46:38 +0000
> From: "Daniel P. Berrangé" <berrange@redhat.com>
> Subject: Re: [PATCH 01/29] include: move include/qapi/qmp/ to
> include/qobject/
>
> On Mon, Jan 08, 2024 at 06:23:37PM +0000, Daniel P. Berrangé wrote:
> > The general expectation is that header files should follow the same
> > file/path naming scheme as the corresponding source file. There are
> > various historical exceptions to this practice in QEMU, with one of
> > the most notable being the include/qapi/qmp/ directory. Most of the
> > headers there correspond to source files in qobject/.
> >
> > This patch corrects that inconsistency by creating include/qobject/.
> > The only outlier is include/qapi/qmp/dispatch.h which gets renamed
> > to include/qapi/qmp-registry.h.
> >
> > To allow the code to continue to build, symlinks are temporarily
> > added in $QEMU/qapi/qmp/ to point to the new location. They will
> > be removed in a later commit.
> >
> > Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> > ---
> > MAINTAINERS | 5 +----
> > include/qapi/{qmp/dispatch.h => qmp-registry.h} | 0
> > include/{qapi/qmp => qobject}/json-parser.h | 0
> > include/{qapi/qmp => qobject}/json-writer.h | 0
> > include/{qapi/qmp => qobject}/qbool.h | 0
> > include/{qapi/qmp => qobject}/qdict.h | 0
> > include/{qapi/qmp => qobject}/qerror.h | 0
>
> Of course just after sending this I decided that moving qerror.h
> to qobject/ is probably not optimal. It only contains a set of
> (deprecated) error message strings. Perhaps it could just move
> from qapi/qmp/qerror.h to just qapi/qerror.h ? Other suggestions ?
From the naming style ("q" + module name) and the content comments
(descripted as a module), qerror.h (as an error module starting with
q) seems to be more neatly put together with other qmodules such as
qbool.h, qdirct.h, qlist.h, etc.
There is already an error.h under the include/qapi, which is supposed
to be the developer's first choice, and it seems a bit confusing to
have qerror.h in the same directory as error.h (even though it states
that qerror.h will be deprecated)?
Regards,
Zhao
>
> > include/{qapi/qmp => qobject}/qjson.h | 0
> > include/{qapi/qmp => qobject}/qlist.h | 0
> > include/{qapi/qmp => qobject}/qlit.h | 0
> > include/{qapi/qmp => qobject}/qnull.h | 0
> > include/{qapi/qmp => qobject}/qnum.h | 0
> > include/{qapi/qmp => qobject}/qobject.h | 0
> > include/{qapi/qmp => qobject}/qstring.h | 0
>
> 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 :|
>
>
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PATCH 00/29] include: move include/qapi/qmp/ to include/qobject/
2024-01-08 18:23 [PATCH 00/29] include: move include/qapi/qmp/ to include/qobject/ Daniel P. Berrangé
` (28 preceding siblings ...)
2024-01-08 18:24 ` [PATCH 29/29] qapi: remove header file compatibility symlinks Daniel P. Berrangé
@ 2024-03-19 15:50 ` Daniel P. Berrangé
2024-04-25 9:36 ` Markus Armbruster
29 siblings, 1 reply; 37+ messages in thread
From: Daniel P. Berrangé @ 2024-03-19 15:50 UTC (permalink / raw)
To: qemu-devel; +Cc: Markus Armbruster, Michael Roth
Ping
I don't want to spend time rebasing without opinions on whether
this is a desirable kind of cleanup to make.
(obviously this is /not/ for 9.0)
On Mon, Jan 08, 2024 at 06:23:36PM +0000, Daniel P. Berrangé wrote:
> To repeat the 1st patch commit message...
>
> The general expectation is that header files should follow the same
> file/path naming scheme as the corresponding source file. There are
> various historical exceptions to this practice in QEMU, with one of
> the most notable being the include/qapi/qmp/ directory. Most of the
> headers there correspond to source files in qobject/.
>
> This patch corrects that inconsistency by creating include/qobject/.
> The only outlier is include/qapi/qmp/dispatch.h which gets renamed
> to include/qapi/qmp-registry.h.
>
> To allow the code to continue to build, symlinks are temporarily
> added in $QEMU/qapi/qmp/ to point to the new location. This allows
> git to show a simple 'rename' diff in the 1st patch, which isn't
> possible if we put the symlinks straight in $QEMU/include/qapi/qmp/.
> The 27 patches that follow are mechanical updates to each top level
> sub-directory. The final patch removes the temporary compat symlinks.
>
> Since this touches pretty much every subsystem, get_maintainer.pl
> wanted to CC everyone in the world. I've trimmed to only the QAPI
> and QObject maintainers.
>
> This could invalidate (and/or be invalidated by) a bunch of pending
> patch series if they have any #include "qapi/qmp/...", so would be
> best to merge in one go, quickly :-)
>
> Daniel P. Berrangé (29):
> include: move include/qapi/qmp/ to include/qobject/
> audio: adapt to new import path for qobject data type headers
> authz: adapt to new import path for qobject data type headers
> block: adapt to new import path for qobject data type headers
> backends: adapt to new import path for qobject data type headers
> chardev: adapt to new import path for qobject data type headers
> docs: adapt to new import path for qobject data type headers
> dump: adapt to new import path for qobject data type headers
> hw: adapt to new import path for qobject data type headers
> include: adapt to new import path for qobject data type headers
> migration: adapt to new import path for qobject data type headers
> monitor: adapt to new import path for qobject data type headers
> net: adapt to new import path for qobject data type headers
> qapi: adapt to new import path for qobject data type headers
> qga: adapt to new import path for qobject data type headers
> qobject: adapt to new import path for qobject data type headers
> qom: adapt to new import path for qobject data type headers
> replay: adapt to new import path for qobject data type headers
> scripts: adapt to new import path for qobject data type headers
> scsi: adapt to new import path for qobject data type headers
> stats: adapt to new import path for qobject data type headers
> stubs: adapt to new import path for qobject data type headers
> system: adapt to new import path for qobject data type headers
> target: adapt to new import path for qobject data type headers
> tests: adapt to new import path for qobject data type headers
> trace: adapt to new import path for qobject data type headers
> ui: adapt to new import path for qobject data type headers
> util: adapt to new import path for qobject data type headers
> qapi: remove header file compatibility symlinks
>
> MAINTAINERS | 5 +----
> audio/audio-hmp-cmds.c | 2 +-
> audio/audio.c | 2 +-
> authz/listfile.c | 4 ++--
> backends/cryptodev-hmp-cmds.c | 2 +-
> backends/cryptodev-vhost-user.c | 2 +-
> backends/dbus-vmstate.c | 2 +-
> backends/iommufd.c | 2 +-
> backends/rng-egd.c | 2 +-
> backends/rng-random.c | 2 +-
> block.c | 8 ++++----
> block/blkdebug.c | 6 +++---
> block/blkio.c | 2 +-
> block/blklogwrites.c | 4 ++--
> block/blkverify.c | 4 ++--
> block/copy-before-write.c | 2 +-
> block/copy-on-read.c | 2 +-
> block/curl.c | 4 ++--
> block/file-posix.c | 4 ++--
> block/file-win32.c | 4 ++--
> block/gluster.c | 4 ++--
> block/iscsi.c | 4 ++--
> block/monitor/block-hmp-cmds.c | 4 ++--
> block/nbd.c | 2 +-
> block/nfs.c | 4 ++--
> block/null.c | 4 ++--
> block/nvme.c | 4 ++--
> block/parallels.c | 2 +-
> block/qapi-sysemu.c | 2 +-
> block/qapi.c | 10 +++++-----
> block/qcow.c | 4 ++--
> block/qcow2.c | 4 ++--
> block/qed.c | 2 +-
> block/quorum.c | 8 ++++----
> block/rbd.c | 8 ++++----
> block/replication.c | 2 +-
> block/snapshot.c | 6 +++---
> block/ssh.c | 4 ++--
> block/stream.c | 2 +-
> block/vhdx.c | 2 +-
> block/vmdk.c | 4 ++--
> block/vpc.c | 2 +-
> block/vvfat.c | 4 ++--
> blockdev.c | 10 +++++-----
> blockjob.c | 2 +-
> chardev/char-fe.c | 2 +-
> chardev/char-hmp-cmds.c | 2 +-
> chardev/char.c | 2 +-
> docs/devel/qapi-code-gen.rst | 4 ++--
> dump/dump-hmp-cmds.c | 2 +-
> dump/dump.c | 2 +-
> dump/win_dump.c | 2 +-
> hw/arm/mps2-tz.c | 2 +-
> hw/arm/mps2.c | 2 +-
> hw/arm/sbsa-ref.c | 2 +-
> hw/arm/stellaris.c | 2 +-
> hw/arm/vexpress.c | 2 +-
> hw/arm/virt.c | 2 +-
> hw/arm/xlnx-versal.c | 2 +-
> hw/block/xen-block.c | 4 ++--
> hw/core/machine-hmp-cmds.c | 2 +-
> hw/core/machine-qmp-cmds.c | 2 +-
> hw/core/qdev-properties-system.c | 2 +-
> hw/core/qdev-properties.c | 4 ++--
> hw/core/qdev.c | 4 ++--
> hw/hyperv/hv-balloon.c | 2 +-
> hw/i386/acpi-build.c | 2 +-
> hw/i386/kvm/xen_evtchn.c | 2 +-
> hw/i386/pc.c | 2 +-
> hw/intc/openpic.c | 2 +-
> hw/net/rocker/rocker-hmp-cmds.c | 2 +-
> hw/net/virtio-net.c | 2 +-
> hw/net/xen_nic.c | 2 +-
> hw/pci/pci-hmp-cmds.c | 2 +-
> hw/ppc/pegasos2.c | 2 +-
> hw/ppc/spapr_drc.c | 2 +-
> hw/ppc/spapr_pci.c | 2 +-
> hw/rx/rx62n.c | 2 +-
> hw/s390x/s390-skeys.c | 2 +-
> hw/s390x/s390-stattrib.c | 2 +-
> hw/usb/redirect.c | 2 +-
> hw/usb/xen-usb.c | 4 ++--
> hw/vfio/pci.c | 2 +-
> hw/virtio/virtio-hmp-cmds.c | 2 +-
> hw/virtio/virtio-qmp.c | 4 ++--
> hw/xen/xen-bus.c | 2 +-
> include/block/qdict.h | 2 +-
> include/qapi/{qmp/dispatch.h => qmp-registry.h} | 0
> include/{qapi/qmp => qobject}/json-parser.h | 0
> include/{qapi/qmp => qobject}/json-writer.h | 0
> include/{qapi/qmp => qobject}/qbool.h | 2 +-
> include/{qapi/qmp => qobject}/qdict.h | 2 +-
> include/{qapi/qmp => qobject}/qerror.h | 0
> include/{qapi/qmp => qobject}/qjson.h | 0
> include/{qapi/qmp => qobject}/qlist.h | 2 +-
> include/{qapi/qmp => qobject}/qlit.h | 0
> include/{qapi/qmp => qobject}/qnull.h | 2 +-
> include/{qapi/qmp => qobject}/qnum.h | 2 +-
> include/{qapi/qmp => qobject}/qobject.h | 2 +-
> include/{qapi/qmp => qobject}/qstring.h | 2 +-
> migration/dirtyrate.c | 2 +-
> migration/migration-hmp-cmds.c | 2 +-
> migration/migration.c | 4 ++--
> migration/migration.h | 2 +-
> migration/options.c | 4 ++--
> migration/page_cache.c | 2 +-
> migration/ram.c | 2 +-
> migration/savevm.c | 2 +-
> migration/vmstate.c | 2 +-
> monitor/fds.c | 2 +-
> monitor/hmp-cmds-target.c | 2 +-
> monitor/hmp-cmds.c | 2 +-
> monitor/hmp.c | 4 ++--
> monitor/monitor-internal.h | 4 ++--
> monitor/monitor.c | 2 +-
> monitor/qmp-cmds.c | 2 +-
> monitor/qmp.c | 6 +++---
> net/filter-buffer.c | 2 +-
> net/filter.c | 2 +-
> net/net-hmp-cmds.c | 2 +-
> net/net.c | 4 ++--
> net/slirp.c | 2 +-
> qapi/opts-visitor.c | 2 +-
> qapi/qapi-clone-visitor.c | 2 +-
> qapi/qapi-dealloc-visitor.c | 2 +-
> qapi/qapi-forward-visitor.c | 16 ++++++++--------
> qapi/qapi-util.c | 2 +-
> qapi/qapi-visit-core.c | 2 +-
> qapi/qmp-dispatch.c | 8 ++++----
> qapi/qmp-event.c | 6 +++---
> qapi/qmp-registry.c | 2 +-
> qapi/qobject-input-visitor.c | 16 ++++++++--------
> qapi/qobject-output-visitor.c | 12 ++++++------
> qapi/string-input-visitor.c | 4 ++--
> qemu-img.c | 4 ++--
> qemu-io-cmds.c | 2 +-
> qemu-io.c | 4 ++--
> qemu-nbd.c | 4 ++--
> qga/commands-bsd.c | 2 +-
> qga/commands-posix.c | 2 +-
> qga/commands-win32.c | 2 +-
> qga/commands.c | 2 +-
> qga/guest-agent-core.h | 2 +-
> qga/main.c | 6 +++---
> qobject/block-qdict.c | 8 ++++----
> qobject/json-parser-int.h | 2 +-
> qobject/json-parser.c | 12 ++++++------
> qobject/json-writer.c | 2 +-
> qobject/qbool.c | 2 +-
> qobject/qdict.c | 10 +++++-----
> qobject/qjson.c | 16 ++++++++--------
> qobject/qlist.c | 10 +++++-----
> qobject/qlit.c | 14 +++++++-------
> qobject/qnull.c | 2 +-
> qobject/qnum.c | 2 +-
> qobject/qobject-internal.h | 2 +-
> qobject/qobject.c | 12 ++++++------
> qobject/qstring.c | 2 +-
> qom/object.c | 12 ++++++------
> qom/object_interfaces.c | 8 ++++----
> qom/qom-hmp-cmds.c | 4 ++--
> qom/qom-qmp-cmds.c | 4 ++--
> replay/replay-debugging.c | 2 +-
> replay/replay-snapshot.c | 2 +-
> scripts/qapi/commands.py | 6 +++---
> scripts/qapi/events.py | 2 +-
> scripts/qapi/introspect.py | 2 +-
> scripts/qapi/visit.py | 2 +-
> scsi/qemu-pr-helper.c | 2 +-
> stats/stats-hmp-cmds.c | 2 +-
> storage-daemon/qemu-storage-daemon.c | 4 ++--
> stubs/qmp-command-available.c | 2 +-
> stubs/qmp-quit.c | 2 +-
> system/balloon.c | 2 +-
> system/cpus.c | 2 +-
> system/device_tree.c | 2 +-
> system/dirtylimit.c | 2 +-
> system/qdev-monitor.c | 8 ++++----
> system/rtc.c | 2 +-
> system/runstate-hmp-cmds.c | 2 +-
> system/tpm.c | 2 +-
> system/vl.c | 8 ++++----
> target/arm/arm-qmp-cmds.c | 4 ++--
> target/i386/cpu-sysemu.c | 2 +-
> target/i386/cpu.c | 2 +-
> target/i386/monitor.c | 2 +-
> target/loongarch/loongarch-qmp-cmds.c | 4 ++--
> target/ppc/cpu_init.c | 2 +-
> target/riscv/riscv-qmp-cmds.c | 4 ++--
> target/s390x/cpu_models_sysemu.c | 4 ++--
> tests/qtest/adm1266-test.c | 4 ++--
> tests/qtest/adm1272-test.c | 4 ++--
> tests/qtest/ahci-test.c | 2 +-
> tests/qtest/arm-cpu-features.c | 4 ++--
> tests/qtest/aspeed_gpio-test.c | 2 +-
> tests/qtest/boot-order-test.c | 2 +-
> tests/qtest/cdrom-test.c | 2 +-
> tests/qtest/cpu-plug-test.c | 4 ++--
> tests/qtest/device-introspect-test.c | 6 +++---
> tests/qtest/device-plug-test.c | 4 ++--
> tests/qtest/drive_del-test.c | 4 ++--
> tests/qtest/emc141x-test.c | 2 +-
> tests/qtest/fdc-test.c | 2 +-
> tests/qtest/hd-geo-test.c | 2 +-
> tests/qtest/ide-test.c | 2 +-
> tests/qtest/isl_pmbus_vr-test.c | 4 ++--
> tests/qtest/libqmp.c | 4 ++--
> tests/qtest/libqmp.h | 2 +-
> tests/qtest/libqos/generic-pcihost.c | 2 +-
> tests/qtest/libqos/libqos.c | 2 +-
> tests/qtest/libqos/pci-pc.c | 2 +-
> tests/qtest/libqos/qos_external.c | 8 ++++----
> tests/qtest/libqtest.c | 8 ++++----
> tests/qtest/libqtest.h | 4 ++--
> tests/qtest/lsm303dlhc-mag-test.c | 2 +-
> tests/qtest/machine-none-test.c | 2 +-
> tests/qtest/max34451-test.c | 4 ++--
> tests/qtest/migration-helpers.c | 2 +-
> tests/qtest/migration-test.c | 4 ++--
> tests/qtest/netdev-socket.c | 2 +-
> tests/qtest/npcm7xx_adc-test.c | 2 +-
> tests/qtest/npcm7xx_emc-test.c | 4 ++--
> tests/qtest/npcm7xx_pwm-test.c | 4 ++--
> tests/qtest/npcm7xx_watchdog_timer-test.c | 2 +-
> tests/qtest/numa-test.c | 4 ++--
> tests/qtest/pvpanic-pci-test.c | 2 +-
> tests/qtest/pvpanic-test.c | 2 +-
> tests/qtest/q35-test.c | 2 +-
> tests/qtest/qmp-cmd-test.c | 2 +-
> tests/qtest/qmp-test.c | 6 +++---
> tests/qtest/qom-test.c | 4 ++--
> tests/qtest/qos-test.c | 2 +-
> tests/qtest/readconfig-test.c | 6 +++---
> tests/qtest/tco-test.c | 2 +-
> tests/qtest/test-filter-mirror.c | 2 +-
> tests/qtest/test-filter-redirector.c | 2 +-
> tests/qtest/test-netfilter.c | 2 +-
> tests/qtest/test-x86-cpuid-compat.c | 8 ++++----
> tests/qtest/tmp105-test.c | 2 +-
> tests/qtest/tpm-emu.c | 4 ++--
> tests/qtest/tpm-util.c | 2 +-
> tests/qtest/vhost-user-test.c | 2 +-
> tests/qtest/virtio-net-failover.c | 6 +++---
> tests/qtest/virtio-net-test.c | 2 +-
> tests/qtest/vmgenid-test.c | 2 +-
> tests/qtest/wdt_ib700-test.c | 2 +-
> tests/unit/check-block-qdict.c | 4 ++--
> tests/unit/check-qdict.c | 6 +++---
> tests/unit/check-qjson.c | 12 ++++++------
> tests/unit/check-qlist.c | 4 ++--
> tests/unit/check-qlit.c | 12 ++++++------
> tests/unit/check-qnull.c | 2 +-
> tests/unit/check-qnum.c | 2 +-
> tests/unit/check-qobject.c | 12 ++++++------
> tests/unit/check-qom-proplist.c | 4 ++--
> tests/unit/check-qstring.c | 2 +-
> tests/unit/test-block-iothread.c | 2 +-
> tests/unit/test-blockjob-txn.c | 2 +-
> tests/unit/test-blockjob.c | 2 +-
> tests/unit/test-char.c | 2 +-
> tests/unit/test-forward-visitor.c | 4 ++--
> tests/unit/test-image-locking.c | 2 +-
> tests/unit/test-keyval.c | 6 +++---
> tests/unit/test-qemu-opts.c | 4 ++--
> tests/unit/test-qga.c | 4 ++--
> tests/unit/test-qmp-cmds.c | 8 ++++----
> tests/unit/test-qmp-event.c | 10 +++++-----
> tests/unit/test-qobject-input-visitor.c | 12 ++++++------
> tests/unit/test-qobject-output-visitor.c | 12 ++++++------
> tests/unit/test-replication.c | 2 +-
> tests/unit/test-visitor-serialization.c | 4 ++--
> trace/trace-hmp-cmds.c | 2 +-
> ui/input-barrier.c | 2 +-
> ui/ui-hmp-cmds.c | 2 +-
> ui/ui-qmp-cmds.c | 2 +-
> util/block-helpers.c | 2 +-
> util/keyval.c | 6 +++---
> util/qemu-config.c | 4 ++--
> util/qemu-option.c | 10 +++++-----
> 279 files changed, 494 insertions(+), 497 deletions(-)
> rename include/qapi/{qmp/dispatch.h => qmp-registry.h} (100%)
> rename include/{qapi/qmp => qobject}/json-parser.h (100%)
> rename include/{qapi/qmp => qobject}/json-writer.h (100%)
> rename include/{qapi/qmp => qobject}/qbool.h (94%)
> rename include/{qapi/qmp => qobject}/qdict.h (98%)
> rename include/{qapi/qmp => qobject}/qerror.h (100%)
> rename include/{qapi/qmp => qobject}/qjson.h (100%)
> rename include/{qapi/qmp => qobject}/qlist.h (98%)
> rename include/{qapi/qmp => qobject}/qlit.h (100%)
> rename include/{qapi/qmp => qobject}/qnull.h (94%)
> rename include/{qapi/qmp => qobject}/qnum.h (98%)
> rename include/{qapi/qmp => qobject}/qobject.h (98%)
> rename include/{qapi/qmp => qobject}/qstring.h (96%)
>
> --
> 2.43.0
>
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 :|
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PATCH 01/29] include: move include/qapi/qmp/ to include/qobject/
2024-01-08 18:46 ` Daniel P. Berrangé
2024-01-16 3:34 ` Zhao Liu
@ 2024-04-25 9:34 ` Markus Armbruster
2024-04-25 9:49 ` Markus Armbruster
2024-04-25 9:59 ` Daniel P. Berrangé
1 sibling, 2 replies; 37+ messages in thread
From: Markus Armbruster @ 2024-04-25 9:34 UTC (permalink / raw)
To: Daniel P. Berrangé; +Cc: qemu-devel, Michael Roth
I just realized I dropped this on the floor. I apologize for the delay.
Daniel P. Berrangé <berrange@redhat.com> writes:
> On Mon, Jan 08, 2024 at 06:23:37PM +0000, Daniel P. Berrangé wrote:
>> The general expectation is that header files should follow the same
>> file/path naming scheme as the corresponding source file. There are
>> various historical exceptions to this practice in QEMU, with one of
>> the most notable being the include/qapi/qmp/ directory. Most of the
>> headers there correspond to source files in qobject/.
>>
>> This patch corrects that inconsistency by creating include/qobject/.
Yes, there's inconsistency, but is it worth cleaning up? Since you did
the work already, and sunk cost doesn't count, ...
>> The only outlier is include/qapi/qmp/dispatch.h which gets renamed
>> to include/qapi/qmp-registry.h.
Good, as "QMP registry" is a more accurate description than "QMP
dispatch".
>> To allow the code to continue to build, symlinks are temporarily
>> added in $QEMU/qapi/qmp/ to point to the new location. They will
>> be removed in a later commit.
Only necessary to let you split the patch updating #include directives.
The update is entirely mechanical, isn't it? I doubt splitting is worth
the trouble then.
>> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
>> ---
>> MAINTAINERS | 5 +----
>> include/qapi/{qmp/dispatch.h => qmp-registry.h} | 0
>> include/{qapi/qmp => qobject}/json-parser.h | 0
>> include/{qapi/qmp => qobject}/json-writer.h | 0
>> include/{qapi/qmp => qobject}/qbool.h | 0
>> include/{qapi/qmp => qobject}/qdict.h | 0
>> include/{qapi/qmp => qobject}/qerror.h | 0
>
> Of course just after sending this I decided that moving qerror.h
> to qobject/ is probably not optimal. It only contains a set of
> (deprecated) error message strings. Perhaps it could just move
> from qapi/qmp/qerror.h to just qapi/qerror.h ? Other suggestions ?
qapi/qerror.h works for me.
Could use the opportunity to rename it to qapi/deprecated-qerror.h.
>> include/{qapi/qmp => qobject}/qjson.h | 0
>> include/{qapi/qmp => qobject}/qlist.h | 0
>> include/{qapi/qmp => qobject}/qlit.h | 0
>> include/{qapi/qmp => qobject}/qnull.h | 0
>> include/{qapi/qmp => qobject}/qnum.h | 0
>> include/{qapi/qmp => qobject}/qobject.h | 0
>> include/{qapi/qmp => qobject}/qstring.h | 0
>
> With regards,
> Daniel
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PATCH 00/29] include: move include/qapi/qmp/ to include/qobject/
2024-03-19 15:50 ` [PATCH 00/29] include: move include/qapi/qmp/ to include/qobject/ Daniel P. Berrangé
@ 2024-04-25 9:36 ` Markus Armbruster
0 siblings, 0 replies; 37+ messages in thread
From: Markus Armbruster @ 2024-04-25 9:36 UTC (permalink / raw)
To: Daniel P. Berrangé; +Cc: qemu-devel, Michael Roth
Daniel P. Berrangé <berrange@redhat.com> writes:
> Ping
>
> I don't want to spend time rebasing without opinions on whether
> this is a desirable kind of cleanup to make.
>
> (obviously this is /not/ for 9.0)
FYI, I just rebased it. Easy enough, but let's not duplicate the work.
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PATCH 01/29] include: move include/qapi/qmp/ to include/qobject/
2024-04-25 9:34 ` Markus Armbruster
@ 2024-04-25 9:49 ` Markus Armbruster
2024-04-25 9:59 ` Daniel P. Berrangé
1 sibling, 0 replies; 37+ messages in thread
From: Markus Armbruster @ 2024-04-25 9:49 UTC (permalink / raw)
To: Markus Armbruster; +Cc: Daniel P. Berrangé, qemu-devel, Michael Roth
Markus Armbruster <armbru@redhat.com> writes:
> I just realized I dropped this on the floor. I apologize for the delay.
>
> Daniel P. Berrangé <berrange@redhat.com> writes:
>
>> On Mon, Jan 08, 2024 at 06:23:37PM +0000, Daniel P. Berrangé wrote:
>>> The general expectation is that header files should follow the same
>>> file/path naming scheme as the corresponding source file. There are
>>> various historical exceptions to this practice in QEMU, with one of
>>> the most notable being the include/qapi/qmp/ directory. Most of the
>>> headers there correspond to source files in qobject/.
>>>
>>> This patch corrects that inconsistency by creating include/qobject/.
>
> Yes, there's inconsistency, but is it worth cleaning up? Since you did
> the work already, and sunk cost doesn't count, ...
Funny:
commit 7b1b5d191385ca52e96caae2a05c64f3a63855d9
Author: Paolo Bonzini <pbonzini@redhat.com>
Date: Mon Dec 17 18:19:43 2012 +0100
qapi: move include files to include/qobject/
That's what you want! However, ...
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
[...]
qapi/qmp-core.h => include/qapi/qmp/dispatch.h | 6 +++---
json-lexer.h => include/qapi/qmp/json-lexer.h | 4 ++--
json-parser.h => include/qapi/qmp/json-parser.h | 4 ++--
json-streamer.h => include/qapi/qmp/json-streamer.h | 4 ++--
qbool.h => include/qapi/qmp/qbool.h | 2 +-
qdict.h => include/qapi/qmp/qdict.h | 4 ++--
qerror.h => include/qapi/qmp/qerror.h | 6 +++---
qfloat.h => include/qapi/qmp/qfloat.h | 2 +-
qint.h => include/qapi/qmp/qint.h | 2 +-
qjson.h => include/qapi/qmp/qjson.h | 4 ++--
qlist.h => include/qapi/qmp/qlist.h | 2 +-
qobject.h => include/qapi/qmp/qobject.h | 0
qstring.h => include/qapi/qmp/qstring.h | 2 +-
qemu-objects.h => include/qapi/qmp/types.h | 16 ++++++++--------
[...]
... it's not what the patch does %-}
[...]
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PATCH 01/29] include: move include/qapi/qmp/ to include/qobject/
2024-04-25 9:34 ` Markus Armbruster
2024-04-25 9:49 ` Markus Armbruster
@ 2024-04-25 9:59 ` Daniel P. Berrangé
1 sibling, 0 replies; 37+ messages in thread
From: Daniel P. Berrangé @ 2024-04-25 9:59 UTC (permalink / raw)
To: Markus Armbruster; +Cc: qemu-devel, Michael Roth
On Thu, Apr 25, 2024 at 11:34:46AM +0200, Markus Armbruster wrote:
> I just realized I dropped this on the floor. I apologize for the delay.
>
> Daniel P. Berrangé <berrange@redhat.com> writes:
>
> > On Mon, Jan 08, 2024 at 06:23:37PM +0000, Daniel P. Berrangé wrote:
> >> The general expectation is that header files should follow the same
> >> file/path naming scheme as the corresponding source file. There are
> >> various historical exceptions to this practice in QEMU, with one of
> >> the most notable being the include/qapi/qmp/ directory. Most of the
> >> headers there correspond to source files in qobject/.
> >>
> >> This patch corrects that inconsistency by creating include/qobject/.
>
> Yes, there's inconsistency, but is it worth cleaning up? Since you did
> the work already, and sunk cost doesn't count, ...
The motivation is my own inability to remaember that the qboject/*.c
header files are in include/qapi/qmp/. I only need to find them
every 6-12 months or so, and thus I've always forgotten their wierd
location by that point !
> >> To allow the code to continue to build, symlinks are temporarily
> >> added in $QEMU/qapi/qmp/ to point to the new location. They will
> >> be removed in a later commit.
>
> Only necessary to let you split the patch updating #include directives.
> The update is entirely mechanical, isn't it? I doubt splitting is worth
> the trouble then.
Yes, it was to allow succesfully building at each patch.
Changes were basically a sed/perl command IIRC.
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 :|
^ permalink raw reply [flat|nested] 37+ messages in thread
end of thread, other threads:[~2024-04-25 10:00 UTC | newest]
Thread overview: 37+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-08 18:23 [PATCH 00/29] include: move include/qapi/qmp/ to include/qobject/ Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 01/29] " Daniel P. Berrangé
2024-01-08 18:46 ` Daniel P. Berrangé
2024-01-16 3:34 ` Zhao Liu
2024-04-25 9:34 ` Markus Armbruster
2024-04-25 9:49 ` Markus Armbruster
2024-04-25 9:59 ` Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 02/29] audio: adapt to new import path for qobject data type headers Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 03/29] authz: " Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 04/29] block: " Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 05/29] backends: " Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 06/29] chardev: " Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 07/29] docs: " Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 08/29] dump: " Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 09/29] hw: " Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 10/29] include: " Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 11/29] migration: " Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 12/29] monitor: " Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 13/29] net: " Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 14/29] qapi: " Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 15/29] qga: " Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 16/29] qobject: " Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 17/29] qom: " Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 18/29] replay: " Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 19/29] scripts: " Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 20/29] scsi: " Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 21/29] stats: " Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 22/29] stubs: " Daniel P. Berrangé
2024-01-08 18:23 ` [PATCH 23/29] system: " Daniel P. Berrangé
2024-01-08 18:24 ` [PATCH 24/29] target: " Daniel P. Berrangé
2024-01-08 18:24 ` [PATCH 25/29] tests: " Daniel P. Berrangé
2024-01-08 18:24 ` [PATCH 26/29] trace: " Daniel P. Berrangé
2024-01-08 18:24 ` [PATCH 27/29] ui: " Daniel P. Berrangé
2024-01-08 18:24 ` [PATCH 28/29] util: " Daniel P. Berrangé
2024-01-08 18:24 ` [PATCH 29/29] qapi: remove header file compatibility symlinks Daniel P. Berrangé
2024-03-19 15:50 ` [PATCH 00/29] include: move include/qapi/qmp/ to include/qobject/ Daniel P. Berrangé
2024-04-25 9:36 ` Markus Armbruster
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).