[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 00/29] include: move include/qapi/qmp/ to include/qobject/
|
From: |
Daniel P . Berrangé |
|
Subject: |
Re: [PATCH 00/29] include: move include/qapi/qmp/ to include/qobject/ |
|
Date: |
Tue, 19 Mar 2024 15:50:37 +0000 |
|
User-agent: |
Mutt/2.2.12 (2023-09-09) |
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 :|
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- Re: [PATCH 00/29] include: move include/qapi/qmp/ to include/qobject/,
Daniel P . Berrangé <=