Clean up includes to reduce compile time
Subsystems (8)
v2 cover Clean up includes to reduce compile time
We have awfully many "touch it, recompile the world" headers. Right now, I count about fifty that are prerequisites of more than half the objects in my "build everything" tree.
Some of them are that way by necessity. Many of them are not. This series takes care of six I happen to touch, because serve as their maintainer:
include/qapi/qmp/qdict.h
include/qapi/qmp/qlist.h
include/qapi/qmp/qnull.h
include/qapi/qmp/qnum.h
include/qapi/qmp/qobject.h
include/qemu/option.h
Before this series, touching any of these recompiles more than 95% of my objects. That's more than 4500 compiler runs. After this series, only 0.3% - 8% of my objects get recompiled.
v2:
* PATCH 01: New [BALATON Zoltan]
* PATCH 02: Clean up a few more (hw/ide/sii3112.c target/i386/hax-all.c target/i386/hvf/ target/xtensa/); R-bys dropped
* PATCH 02,04,10: Commit message improved [Eric]
* PATCH 04: Unbreak include/ui/console.h for !CONFIG_VNC, and target/s390x/kvm.c [Patchew]
* PATCH 04,11,12,19: Additional whitespace cleanup
* PATCH 04,09,11,12,19: Commit message numbers updated
Markus Armbruster (19):
Use #include "..." for our own headers, <...> for others Clean up includes
Drop superfluous includes of qapi-types.h and test-qapi-types.h Include qapi/error.h exactly where needed
Drop superfluous includes of qapi/qmp/qerror.h Include qmp-commands.h exactly where needed
Typedef the subtypes of QObject in qemu/typedefs.h, too Eliminate qapi/qmp/types.h
qdict qlist: Make most helper macros functions Include qapi/qmp/qobject.h exactly where needed Include qapi/qmp/qlist.h exactly where needed
Include qapi/qmp/qdict.h exactly where needed
Include qapi/qmp/qstring.h exactly where needed Include qapi/qmp/qbool.h exactly where needed
Include qapi/qmp/qnum.h exactly where needed
Include qapi/qmp/qnull.h exactly where needed
Drop superfluous includes of qapi/qmp/dispatch.h
Drop superfluous includes of qapi/qmp/qjson.h
Move include qemu/option.h from qemu-common.h to actual users
accel/accel.c | 2 +- audio/wavcapture.c | 1 + backends/cryptodev.c | 1 - backends/hostmem.c | 1 - backends/tpm.c | 1 - balloon.c | 2 +- block.c | 6 ++++-- block/blkdebug.c | 2 +- block/blkverify.c | 1 + block/block-backend.c | 2 ++ block/crypto.c | 2 ++ block/curl.c | 5 +++-- block/file-posix.c | 2 ++ block/file-win32.c | 3 +++ block/gluster.c | 3 +++ block/iscsi-opts.c | 1 + block/iscsi.c | 3 ++- block/nbd.c | 2 +- block/nfs.c | 2 +- block/null.c | 1 + block/parallels.c | 3 ++- block/parallels.h | 1 - block/qapi.c | 6 +++++- block/qcow.c | 5 +++-- block/qcow2-cluster.c | 1 - block/qcow2.c | 6 ++++-- block/qed.c | 2 +- block/quorum.c | 4 ++-- block/rbd.c | 3 +++ block/replication.c | 2 +- block/sheepdog.c | 1 + block/snapshot.c | 2 ++ block/ssh.c | 2 ++ block/throttle.c | 1 + block/vdi.c | 1 + block/vhdx.c | 2 +- block/vmdk.c | 1 + block/vpc.c | 3 ++- block/vvfat.c | 4 +++- block/write-threshold.c | 1 + blockdev-nbd.c | 2 +- blockdev.c | 5 ++++- blockjob.c | 3 +-- chardev/char-file.c | 3 ++- chardev/char-mux.c | 3 ++- chardev/char-parallel.c | 2 ++ chardev/char-pipe.c | 2 ++ chardev/char-ringbuf.c | 3 +++ chardev/char-serial.c | 2 ++ chardev/char-socket.c | 2 ++ chardev/char-stdio.c | 3 ++- chardev/char-udp.c | 2 ++ chardev/char.c | 3 +++ chardev/spice.c | 2 ++ contrib/ivshmem-server/main.c | 2 +- contrib/vhost-user-scsi/vhost-user-scsi.c | 4 ++-- cpus.c | 4 ++-- crypto/hash.c | 1 - crypto/hmac.c | 1 - crypto/ivgen-essiv.c | 1 - crypto/ivgen-plain.c | 1 - crypto/ivgen-plain64.c | 1 - crypto/random-gnutls.c | 1 + crypto/random-platform.c | 1 + device-hotplug.c | 2 ++ device_tree.c | 2 +- docs/devel/qapi-code-gen.txt | 2 -- dump.c | 1 + fsdev/qemu-fsdev-throttle.c | 1 + fsdev/qemu-fsdev-throttle.h | 1 - fsdev/qemu-fsdev.c | 5 +++-- fsdev/qemu-fsdev.h | 1 - hmp.c | 1 + hmp.h | 2 -- hw/9pfs/9p-handle.c | 1 + hw/9pfs/9p-local.c | 3 ++- hw/9pfs/9p-proxy.c | 3 +++ hw/9pfs/xen-9p-backend.c | 1 + hw/acpi/acpi-stub.c | 2 +- hw/acpi/core.c | 3 +++ hw/acpi/memory_hotplug.c | 1 + hw/acpi/vmgenid.c | 1 + hw/adc/stm32f2xx_adc.c | 1 - hw/arm/boot.c | 1 + hw/block/vhost-user-blk.c | 1 - hw/char/mcf_uart.c | 1 - hw/char/virtio-console.c | 1 + hw/core/qdev.c | 3 ++- hw/display/milkymist-tmu2.c | 1 + hw/display/qxl.c | 1 + hw/display/virtio-gpu-3d.c | 1 - hw/display/xlnx_dp.c | 1 + hw/i2c/ppc4xx_i2c.c | 1 - hw/i386/acpi-build.c | 1 + hw/i386/multiboot.c | 2 +- hw/i386/pc.c | 3 +++ hw/i386/pc_piix.c | 1 + hw/i386/pc_q35.c | 2 ++ hw/i386/pc_sysfw.c | 1 + hw/i386/xen/xen-hvm.c | 2 +- hw/ide/core.c | 2 ++ hw/ide/sii3112.c | 4 ++-- hw/intc/xics_pnv.c | 1 - hw/intc/xics_spapr.c | 1 - hw/ipmi/ipmi.c | 1 + hw/mips/mips_jazz.c | 1 + hw/mips/mips_malta.c | 1 + hw/misc/exynos4210_rng.c | 1 + hw/misc/mips_cmgcr.c | 1 - hw/misc/mps2-scc.c | 1 - hw/net/rocker/qmp-norocker.c | 1 + hw/net/rocker/rocker.c | 1 + hw/net/rocker/rocker_of_dpa.c | 1 + hw/net/virtio-net.c | 2 +- hw/nios2/cpu_pic.c | 1 - hw/nvram/eeprom_at24c.c | 3 +-- hw/nvram/fw_cfg.c | 2 ++ hw/pci-bridge/i82801b11.c | 1 - hw/pci-bridge/ioh3420.c | 1 - hw/pci-bridge/xio3130_upstream.c | 1 - hw/pci-host/sabre.c | 1 - hw/pci/pci-stub.c | 1 + hw/pci/pci.c | 2 ++ hw/pci/pcie_aer.c | 3 +-- hw/ppc/e500.c | 2 +- hw/ppc/fdt.c | 1 - hw/ppc/pnv_bmc.c | 1 - hw/ppc/pnv_xscom.c | 1 - hw/ppc/ppc.c | 1 - hw/ppc/spapr.c | 1 - hw/ppc/spapr_drc.c | 1 + hw/ppc/spapr_pci_vfio.c | 1 - hw/ppc/spapr_rtc.c | 3 ++- hw/ppc/virtex_ml507.c | 1 + hw/s390x/s390-ccw.c | 3 ++- hw/s390x/s390-skeys.c | 1 + hw/s390x/s390-stattrib.c | 2 +- hw/s390x/s390-virtio-ccw.c | 3 +-- hw/scsi/esp.c | 1 - hw/scsi/scsi-bus.c | 1 + hw/scsi/vhost-scsi-common.c | 1 - hw/sd/sdhci.c | 1 - hw/smbios/smbios-stub.c | 2 +- hw/smbios/smbios.c | 1 + hw/sparc64/niagara.c | 1 - hw/sparc64/sun4u_iommu.c | 1 - hw/ssi/stm32f2xx_spi.c | 1 - hw/timer/m48t59.c | 1 - hw/timer/mc146818rtc.c | 2 ++ hw/tpm/tpm_emulator.c | 5 ----- hw/tpm/tpm_int.h | 2 -- hw/tpm/tpm_ioctl.h | 2 -- hw/usb/ccid-card-passthru.c | 1 - hw/usb/xen-usb.c | 4 ++-- hw/vfio/pci.c | 1 + hw/virtio/virtio-balloon.c | 1 + hw/watchdog/watchdog.c | 2 +- hw/xen/xen-common.c | 1 - hw/xen/xen_devconfig.c | 1 + hw/xtensa/xtensa_memory.h | 1 - hw/xtensa/xtfpga.c | 2 +- include/block/block.h | 4 +--- include/block/block_int.h | 2 -- include/block/dirty-bitmap.h | 1 + include/block/nbd.h | 2 -- include/block/qapi.h | 1 - include/block/snapshot.h | 2 -- include/chardev/char.h | 2 -- include/crypto/random.h | 1 - include/crypto/xts.h | 1 - include/exec/tb-lookup.h | 2 -- include/hw/acpi/acpi.h | 1 - include/hw/acpi/acpi_dev_interface.h | 1 - include/hw/block/block.h | 1 + include/hw/block/fdc.h | 1 + include/hw/ide/internal.h | 1 - include/hw/intc/xlnx-pmu-iomod-intc.h | 1 - include/hw/intc/xlnx-zynqmp-ipi.h | 1 - include/hw/loader-fit.h | 2 +- include/hw/loader.h | 1 - include/hw/nvram/fw_cfg.h | 1 - include/hw/pci-bridge/simba.h | 1 - include/hw/qdev-core.h | 1 - include/hw/registerfields.h | 2 +- include/hw/s390x/storage-attributes.h | 2 +- include/hw/smbios/smbios.h | 1 - include/hw/xtensa/xtensa-isa.h | 2 -- include/migration/colo.h | 1 + include/monitor/monitor.h | 1 - include/net/net.h | 5 +---- include/net/slirp.h | 4 ---- include/net/tap.h | 1 - include/qapi/clone-visitor.h | 1 - include/qapi/opts-visitor.h | 1 - include/qapi/qmp-event.h | 1 - include/qapi/qmp/dispatch.h | 3 +-- include/qapi/qmp/json-parser.h | 1 - include/qapi/qmp/qbool.h | 4 ++-- include/qapi/qmp/qdict.h | 21 ++++++------------ include/qapi/qmp/qjson.h | 3 --- include/qapi/qmp/qlist.h | 19 ++++++---------- include/qapi/qmp/qlit.h | 1 - include/qapi/qmp/qnum.h | 4 ++-- include/qapi/qmp/qstring.h | 4 ++-- include/qapi/qmp/types.h | 24 --------------------- include/qapi/qobject-input-visitor.h | 1 - include/qapi/qobject-output-visitor.h | 1 - include/qapi/visitor.h | 2 +- include/qemu-common.h | 2 -- include/qemu/config-file.h | 2 -- include/qemu/option.h | 1 - include/qemu/throttle.h | 1 + include/qemu/typedefs.h | 7 +++++- include/qom/object_interfaces.h | 1 - include/scsi/pr-manager.h | 1 - include/sysemu/arch_init.h | 3 +-- include/sysemu/dump.h | 1 - include/sysemu/hostmem.h | 1 - include/sysemu/hvf.h | 2 -- include/sysemu/numa.h | 1 - include/sysemu/replay.h | 1 - include/sysemu/sysemu.h | 2 -- include/sysemu/tpm.h | 1 - include/sysemu/tpm_backend.h | 1 - include/ui/console.h | 5 ++--- include/ui/qemu-spice.h | 1 - io/channel-websock.c | 3 --- iothread.c | 1 + linux-user/syscall.c | 1 - migration/colo-failover.c | 1 + migration/colo.c | 1 + migration/exec.c | 1 - migration/fd.c | 1 - migration/migration.c | 2 ++ migration/migration.h | 1 - migration/ram.c | 2 ++ migration/ram.h | 1 + migration/savevm.c | 1 + monitor.c | 8 ++++--- nbd/common.c | 1 - net/clients.h | 1 - net/colo-compare.c | 1 - net/filter-mirror.c | 1 - net/filter-replay.c | 1 - net/filter-rewriter.c | 2 -- net/net.c | 4 +++- net/slirp.c | 2 ++ net/vhost-user.c | 2 ++ numa.c | 1 + qapi/qapi-dealloc-visitor.c | 2 +- qapi/qapi-visit-core.c | 1 - qapi/qmp-dispatch.c | 4 +--- qapi/qmp-event.c | 1 + qapi/qobject-input-visitor.c | 7 +++++- qapi/qobject-output-visitor.c | 7 +++++- qdev-monitor.c | 2 ++ qemu-img.c | 5 +++-- qemu-io-cmds.c | 1 + qemu-io.c | 3 ++- qemu-keymap.c | 1 - qemu-nbd.c | 3 ++- qga/commands-posix.c | 1 + qga/commands-win32.c | 2 ++ qga/commands.c | 1 + qga/guest-agent-core.h | 2 +- qga/main.c | 5 ++++- qga/vss-win32.c | 1 + qmp.c | 3 ++- qobject/json-parser.c | 7 +++++- qobject/qbool.c | 1 - qobject/qdict.c | 23 +++++++++++++++++++- qobject/qjson.c | 6 +++++- qobject/qlist.c | 25 +++++++++++++++++++++- qobject/qlit.c | 6 +++++- qobject/qnum.c | 2 -- qobject/qobject.c | 7 +++++- qobject/qstring.c | 1 - qom/object.c | 2 +- qom/object_interfaces.c | 2 ++ replay/replay-input.c | 1 - replay/replay.c | 2 +- scripts/qapi-commands.py | 4 ++-- scripts/qapi-event.py | 2 +- scsi/pr-helper.h | 2 -- stubs/arch-query-cpu-def.c | 1 + stubs/arch-query-cpu-model-baseline.c | 1 + stubs/arch-query-cpu-model-comparison.c | 1 + stubs/arch-query-cpu-model-expansion.c | 1 + stubs/dump.c | 1 - stubs/vmgenid.c | 1 + target/i386/cpu.c | 5 +++-- target/i386/hax-all.c | 1 - target/i386/hvf/hvf.c | 1 - target/i386/hvf/vmx.h | 1 - target/i386/hvf/x86_decode.c | 1 - target/i386/hvf/x86_mmu.c | 6 ++---- target/i386/hvf/x86_task.c | 1 - target/i386/hvf/x86hvf.c | 3 --- target/i386/monitor.c | 2 ++ target/i386/xsave_helper.c | 1 - target/nios2/helper.c | 1 - target/ppc/mmu-book3s-v3.c | 1 - target/ppc/mmu-hash64.c | 1 - target/ppc/mmu-radix64.c | 1 - target/ppc/mmu_helper.c | 1 - target/ppc/translate_init.c | 2 ++ target/s390x/cpu_models.c | 2 +- target/s390x/excp_helper.c | 1 - target/s390x/gen-features.c | 4 ++-- target/s390x/helper.c | 1 - target/s390x/kvm.c | 2 +- target/xtensa/core-dc232b/xtensa-modules.c | 3 ++- target/xtensa/core-dc233c/xtensa-modules.c | 3 ++- target/xtensa/core-de212/xtensa-modules.c | 3 ++- target/xtensa/core-fsf/xtensa-modules.c | 3 ++- .../xtensa/core-sample_controller/xtensa-modules.c | 3 ++- target/xtensa/xtensa-isa.c | 4 +--- target/xtensa/xtensa-isa.h | 2 +- tests/ahci-test.c | 1 + tests/check-qdict.c | 4 +++- tests/check-qjson.c | 5 ++++- tests/check-qlist.c | 1 - tests/check-qlit.c | 3 +-- tests/check-qnum.c | 1 - tests/check-qobject.c | 9 ++++++-- tests/cpu-plug-test.c | 2 +- tests/device-introspect-test.c | 2 +- tests/drive_del-test.c | 1 + tests/io-channel-helpers.c | 1 - tests/libqos/libqos.c | 1 + tests/libqos/pci-pc.c | 2 +- tests/libqtest.c | 5 ++++- tests/libqtest.h | 2 -- tests/migration-test.c | 1 + tests/migration/stress.c | 10 +-------- tests/numa-test.c | 2 ++ tests/ptimer-test.c | 4 ++-- tests/pvpanic-test.c | 1 + tests/q35-test.c | 1 + tests/qmp-test.c | 2 ++ tests/qom-test.c | 3 ++- tests/tco-test.c | 2 ++ tests/test-aio-multithread.c | 1 - tests/test-char.c | 2 +- tests/test-clone-visitor.c | 2 -- tests/test-keyval.c | 2 ++ tests/test-netfilter.c | 1 + tests/test-qapi-util.c | 1 - tests/test-qemu-opts.c | 2 ++ tests/test-qga.c | 2 ++ tests/test-qmp-commands.c | 6 ++++-- tests/test-qmp-event.c | 8 ++++--- tests/test-qobject-input-visitor.c | 7 ++++-- tests/test-qobject-output-visitor.c | 9 +++++--- tests/test-replication.c | 2 ++ tests/test-string-input-visitor.c | 2 -- tests/test-string-output-visitor.c | 2 -- tests/test-visitor-serialization.c | 4 +--- tests/test-x86-cpuid-compat.c | 2 +- tests/tmp105-test.c | 1 + tests/vhost-user-test.c | 1 + tests/virtio-net-test.c | 1 + tests/vmgenid-test.c | 1 + tests/wdt_ib700-test.c | 1 + tpm.c | 2 ++ trace/control-internal.h | 2 -- trace/control.c | 1 + trace/qmp.c | 1 + ui/cocoa.m | 1 - ui/console.c | 4 +++- ui/gtk.c | 1 + ui/input-legacy.c | 1 - ui/input.c | 2 +- ui/spice-core.c | 6 ++---- ui/spice-display.c | 2 +- ui/vnc-palette.h | 1 - ui/vnc.c | 4 ++-- ui/vnc.h | 1 - util/keyval.c | 2 ++ util/qemu-config.c | 2 ++ util/qemu-option.c | 5 ++++- vl.c | 5 +++-- 382 files changed, 487 insertions(+), 407 deletions(-) delete mode 100644 include/qapi/qmp/types.h
Signature · 1 line
2.13.6
PATCH v2 1/19 Use #include "..." for our own headers, <...> for others
System headers should be included with <...>, our own headers with "...". Offenders tracked down with an ugly, brittle and probably buggy Perl script. Previous iteration was commit a9c94277f0.
Put the cleaned up system header includes first, except for the ones the next commit will delete.
While there, separate #include from file comment with a blank line,
--- contrib/vhost-user-scsi/vhost-user-scsi.c | 4 ++-- hw/ide/sii3112.c | 4 ++-- hw/s390x/s390-ccw.c | 3 ++- include/hw/loader-fit.h | 2 +- include/hw/registerfields.h | 2 +- include/hw/s390x/storage-attributes.h | 2 +- target/i386/hax-all.c | 2 +- target/i386/hvf/hvf.c | 2 +- target/i386/hvf/x86_decode.c | 2 +- target/i386/hvf/x86_mmu.c | 7 +++---- target/i386/hvf/x86_task.c | 2 +- target/s390x/gen-features.c | 4 ++-- target/xtensa/core-dc232b/xtensa-modules.c | 2 +- target/xtensa/core-dc233c/xtensa-modules.c | 2 +- target/xtensa/core-de212/xtensa-modules.c | 2 +- target/xtensa/core-fsf/xtensa-modules.c | 2 +- target/xtensa/core-sample_controller/xtensa-modules.c | 2 +- target/xtensa/xtensa-isa.h | 2 +- vl.c | 2 +- 19 files changed, 25 insertions(+), 25 deletions(-)
contrib/vhost-user-scsi/vhost-user-scsi.c +2 -2
@@ -11,10 +11,10 @@*/ #include "qemu/osdep.h" +#include <iscsi/iscsi.h> +#include <iscsi/scsi-lowlevel.h> #include "contrib/libvhost-user/libvhost-user-glib.h" #include "standard-headers/linux/virtio_scsi.h" -#include "iscsi/iscsi.h" -#include "iscsi/scsi-lowlevel.h" #include <glib.h>
hw/ide/sii3112.c +2 -2
@@ -12,8 +12,8 @@* http://wiki.osdev.org/User:Quok/Silicon_Image_Datasheets */ -#include <qemu/osdep.h> -#include <hw/ide/pci.h> +#include "qemu/osdep.h" +#include "hw/ide/pci.h" #include "trace.h" #define TYPE_SII3112_PCI "sii3112"
hw/s390x/s390-ccw.c +2 -1
@@ -10,10 +10,11 @@* or (at your option) any later version. See the COPYING file in the * top-level directory. */ +#include "qemu/osdep.h" +#include <libgen.h> #include "qapi/error.h" #include "hw/sysbus.h" -#include "libgen.h" #include "hw/s390x/css.h" #include "hw/s390x/css-bridge.h" #include "hw/s390x/s390-ccw.h"
include/hw/loader-fit.h +1 -1
@@ -20,7 +20,7 @@ #ifndef HW_LOADER_FIT_H #define HW_LOADER_FIT_H -#include <exec/hwaddr.h> +#include "exec/hwaddr.h" struct fit_loader_match { const char *compatible;
include/hw/registerfields.h +1 -1
@@ -11,7 +11,7 @@#ifndef REGISTERFIELDS_H #define REGISTERFIELDS_H -#include <qemu/bitops.h> +#include "qemu/bitops.h" /* Define constants for a 32 bit register */
include/hw/s390x/storage-attributes.h +1 -1
@@ -12,7 +12,7 @@#ifndef S390_STORAGE_ATTRIBUTES_H #define S390_STORAGE_ATTRIBUTES_H -#include <hw/qdev.h> +#include "hw/qdev.h" #include "monitor/monitor.h" #define TYPE_S390_STATTRIB "s390-storage_attributes"
target/i386/hax-all.c +1 -1
@@ -30,7 +30,7 @@#include "exec/ioport.h" #include "qemu-common.h" -#include "strings.h" +#include <strings.h> #include "hax-i386.h" #include "sysemu/accel.h" #include "sysemu/sysemu.h"
target/i386/hvf/hvf.c +1 -1
@@ -43,7 +43,7 @@#include "hw/i386/apic_internal.h" #include "hw/boards.h" #include "qemu/main-loop.h" -#include "strings.h" +#include <strings.h> #include "sysemu/accel.h" #include "sysemu/sysemu.h" #include "target/i386/cpu.h"
target/i386/hvf/x86_decode.c +1 -1
@@ -21,7 +21,7 @@#include "qemu-common.h" #include "panic.h" #include "x86_decode.h" -#include "string.h" +#include <string.h> #include "vmx.h" #include "x86_mmu.h" #include "x86_descr.h"
target/i386/hvf/x86_mmu.c +3 -4
@@ -15,18 +15,17 @@* You should have received a copy of the GNU Lesser General Public * License along with this program; if not, see <http://www.gnu.org/licenses/>. */ +#include "qemu/osdep.h" +#include <memory.h> #include "panic.h" -#include "qemu-common.h" #include "cpu.h" #include "x86.h" #include "x86_mmu.h" -#include "string.h" +#include <string.h> #include "vmcs.h" #include "vmx.h" - -#include "memory.h" #include "exec/address-spaces.h" #define pte_present (pte) (pte & PT_PRESENT)
target/i386/hvf/x86_task.c +1 -1
@@ -32,7 +32,7 @@#include "hw/i386/apic_internal.h" #include "hw/boards.h" #include "qemu/main-loop.h" -#include "strings.h" +#include <strings.h> #include "sysemu/accel.h" #include "sysemu/sysemu.h" #include "target/i386/cpu.h"
target/s390x/gen-features.c +2 -2
@@ -13,8 +13,8 @@*/ -#include "inttypes.h" -#include "stdio.h" +#include <inttypes.h> +#include <stdio.h> #include "cpu_features_def.h" #define ARRAY_SIZE (array) (sizeof(array) / sizeof(array[0]))
target/xtensa/core-dc232b/xtensa-modules.c +1 -1
@@ -18,7 +18,7 @@Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <xtensa-isa.h> +#include "xtensa-isa.h" #include "xtensa-isa-internal.h"
target/xtensa/core-dc233c/xtensa-modules.c +1 -1
@@ -21,7 +21,7 @@TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include <xtensa-isa.h> +#include "xtensa-isa.h" #include "xtensa-isa-internal.h"
target/xtensa/core-de212/xtensa-modules.c +1 -1
@@ -21,7 +21,7 @@TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include <xtensa-isa.h> +#include "xtensa-isa.h" #include "xtensa-isa-internal.h"
target/xtensa/core-fsf/xtensa-modules.c +1 -1
@@ -18,7 +18,7 @@Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <xtensa-isa.h> +#include "xtensa-isa.h" #include "xtensa-isa-internal.h"
target/xtensa/core-sample_controller/xtensa-modules.c +1 -1
@@ -21,7 +21,7 @@TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include <xtensa-isa.h> +#include "xtensa-isa.h" #include "xtensa-isa-internal.h"
target/xtensa/xtensa-isa.h +1 -1
@@ -1 +1 @@ -#include <hw/xtensa/xtensa-isa.h> +#include "hw/xtensa/xtensa-isa.h"
vl.c +1 -1
@@ -28,8 +28,8 @@#include "qemu/uuid.h" #ifdef CONFIG_SECCOMP +#include <sys/prctl.h> #include "sysemu/seccomp.h" -#include "sys/prctl.h" #endif #ifdef CONFIG_SDL
Signature · 1 line
2.13.6
Re: [Qemu-devel] [PATCH v2 01/19] Use #include "..." for our own headers, <...> for others
Quoted 14 lines · Markus Armbruster
System headers should be included with <...>, our own headers with "...". Offenders tracked down with an ugly, brittle and probably buggy Perl script. Previous iteration was commit
a9c94277f0.Put the cleaned up system header includes first, except for the ones the next commit will delete.
While there, separate #include from file comment with a blank line,
Signed-off-by Markus Armbruster <[email protected]>---
+++
b/target/i386/hvf/x86_mmu.c
target/i386/hvf/x86_mmu.c line 20
Quoted 6 lines
target/i386/hvf/x86_mmu.c +2
-0@@ -15,18 +15,17 @@* You should have received a copy of the GNU Lesser General Public * License along with this program; if not, see <http://www.gnu.org/licenses/>. */ +#include "qemu/osdep.h" +#include <memory.h>
<memory.h> is an obsolete spelling for the now-universal <string.h>. We should NEVER need to include it; scripts/clean-includes should be taught to blacklist this one.
But that's a matter for another patch; this one does exactly what it promises, and was mechanical (even if the brittle perl script isn't published), so it's best to keep it as-is.
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
Re: [Qemu-devel] [PATCH v2 01/19] Use #include "..." for our own headers, <...> for others
Quoted 13 lines · Eric Blake
Quoted 11 lines · Markus Armbruster
System headers should be included with <...>, our own headers with "...". Offenders tracked down with an ugly, brittle and probably buggy Perl script. Previous iteration was commit
a9c94277f0.Put the cleaned up system header includes first, except for the ones the next commit will delete.
While there, separate #include from file comment with a blank line,
Signed-off-by Markus Armbruster <[email protected]>---
Quoted 12 lines
target/i386/hvf/x86_mmu.c line 20
Quoted 8 lines
+++
b/target/i386/hvf/x86_mmu.ctarget/i386/hvf/x86_mmu.c +2
-0@@ -15,18 +15,17 @@* You should have received a copy of the GNU Lesser General Public * License along with this program; if not, see <http://www.gnu.org/licenses/>. */ +#include "qemu/osdep.h" +#include <memory.h> <
memory.h> is an obsolete spelling for the now-universal <string.h>. We should NEVER need to include it;scripts/clean-includesshould be taught to blacklist this one.
"Programming today is a race between software engineers striving to build bigger and better idiot-proof programs, and the Universe trying to produce bigger and better idiots. So far, the Universe is winning."
My point is: if we extended our tooling every time we see a mistake, we'll drown in tooling. I think we should limit ourselves to *common* mistakes. Is this one common?
Quoted 3 lines
But that's a matter for another patch; this one does exactly what it promises, and was mechanical (even if the brittle perl script isn't published), so it's best to keep it as-is.
I append my Perl script.
Its simpleminded approach to locating headers in the source tree fails frequently. It should really use the compiler to find them.
I reviewed inclusions of headers the script flags as "(included inconsistently)". I also reviewed "(included with <>)" where the script can find a header in the tree. I patched only obvious mistakes. There are a few unobvious cases: headers in tree with the same name as a system header, e.g. elf.h, io.h.
Quoted 1 line
Reviewed-by Eric Blake <[email protected]>
Thanks!
#!/usr/bin/perl -w
use strict;
my %ihdr = ();
my %idir = ();
my @sall = ();
my @sinc = ();
open(my $fh, "-|", "git grep '^[ \t]*#[ \t]*include[ \t]'")
or die "can't run git grep: $!";
while (<$fh>) {
m,^(([^:]*)/)?[^:/]*:[ \t]*\#[ \t]*include[ \t]*(["<])([^">]*), or next;
my $dir = $2 // ".";
my $delim = $3;
my $h = $4;
$ihdr{$h} |= 1 << ($delim eq "<");
if (exists $idir{$h}) {
my $aref = $idir{$h};
push @$aref, $dir unless grep($_ eq $dir, @$aref);
} else {
$idir{$h} = [$dir];
}
}close ($fh);
open($fh, "-|", "git ls-tree -r --name-only HEAD")
or die "can't run git ls-tree: $!";
while (<$fh>) {
chomp;
push @sall, $_;
}close ($fh);
@sinc = grep(/^include\//, @sall);
sub pr {
my ($h, $fn, $src) = @_;
print "$h -> $fn";
if ($ihdr{$h} == 3) {
print " (included inconsistently)";
} elsif ($src) {
print " (included with <>)" if ($ihdr{$h} != 1);
} else {
print " (included with \"\")" if ($ihdr{$h} != 2);
}
print "\n";
}for my $h (keys %ihdr) {
$h =~ m,^(\.\./)*(include/)?(.*), or die;
my $hh = $3;
my @fn = grep(/^include\/\Q$hh\E$/, @sinc);
if (@fn) {
pr($h, $fn[0], 1);
next;
}
@fn = grep(/^\Q$hh\E$/, @sall);
if (@fn) {
pr($h, $fn[0], 1);
next;
}
for my $dir (@{$idir{$h}}) {
next if $dir eq ".";
print "## $dir/$hh\n";
@fn = grep(/^\Q$dir\/$hh\E$/, @sall);
if (@fn) {
pr($h, $fn[0], 1);
} else {
pr($h, "? (in $dir)", 0);
}
}
}Re: [Qemu-devel] [PATCH v2 01/19] Use #include "..." for our own headers, <...> for others
Quoted 8 lines · Markus Armbruster
Quoted 7 lines
target/i386/hvf/x86_mmu.c line 20
Quoted 3 lines
target/i386/hvf/x86_mmu.c +2
-0+#include "qemu/osdep.h" +#include <memory.h> <
memory.h> is an obsolete spelling for the now-universal <string.h>. We should NEVER need to include it;scripts/clean-includesshould be taught to blacklist this one.
Quoted 7 lines
"Programming today is a race between software engineers striving to build bigger and better idiot-proof programs, and the Universe trying to produce bigger and better idiots. So far, the Universe is winning."
My point is: if we extended our tooling every time we see a mistake, we'll drown in tooling. I think we should limit ourselves to *common* mistakes. Is this one common?
Perhaps not; a tendency when writing a new file is to copy-and-paste a list of includes from another file, then add more if things still don't compile. Since adding memory.h never changes whether compilation will work (unless you forgot osdep.h in the first place, and thereby missed string.h), and if we eradicate all current uses of memory.h, new uses won't have the bad example to copy from.
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
Re: [Qemu-devel] [PATCH v2 01/19] Use #include "..." for our own headers, <...> for others
In reply to Markus ArmbrusterQuoted 6 lines · Markus Armbruster
System headers should be included with <...>, our own headers with "...". Offenders tracked down with an ugly, brittle and probably buggy Perl script. Previous iteration was commit
a9c94277f0.Put the cleaned up system header includes first, except for the ones the next commit will delete.
That's a little bit of code churn ... why not delete them here immediately, or simply ignore these headers here and just delete them in the next patch?
Quoted 4 lines
While there, separate #include from file comment with a blank line,
Signed-off-by Markus Armbruster <[email protected]>---
[...]
target/s390x/gen-features.c line 15
Quoted 8 lines
target/s390x/gen-features.c +0
-0@@ -13,8 +13,8 @@*/
While you're at it, remove one of the two blank lines?
target/s390x/gen-features.c line 18
Quoted 5 lines
target/s390x/gen-features.c +2
-2-#include "inttypes.h" -#include "stdio.h" +#include <inttypes.h> +#include <stdio.h> #include "cpu_features_def.h"
Above remarks are just nits, anyway patch looks fine, so:
Re: [Qemu-devel] [PATCH v2 01/19] Use #include "..." for our own headers, <...> for others
Quoted 11 lines · Thomas Huth
Quoted 6 lines · Markus Armbruster
System headers should be included with <...>, our own headers with "...". Offenders tracked down with an ugly, brittle and probably buggy Perl script. Previous iteration was commit
a9c94277f0.Put the cleaned up system header includes first, except for the ones the next commit will delete.
That's a little bit of code churn ... why not delete them here immediately, or simply ignore these headers here and just delete them in the next patch?
Ignore won't do, as scripts/clean-includes won't find them then.
Delete is possible, but requires still more explanation in the commit message. Worthwhile?
Quoted 5 lines
Quoted 4 lines
While there, separate #include from file comment with a blank line,
Signed-off-by Markus Armbruster <[email protected]>---
[...]
Quoted 10 lines
target/s390x/gen-features.c line 15
Quoted 8 lines
target/s390x/gen-features.c +0
-0@@ -13,8 +13,8 @@*/ While you're at it, remove one of the two blank lines?
Yes.
Quoted 9 lines
target/s390x/gen-features.c line 18
Quoted 5 lines
target/s390x/gen-features.c +2
-2-#include "inttypes.h" -#include "stdio.h" +#include <inttypes.h> +#include <stdio.h> #include "cpu_features_def.h" Above remarks are just nits, anyway patch looks fine, so:
Reviewed-by Thomas Huth <[email protected]>
Thanks!
Re: [Qemu-devel] [PATCH v2 01/19] Use #include "..." for our own headers, <...> for others
Quoted 10 lines · Markus Armbruster
Quoted 8 lines · Thomas Huth
Quoted 6 lines · Markus Armbruster
System headers should be included with <...>, our own headers with "...". Offenders tracked down with an ugly, brittle and probably buggy Perl script. Previous iteration was commit
a9c94277f0.Put the cleaned up system header includes first, except for the ones the next commit will delete.
Quoted 8 lines
Quoted 3 lines
That's a little bit of code churn ... why not delete them here immediately, or simply ignore these headers here and just delete them in the next patch?
Ignore won't do, as
scripts/clean-includeswon't find them then.Delete is possible, but requires still more explanation in the commit message. Worthwhile?
I'd prefer to do it. Otherwise, if you look at the commit log of such a file later, it just looks weird (first change the quotes, then immediately delete it afterwards again). But if it's too cumbersome to rework your patch this way right now, I'm also fine if you keep it as it currently is.
Thomas
PATCH v2 2/19 Clean up includes
In reply to Markus ArmbrusterClean up includes so that osdep.h is included first and headers which it implies are not included manually.
This commit was created with scripts/clean-includes, with the change to target/s390x/gen-features.c manually reverted, and blank lines around deletions collapsed.
--- block/parallels.h | 1 - hw/block/vhost-user-blk.c | 1 - hw/nvram/eeprom_at24c.c | 3 +-- hw/tpm/tpm_emulator.c | 5 ----- hw/tpm/tpm_int.h | 2 -- hw/tpm/tpm_ioctl.h | 2 -- hw/xtensa/xtensa_memory.h | 1 - include/exec/tb-lookup.h | 2 -- include/hw/intc/xlnx-pmu-iomod-intc.h | 1 - include/hw/intc/xlnx-zynqmp-ipi.h | 1 - include/hw/nvram/fw_cfg.h | 1 - include/hw/pci-bridge/simba.h | 1 - include/hw/xtensa/xtensa-isa.h | 2 -- include/qapi/clone-visitor.h | 1 - include/sysemu/hvf.h | 2 -- include/ui/console.h | 1 - io/channel-websock.c | 3 --- linux-user/syscall.c | 1 - scsi/pr-helper.h | 2 -- target/i386/hax-all.c | 1 - target/i386/hvf/hvf.c | 1 - target/i386/hvf/vmx.h | 1 - target/i386/hvf/x86_decode.c | 1 - target/i386/hvf/x86_mmu.c | 1 - target/i386/hvf/x86_task.c | 1 - target/i386/hvf/x86hvf.c | 3 --- target/xtensa/core-dc232b/xtensa-modules.c | 1 + target/xtensa/core-dc233c/xtensa-modules.c | 1 + target/xtensa/core-de212/xtensa-modules.c | 1 + target/xtensa/core-fsf/xtensa-modules.c | 1 + target/xtensa/core-sample_controller/xtensa-modules.c | 1 + target/xtensa/xtensa-isa.c | 4 +--- tests/migration/stress.c | 10 +--------- tests/ptimer-test.c | 4 ++-- trace/control-internal.h | 2 -- 35 files changed, 10 insertions(+), 57 deletions(-)
block/parallels.h +0 -1
@@ -32,7 +32,6 @@#ifndef BLOCK_PARALLELS_H #define BLOCK_PARALLELS_H #include "qemu/coroutine.h" -#include "qemu/typedefs.h" #define HEADS_NUMBER 16#define SEC_IN_CYL 32
hw/block/vhost-user-blk.c +0 -1
@@ -19,7 +19,6 @@#include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/error-report.h" -#include "qemu/typedefs.h" #include "qemu/cutils.h" #include "qom/object.h" #include "hw/qdev-core.h"
hw/nvram/eeprom_at24c.c +1 -2
@@ -7,9 +7,8 @@* the LICENSE file in the top-level directory. */ -#include <string.h> -#include "qemu/osdep.h" +#include "qapi/error.h" #include "hw/hw.h" #include "hw/i2c/i2c.h"
hw/tpm/tpm_emulator.c +0 -5
@@ -40,11 +40,6 @@#include "qapi/clone-visitor.h" #include "chardev/char-fe.h" -#include <fcntl.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <stdio.h> -#define DEBUG_TPM 0#define DPRINTF (fmt, ...) do { \
hw/tpm/tpm_int.h +0 -2
@@ -12,8 +12,6 @@#ifndef TPM_TPM_INT_H #define TPM_TPM_INT_H -#include "qemu/osdep.h" -#define TPM_STANDARD_CMDLINE_OPTS \ { \ .name = "type", \
hw/tpm/tpm_ioctl.h +0 -2
@@ -8,9 +8,7 @@#ifndef _TPM_IOCTL_H_#define _TPM_IOCTL_H_ -#include <stdint.h> #include <sys/uio.h> -#include <sys/types.h> #include <sys/ioctl.h> /*
hw/xtensa/xtensa_memory.h +0 -1
@@ -28,7 +28,6 @@#ifndef _XTENSA_MEMORY_H#define _XTENSA_MEMORY_H -#include "qemu/osdep.h" #include "qemu-common.h" #include "cpu.h" #include "exec/memory.h"
include/exec/tb-lookup.h +0 -2
@@ -7,8 +7,6 @@#ifndef EXEC_TB_LOOKUP_H #define EXEC_TB_LOOKUP_H -#include "qemu/osdep.h" -#ifdef NEED_CPU_H #include "cpu.h" #else
include/hw/intc/xlnx-pmu-iomod-intc.h +0 -1
@@ -25,7 +25,6 @@#ifndef XLNX_PMU_IO_INTC_H #define XLNX_PMU_IO_INTC_H -#include "qemu/osdep.h" #include "hw/sysbus.h" #include "hw/register.h"
include/hw/intc/xlnx-zynqmp-ipi.h +0 -1
@@ -25,7 +25,6 @@#ifndef XLNX_ZYNQMP_IPI_H #define XLNX_ZYNQMP_IPI_H -#include "qemu/osdep.h" #include "hw/sysbus.h" #include "hw/register.h"
include/hw/nvram/fw_cfg.h +0 -1
@@ -1,7 +1,6 @@#ifndef FW_CFG_H #define FW_CFG_H -#include "qemu/typedefs.h" #include "exec/hwaddr.h" #include "hw/nvram/fw_cfg_keys.h" #include "hw/sysbus.h"
include/hw/pci-bridge/simba.h +0 -1
@@ -24,7 +24,6 @@* THE SOFTWARE. */ -#include "qemu/osdep.h" #include "hw/pci/pci_bridge.h"
include/hw/xtensa/xtensa-isa.h +0 -2
@@ -25,8 +25,6 @@ #ifndef XTENSA_LIBISA_H #define XTENSA_LIBISA_H -#include <stdint.h> - #ifdef __cplusplus extern "C" { #endif
include/qapi/clone-visitor.h +0 -1
@@ -11,7 +11,6 @@#ifndef QAPI_CLONE_VISITOR_H #define QAPI_CLONE_VISITOR_H -#include "qemu/typedefs.h" #include "qapi/visitor.h" #include "qapi-visit.h"
include/sysemu/hvf.h +0 -2
@@ -12,8 +12,6 @@#ifndef _HVF_H#define _HVF_H -#include "config-host.h" -#include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/bitops.h" #include "exec/memory.h"
include/ui/console.h +0 -1
@@ -5,7 +5,6 @@#include "qom/object.h" #include "qapi/qmp/qdict.h" #include "qemu/notify.h" -#include "qemu/typedefs.h" #include "qapi-types.h" #include "qemu/error-report.h" #include "qapi/error.h"
io/channel-websock.c +0 -3
@@ -26,9 +26,6 @@#include "trace.h" #include "qemu/iov.h" -#include <time.h> - -/* Max amount to allow in rawinput/encoutput buffers */ #define QIO_CHANNEL_WEBSOCK_MAX_BUFFER 8192
linux-user/syscall.c +0 -1
@@ -48,7 +48,6 @@ int __clone2(int (*fn)(void *), void *child_stack_base,#include <sys/shm.h> #include <sys/sem.h> #include <sys/statfs.h> -#include <time.h> #include <utime.h> #include <sys/sysinfo.h> #include <sys/signalfd.h>
scsi/pr-helper.h +0 -2
@@ -26,8 +26,6 @@#ifndef QEMU_PR_HELPER_H #define QEMU_PR_HELPER_H 1 -#include <stdint.h> -#define PR_HELPER_CDB_SIZE 16#define PR_HELPER_SENSE_SIZE 96#define PR_HELPER_DATA_SIZE 8192
target/i386/hax-all.c +0 -1
@@ -30,7 +30,6 @@#include "exec/ioport.h" #include "qemu-common.h" -#include <strings.h> #include "hax-i386.h" #include "sysemu/accel.h" #include "sysemu/sysemu.h"
target/i386/hvf/hvf.c +0 -1
@@ -43,7 +43,6 @@#include "hw/i386/apic_internal.h" #include "hw/boards.h" #include "qemu/main-loop.h" -#include <strings.h> #include "sysemu/accel.h" #include "sysemu/sysemu.h" #include "target/i386/cpu.h"
target/i386/hvf/vmx.h +0 -1
@@ -22,7 +22,6 @@#ifndef VMX_H #define VMX_H -#include <stdint.h> #include <Hypervisor/hv.h> #include <Hypervisor/hv_vmx.h> #include "vmcs.h"
target/i386/hvf/x86_decode.c +0 -1
@@ -21,7 +21,6 @@#include "qemu-common.h" #include "panic.h" #include "x86_decode.h" -#include <string.h> #include "vmx.h" #include "x86_mmu.h" #include "x86_descr.h"
target/i386/hvf/x86_mmu.c +0 -1
@@ -23,7 +23,6 @@#include "cpu.h" #include "x86.h" #include "x86_mmu.h" -#include <string.h> #include "vmcs.h" #include "vmx.h" #include "exec/address-spaces.h"
target/i386/hvf/x86_task.c +0 -1
@@ -32,7 +32,6 @@#include "hw/i386/apic_internal.h" #include "hw/boards.h" #include "qemu/main-loop.h" -#include <strings.h> #include "sysemu/accel.h" #include "sysemu/sysemu.h" #include "target/i386/cpu.h"
target/i386/hvf/x86hvf.c +0 -3
@@ -29,11 +29,8 @@#include "hw/i386/apic_internal.h" -#include <stdio.h> -#include <stdlib.h> #include <Hypervisor/hv.h> #include <Hypervisor/hv_vmx.h> -#include <stdint.h> void hvf_set_segment (struct CPUState *cpu,struct vmx_segment *vmx_seg,SegmentCache *qseg,bool is_tr)
target/xtensa/core-dc232b/xtensa-modules.c +1 -0
@@ -18,6 +18,7 @@Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ +#include "qemu/osdep.h" #include "xtensa-isa.h" #include "xtensa-isa-internal.h"
target/xtensa/core-dc233c/xtensa-modules.c +1 -0
@@ -21,6 +21,7 @@TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "qemu/osdep.h" #include "xtensa-isa.h" #include "xtensa-isa-internal.h"
target/xtensa/core-de212/xtensa-modules.c +1 -0
@@ -21,6 +21,7 @@TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "qemu/osdep.h" #include "xtensa-isa.h" #include "xtensa-isa-internal.h"
target/xtensa/core-fsf/xtensa-modules.c +1 -0
@@ -18,6 +18,7 @@Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ +#include "qemu/osdep.h" #include "xtensa-isa.h" #include "xtensa-isa-internal.h"
target/xtensa/core-sample_controller/xtensa-modules.c +1 -0
@@ -21,6 +21,7 @@TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "qemu/osdep.h" #include "xtensa-isa.h" #include "xtensa-isa-internal.h"
target/xtensa/xtensa-isa.c +1 -3
@@ -22,9 +22,7 @@* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include <stdio.h> -#include <stdlib.h> -#include <string.h> +#include "qemu/osdep.h" #include "xtensa-isa.h" #include "xtensa-isa-internal.h"
tests/migration/stress.c +1 -9
@@ -17,21 +17,13 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. */ -#include <stdio.h> +#include "qemu/osdep.h" #include <getopt.h> -#include <string.h> -#include <stdlib.h> -#include <errno.h> -#include <unistd.h> #include <sys/reboot.h> #include <sys/syscall.h> #include <linux/random.h> -#include <sys/time.h> #include <pthread.h> -#include <fcntl.h> #include <sys/mount.h> -#include <sys/stat.h> -#include <sys/mman.h> const char *argv0;
tests/ptimer-test.c +2 -2
@@ -8,9 +8,9 @@* */ -#include <glib/gprintf.h> -#include "qemu/osdep.h" +#include <glib/gprintf.h> +#include "qemu/main-loop.h" #include "hw/ptimer.h"
trace/control-internal.h +0 -2
@@ -10,8 +10,6 @@#ifndef TRACE__CONTROL_INTERNAL_H #define TRACE__CONTROL_INTERNAL_H -#include <stddef.h> /* size_t */ -#include "qom/cpu.h"
Signature · 1 line
2.13.6
Re: [Qemu-devel] [PATCH v2 02/19] Clean up includes
Quoted 6 lines · Markus Armbruster
Clean up includes so that
osdep.his included first and headers which it implies are not included manually.This commit was created with
scripts/clean-includes, with the change totarget/s390x/gen-features.cmanually reverted, and blank lines around deletions collapsed.
Is it worth tweaking scripts/clean-includes to add gen-features.c to the whitelist of special cases (alongside *.inc.c, perhaps)?
Quoted 3 lines
Signed-off-by Markus Armbruster <[email protected]>---
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
Re: [Qemu-devel] [PATCH v2 02/19] Clean up includes
Quoted 10 lines · Eric Blake
Quoted 6 lines · Markus Armbruster
Clean up includes so that
osdep.his included first and headers which it implies are not included manually.This commit was created with
scripts/clean-includes, with the change totarget/s390x/gen-features.cmanually reverted, and blank lines around deletions collapsed.Is it worth tweaking
scripts/clean-includesto addgen-features.cto the whitelist of special cases (alongside *.inc.c, perhaps)?
Probably, but I'm in a bit of a time squeeze right now.
A naming convention for .c files that only compile when included into something else would make sense. Hmm, like *gasp* .h?
Offenders include crypto/cipher-*.c. "git-grep '#include.*\.c'" coughs up more candidates.
Quoted 4 lines
Quoted 2 lines
Signed-off-by Markus Armbruster <[email protected]>---
Reviewed-by Eric Blake <[email protected]>
Thanks!
Re: [Qemu-devel] [PATCH v2 02/19] Clean up includes
In reply to Markus ArmbrusterQuoted 6 lines · Markus Armbruster
Clean up includes so that
osdep.his included first and headers which it implies are not included manually.This commit was created with
scripts/clean-includes, with the change totarget/s390x/gen-features.cmanually reverted, and blank lines around deletions collapsed.
I wonder whether it would make sense to add a check based on scripts/clean-includes to patchew already, so that these includes do not sneak in so easily again...?
Thomas
Re: [Qemu-devel] [PATCH v2 02/19] Clean up includes
Quoted 8 lines · Thomas Huth
Quoted 6 lines · Markus Armbruster
Clean up includes so that
osdep.his included first and headers which it implies are not included manually.This commit was created with
scripts/clean-includes, with the change totarget/s390x/gen-features.cmanually reverted, and blank lines around deletions collapsed.
Quoted 5 lines
Reviewed-by Thomas Huth <[email protected]>I wonder whether it would make sense to add a check based on
scripts/clean-includesto patchew already, so that these includes do not sneak in so easily again...?
(Having not looked at the series), are we clean with this series applied? If so it makes a good point to do so.
Fam
Quoted 2 lines
Thomas
Re: [Qemu-devel] [PATCH v2 02/19] Clean up includes
Quoted 9 lines · Fam Zheng
Quoted 8 lines · Thomas Huth
Quoted 6 lines · Markus Armbruster
Clean up includes so that
osdep.his included first and headers which it implies are not included manually.This commit was created with
scripts/clean-includes, with the change totarget/s390x/gen-features.cmanually reverted, and blank lines around deletions collapsed.
Quoted 8 lines
Quoted 5 lines
Reviewed-by Thomas Huth <[email protected]>I wonder whether it would make sense to add a check based on
scripts/clean-includesto patchew already, so that these includes do not sneak in so easily again...?(Having not looked at the series), are we clean with this series applied? If so it makes a good point to do so.
It isn't, but I guess it could be made clean with a bit of work both on sources and the script.
Re: [Qemu-devel] [PATCH v2 02/19] Clean up includes
In reply to Markus ArmbrusterQuoted 8 lines · Markus Armbruster
Clean up includes so that
osdep.his included first and headers which it implies are not included manually.This commit was created with
scripts/clean-includes, with the change totarget/s390x/gen-features.cmanually reverted, and blank lines around deletions collapsed.Signed-off-by Markus Armbruster <[email protected]>
Quoted 502 lines
--- block/parallels.h | 1 - hw/block/vhost-user-blk.c | 1 - hw/nvram/eeprom_at24c.c | 3 +-- hw/tpm/tpm_emulator.c | 5 ----- hw/tpm/tpm_int.h | 2 -- hw/tpm/tpm_ioctl.h | 2 -- hw/xtensa/xtensa_memory.h | 1 - include/exec/tb-lookup.h | 2 -- include/hw/intc/xlnx-pmu-iomod-intc.h | 1 - include/hw/intc/xlnx-zynqmp-ipi.h | 1 - include/hw/nvram/fw_cfg.h | 1 - include/hw/pci-bridge/simba.h | 1 - include/hw/xtensa/xtensa-isa.h | 2 -- include/qapi/clone-visitor.h | 1 - include/sysemu/hvf.h | 2 -- include/ui/console.h | 1 - io/channel-websock.c | 3 --- linux-user/syscall.c | 1 - scsi/pr-helper.h | 2 -- target/i386/hax-all.c | 1 - target/i386/hvf/hvf.c | 1 - target/i386/hvf/vmx.h | 1 - target/i386/hvf/x86_decode.c | 1 - target/i386/hvf/x86_mmu.c | 1 - target/i386/hvf/x86_task.c | 1 - target/i386/hvf/x86hvf.c | 3 --- target/xtensa/core-dc232b/xtensa-modules.c | 1 + target/xtensa/core-dc233c/xtensa-modules.c | 1 + target/xtensa/core-de212/xtensa-modules.c | 1 + target/xtensa/core-fsf/xtensa-modules.c | 1 + target/xtensa/core-sample_controller/xtensa-modules.c | 1 + target/xtensa/xtensa-isa.c | 4 +--- tests/migration/stress.c | 10 +--------- tests/ptimer-test.c | 4 ++-- trace/control-internal.h | 2 -- 35 files changed, 10 insertions(+), 57 deletions(-)block/parallels.h +0
-1@@ -32,7 +32,6 @@#ifndef BLOCK_PARALLELS_H #define BLOCK_PARALLELS_H #include "qemu/coroutine.h" -#include "qemu/typedefs.h" #define HEADS_NUMBER 16#define SEC_IN_CYL 32hw/block/vhost-user-blk.c +0
-1@@ -19,7 +19,6 @@#include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/error-report.h" -#include "qemu/typedefs.h" #include "qemu/cutils.h" #include "qom/object.h" #include "hw/qdev-core.h" hw/nvram/eeprom_at24c.c +1
-2@@ -7,9 +7,8 @@* the LICENSE file in the top-level directory. */ -#include <string.h> -#include "qemu/osdep.h" +#include "qapi/error.h" #include "hw/hw.h" #include "hw/i2c/i2c.h" hw/tpm/tpm_emulator.c +0
-5@@ -40,11 +40,6 @@#include "qapi/clone-visitor.h" #include "chardev/char-fe.h" -#include <fcntl.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <stdio.h> -#define DEBUG_TPM 0#define DPRINTF (fmt, ...) do { \hw/tpm/tpm_int.h +0
-2@@ -12,8 +12,6 @@#ifndef TPM_TPM_INT_H #define TPM_TPM_INT_H -#include "qemu/osdep.h" -#define TPM_STANDARD_CMDLINE_OPTS \ { \ .name = "type", \hw/tpm/tpm_ioctl.h +0
-2@@ -8,9 +8,7 @@#ifndef _TPM_IOCTL_H_#define _TPM_IOCTL_H_ -#include <stdint.h> #include <sys/uio.h> -#include <sys/types.h> #include <sys/ioctl.h> /* hw/xtensa/xtensa_memory.h +0
-1@@ -28,7 +28,6 @@#ifndef _XTENSA_MEMORY_H#define _XTENSA_MEMORY_H -#include "qemu/osdep.h" #include "qemu-common.h" #include "cpu.h" #include "exec/memory.h" include/exec/tb-lookup.h +0
-2@@ -7,8 +7,6 @@#ifndef EXEC_TB_LOOKUP_H #define EXEC_TB_LOOKUP_H -#include "qemu/osdep.h" -#ifdef NEED_CPU_H #include "cpu.h" #else include/hw/intc/xlnx-pmu-iomod-intc.h +0
-1@@ -25,7 +25,6 @@#ifndef XLNX_PMU_IO_INTC_H #define XLNX_PMU_IO_INTC_H -#include "qemu/osdep.h" #include "hw/sysbus.h" #include "hw/register.h" include/hw/intc/xlnx-zynqmp-ipi.h +0
-1@@ -25,7 +25,6 @@#ifndef XLNX_ZYNQMP_IPI_H #define XLNX_ZYNQMP_IPI_H -#include "qemu/osdep.h" #include "hw/sysbus.h" #include "hw/register.h" include/hw/nvram/fw_cfg.h +0
-1@@ -1,7 +1,6 @@#ifndef FW_CFG_H #define FW_CFG_H -#include "qemu/typedefs.h" #include "exec/hwaddr.h" #include "hw/nvram/fw_cfg_keys.h" #include "hw/sysbus.h" include/hw/pci-bridge/simba.h +0
-1@@ -24,7 +24,6 @@* THE SOFTWARE. */ -#include "qemu/osdep.h" #include "hw/pci/pci_bridge.h" include/hw/xtensa/xtensa-isa.h +0
-2@@ -25,8 +25,6 @@ #ifndef XTENSA_LIBISA_H #define XTENSA_LIBISA_H -#include <stdint.h> - #ifdef __cplusplus extern "C" { #endifinclude/qapi/clone-visitor.h +0
-1@@ -11,7 +11,6 @@#ifndef QAPI_CLONE_VISITOR_H #define QAPI_CLONE_VISITOR_H -#include "qemu/typedefs.h" #include "qapi/visitor.h" #include "qapi-visit.h" include/sysemu/hvf.h +0
-2@@ -12,8 +12,6 @@#ifndef _HVF_H#define _HVF_H -#include "config-host.h" -#include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/bitops.h" #include "exec/memory.h" include/ui/console.h +0
-1@@ -5,7 +5,6 @@#include "qom/object.h" #include "qapi/qmp/qdict.h" #include "qemu/notify.h" -#include "qemu/typedefs.h" #include "qapi-types.h" #include "qemu/error-report.h" #include "qapi/error.h" io/channel-websock.c +0
-3@@ -26,9 +26,6 @@#include "trace.h" #include "qemu/iov.h" -#include <time.h> - -/* Max amount to allow in rawinput/encoutput buffers */ #define QIO_CHANNEL_WEBSOCK_MAX_BUFFER 8192linux-user/syscall.c +0
-1@@ -48,7 +48,6 @@ int __clone2(int (*fn)(void *), void *child_stack_base,#include <sys/shm.h> #include <sys/sem.h> #include <sys/statfs.h> -#include <time.h> #include <utime.h> #include <sys/sysinfo.h> #include <sys/signalfd.h> scsi/pr-helper.h +0
-2@@ -26,8 +26,6 @@#ifndef QEMU_PR_HELPER_H #define QEMU_PR_HELPER_H 1 -#include <stdint.h> -#define PR_HELPER_CDB_SIZE 16#define PR_HELPER_SENSE_SIZE 96#define PR_HELPER_DATA_SIZE 8192target/i386/hax-all.c +0
-1@@ -30,7 +30,6 @@#include "exec/ioport.h" #include "qemu-common.h" -#include <strings.h> #include "hax-i386.h" #include "sysemu/accel.h" #include "sysemu/sysemu.h" target/i386/hvf/hvf.c +0
-1@@ -43,7 +43,6 @@#include "hw/i386/apic_internal.h" #include "hw/boards.h" #include "qemu/main-loop.h" -#include <strings.h> #include "sysemu/accel.h" #include "sysemu/sysemu.h" #include "target/i386/cpu.h" target/i386/hvf/vmx.h +0
-1@@ -22,7 +22,6 @@#ifndef VMX_H #define VMX_H -#include <stdint.h> #include <Hypervisor/hv.h> #include <Hypervisor/hv_vmx.h> #include "vmcs.h" target/i386/hvf/x86_decode.c +0
-1@@ -21,7 +21,6 @@#include "qemu-common.h" #include "panic.h" #include "x86_decode.h" -#include <string.h> #include "vmx.h" #include "x86_mmu.h" #include "x86_descr.h" target/i386/hvf/x86_mmu.c +0
-1@@ -23,7 +23,6 @@#include "cpu.h" #include "x86.h" #include "x86_mmu.h" -#include <string.h> #include "vmcs.h" #include "vmx.h" #include "exec/address-spaces.h" target/i386/hvf/x86_task.c +0
-1@@ -32,7 +32,6 @@#include "hw/i386/apic_internal.h" #include "hw/boards.h" #include "qemu/main-loop.h" -#include <strings.h> #include "sysemu/accel.h" #include "sysemu/sysemu.h" #include "target/i386/cpu.h" target/i386/hvf/x86hvf.c +0
-3@@ -29,11 +29,8 @@#include "hw/i386/apic_internal.h" -#include <stdio.h> -#include <stdlib.h> #include <Hypervisor/hv.h> #include <Hypervisor/hv_vmx.h> -#include <stdint.h> void hvf_set_segment (struct CPUState *cpu,struct vmx_segment *vmx_seg,SegmentCache *qseg,bool is_tr)target/xtensa/core-dc232b/xtensa-modules.c +1
-0@@ -18,6 +18,7 @@Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ +#include "qemu/osdep.h" #include "xtensa-isa.h" #include "xtensa-isa-internal.h" target/xtensa/core-dc233c/xtensa-modules.c +1
-0@@ -21,6 +21,7 @@TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "qemu/osdep.h" #include "xtensa-isa.h" #include "xtensa-isa-internal.h" target/xtensa/core-de212/xtensa-modules.c +1
-0@@ -21,6 +21,7 @@TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "qemu/osdep.h" #include "xtensa-isa.h" #include "xtensa-isa-internal.h" target/xtensa/core-fsf/xtensa-modules.c +1
-0@@ -18,6 +18,7 @@Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ +#include "qemu/osdep.h" #include "xtensa-isa.h" #include "xtensa-isa-internal.h" target/xtensa/core-sample_controller/xtensa-modules.c +1
-0@@ -21,6 +21,7 @@TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "qemu/osdep.h" #include "xtensa-isa.h" #include "xtensa-isa-internal.h" target/xtensa/xtensa-isa.c +1
-3@@ -22,9 +22,7 @@* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include <stdio.h> -#include <stdlib.h> -#include <string.h> +#include "qemu/osdep.h" #include "xtensa-isa.h" #include "xtensa-isa-internal.h" tests/migration/stress.c +1
-9@@ -17,21 +17,13 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. */ -#include <stdio.h> +#include "qemu/osdep.h" #include <getopt.h> -#include <string.h> -#include <stdlib.h> -#include <errno.h> -#include <unistd.h> #include <sys/reboot.h> #include <sys/syscall.h> #include <linux/random.h> -#include <sys/time.h> #include <pthread.h> -#include <fcntl.h> #include <sys/mount.h> -#include <sys/stat.h> -#include <sys/mman.h> const char *argv0;tests/ptimer-test.c +2
-2@@ -8,9 +8,9 @@* */ -#include <glib/gprintf.h> -#include "qemu/osdep.h" +#include <glib/gprintf.h> +#include "qemu/main-loop.h" #include "hw/ptimer.h" trace/control-internal.h +0
-2@@ -10,8 +10,6 @@#ifndef TRACE__CONTROL_INTERNAL_H #define TRACE__CONTROL_INTERNAL_H -#include <stddef.h> /* size_t */ -#include "qom/cpu.h"
PATCH v2 3/19 Drop superfluous includes of qapi-types.h and test-qapi-types.h
In reply to Markus Armbruster--- backends/cryptodev.c | 1 - backends/hostmem.c | 1 - hmp.h | 1 - include/block/block.h | 1 - include/block/block_int.h | 1 - include/block/qapi.h | 1 - include/hw/acpi/acpi_dev_interface.h | 1 - include/migration/failover.h | 1 - include/net/net.h | 1 - include/net/slirp.h | 1 - include/net/tap.h | 1 - include/qapi/qmp/qlit.h | 1 - include/sysemu/dump.h | 1 - include/sysemu/replay.h | 1 - include/sysemu/sysemu.h | 1 - include/sysemu/tpm.h | 1 - include/sysemu/tpm_backend.h | 1 - include/ui/console.h | 1 - migration/migration.h | 1 - net/clients.h | 1 - net/tap_int.h | 1 - qapi/qmp-dispatch.c | 1 - qemu-keymap.c | 1 - target/i386/cpu.c | 1 - tests/test-clone-visitor.c | 1 - tests/test-qapi-util.c | 1 - tests/test-qmp-event.c | 1 - tests/test-qobject-input-visitor.c | 1 - tests/test-qobject-output-visitor.c | 1 - tests/test-string-input-visitor.c | 1 - tests/test-string-output-visitor.c | 1 - tests/test-visitor-serialization.c | 2 -- ui/input-legacy.c | 1 - ui/input.c | 1 - ui/vnc.h | 1 - 35 files changed, 36 deletions(-)
backends/cryptodev.c +0 -1
@@ -26,7 +26,6 @@#include "hw/boards.h" #include "qapi/error.h" #include "qapi/visitor.h" -#include "qapi-types.h" #include "qapi-visit.h" #include "qemu/config-file.h" #include "qom/object_interfaces.h"
backends/hostmem.c +0 -1
@@ -14,7 +14,6 @@#include "hw/boards.h" #include "qapi/error.h" #include "qapi/visitor.h" -#include "qapi-types.h" #include "qapi-visit.h" #include "qemu/config-file.h" #include "qom/object_interfaces.h"
hmp.h +0 -1
@@ -16,7 +16,6 @@#include "qemu-common.h" #include "qemu/readline.h" -#include "qapi-types.h" #include "qapi/qmp/qdict.h" void hmp_info_name (Monitor *mon,const QDict *qdict);
include/block/block.h +0 -1
@@ -9,7 +9,6 @@#include "block/dirty-bitmap.h" #include "block/blockjob.h" #include "qapi/qmp/qobject.h" -#include "qapi-types.h" #include "qemu/hbitmap.h" /* block.c */
include/block/block_int.h +0 -1
@@ -31,7 +31,6 @@#include "qemu/coroutine.h" #include "qemu/stats64.h" #include "qemu/timer.h" -#include "qapi-types.h" #include "qemu/hbitmap.h" #include "block/snapshot.h" #include "qemu/main-loop.h"
include/block/qapi.h +0 -1
@@ -25,7 +25,6 @@#ifndef BLOCK_QAPI_H #define BLOCK_QAPI_H -#include "qapi-types.h" #include "block/block.h" #include "block/snapshot.h"
include/hw/acpi/acpi_dev_interface.h +0 -1
@@ -2,7 +2,6 @@#define ACPI_DEV_INTERFACE_H #include "qom/object.h" -#include "qapi-types.h" #include "hw/boards.h" /* These values are part of guest ABI, and can not be changed */
include/migration/failover.h +0 -1
@@ -14,7 +14,6 @@#define QEMU_FAILOVER_H #include "qemu-common.h" -#include "qapi-types.h" void failover_init_state (void ); FailoverStatus failover_set_state(FailoverStatus old_state,
include/net/net.h +0 -1
@@ -7,7 +7,6 @@#include "qemu/option.h" #include "net/queue.h" #include "migration/vmstate.h" -#include "qapi-types.h" #define MAC_FMT "%02X:%02X:%02X:%02X:%02X:%02X"#define MAC_ARG (x) ((uint8_t *)(x))[0], ((uint8_t *)(x))[1], \
include/net/slirp.h +0 -1
@@ -27,7 +27,6 @@#include "qemu-common.h" #include "qapi/qmp/qdict.h" #include "qemu/option.h" -#include "qapi-types.h" #ifdef CONFIG_SLIRP
include/net/tap.h +0 -1
@@ -27,7 +27,6 @@#define QEMU_NET_TAP_H #include "qemu-common.h" -#include "qapi-types.h" #include "standard-headers/linux/virtio_net.h" int tap_enable (NetClientState *nc);
include/qapi/qmp/qlit.h +0 -1
@@ -14,7 +14,6 @@#ifndef QLIT_H #define QLIT_H -#include "qapi-types.h" #include "qobject.h" typedef struct QLitDictEntry QLitDictEntry ;
include/sysemu/dump.h +0 -1
@@ -38,7 +38,6 @@#include "sysemu/dump-arch.h" #include "sysemu/memory_mapping.h" -#include "qapi-types.h" typedef struct QEMU_PACKED MakedumpfileHeader {char signature[16 ];/* = "makedumpfile" */
include/sysemu/replay.h +0 -1
@@ -12,7 +12,6 @@* */ -#include "qapi-types.h" #include "sysemu.h" /* replay clock kinds */
include/sysemu/sysemu.h +0 -1
@@ -5,7 +5,6 @@#include "qemu/option.h" #include "qemu/queue.h" #include "qemu/timer.h" -#include "qapi-types.h" #include "qemu/notify.h" #include "qemu/main-loop.h" #include "qemu/bitmap.h"
include/sysemu/tpm.h +0 -1
@@ -13,7 +13,6 @@#define QEMU_TPM_H #include "qom/object.h" -#include "qapi-types.h" int tpm_config_parse (QemuOptsList *opts_list,const char *optarg);int tpm_init (void );
include/sysemu/tpm_backend.h +0 -1
@@ -15,7 +15,6 @@#include "qom/object.h" #include "qemu-common.h" -#include "qapi-types.h" #include "qemu/option.h" #include "sysemu/tpm.h"
include/ui/console.h +0 -1
@@ -5,7 +5,6 @@#include "qom/object.h" #include "qapi/qmp/qdict.h" #include "qemu/notify.h" -#include "qapi-types.h" #include "qemu/error-report.h" #include "qapi/error.h"
migration/migration.h +0 -1
@@ -16,7 +16,6 @@#include "qemu-common.h" #include "qemu/thread.h" -#include "qapi-types.h" #include "exec/cpu-common.h" #include "qemu/coroutine_int.h" #include "hw/qdev.h"
net/clients.h +0 -1
@@ -25,7 +25,6 @@#define QEMU_NET_CLIENTS_H #include "net/net.h" -#include "qapi-types.h" int net_init_dump (const Netdev *netdev,const char *name,NetClientState *peer,Error **errp);
net/tap_int.h +0 -1
@@ -27,7 +27,6 @@#define NET_TAP_INT_H #include "qemu-common.h" -#include "qapi-types.h" int tap_open (char *ifname,int ifname_size,int *vnet_hdr,int vnet_hdr_required,int mq_required,Error **errp);
qapi/qmp-dispatch.c +0 -1
@@ -17,7 +17,6 @@#include "qapi/qmp/dispatch.h" #include "qapi/qmp/json-parser.h" #include "qapi/qmp/qjson.h" -#include "qapi-types.h" #include "qapi/qmp/qerror.h" static QDict *qmp_dispatch_check_obj (const QObject *request,Error **errp)
qemu-keymap.c +0 -1
@@ -11,7 +11,6 @@*/ #include "qemu/osdep.h" #include "qemu-common.h" -#include "qapi-types.h" #include "qemu/notify.h" #include "ui/input.h"
target/i386/cpu.c +0 -1
@@ -32,7 +32,6 @@#include "qapi/qmp/qerror.h" #include "qapi/qmp/types.h" -#include "qapi-types.h" #include "qapi-visit.h" #include "qapi/visitor.h" #include "qom/qom-qobject.h"
tests/test-clone-visitor.c +0 -1
@@ -11,7 +11,6 @@#include "qemu-common.h" #include "qapi/clone-visitor.h" -#include "test-qapi-types.h" #include "test-qapi-visit.h" #include "qapi/qmp/types.h"
tests/test-qapi-util.c +0 -1
@@ -12,7 +12,6 @@#include "qemu/osdep.h" #include "qapi/error.h" -#include "test-qapi-types.h" static void test_qapi_enum_parse (void ) {
tests/test-qmp-event.c +0 -1
@@ -14,7 +14,6 @@#include "qemu/osdep.h" #include "qemu-common.h" -#include "test-qapi-types.h" #include "test-qapi-visit.h" #include "test-qapi-event.h" #include "qapi/qmp/types.h"
tests/test-qobject-input-visitor.c +0 -1
@@ -16,7 +16,6 @@#include "qemu-common.h" #include "qapi/error.h" #include "qapi/qobject-input-visitor.h" -#include "test-qapi-types.h" #include "test-qapi-visit.h" #include "qapi/qmp/types.h" #include "qapi/qmp/qjson.h"
tests/test-qobject-output-visitor.c +0 -1
@@ -15,7 +15,6 @@#include "qemu-common.h" #include "qapi/error.h" #include "qapi/qobject-output-visitor.h" -#include "test-qapi-types.h" #include "test-qapi-visit.h" #include "qapi/qmp/types.h" #include "qapi/qmp/qjson.h"
tests/test-string-input-visitor.c +0 -1
@@ -15,7 +15,6 @@#include "qemu-common.h" #include "qapi/error.h" #include "qapi/string-input-visitor.h" -#include "test-qapi-types.h" #include "test-qapi-visit.h" #include "qapi/qmp/types.h"
tests/test-string-output-visitor.c +0 -1
@@ -15,7 +15,6 @@#include "qemu-common.h" #include "qapi/error.h" #include "qapi/string-output-visitor.h" -#include "test-qapi-types.h" #include "test-qapi-visit.h" #include "qapi/qmp/types.h"
tests/test-visitor-serialization.c +0 -2
@@ -15,7 +15,6 @@#include <float.h> #include "qemu-common.h" -#include "test-qapi-types.h" #include "test-qapi-visit.h" #include "qapi/error.h" #include "qapi/qmp/types.h"
@@ -24,7 +23,6 @@#include "qapi/qobject-output-visitor.h" #include "qapi/string-input-visitor.h" #include "qapi/string-output-visitor.h" -#include "qapi-types.h" #include "qapi-visit.h" #include "qapi/dealloc-visitor.h"
ui/input-legacy.c +0 -1
@@ -26,7 +26,6 @@#include "sysemu/sysemu.h" #include "ui/console.h" #include "qmp-commands.h" -#include "qapi-types.h" #include "ui/keymaps.h" #include "ui/input.h"
ui/input.c +0 -1
@@ -1,6 +1,5 @@#include "qemu/osdep.h" #include "sysemu/sysemu.h" -#include "qapi-types.h" #include "qemu/error-report.h" #include "qmp-commands.h" #include "trace.h"
ui/vnc.h +0 -1
@@ -42,7 +42,6 @@#include "keymaps.h" #include "vnc-palette.h" #include "vnc-enc-zrle.h" -#include "qapi-types.h" // #define _VNC_DEBUG 1
Signature · 1 line
2.13.6
Re: [Qemu-devel] [PATCH v2 03/19] Drop superfluous includes of qapi-types.h and test-qapi-types.h
Quoted 5 lines · Markus Armbruster
Reviewed-by Philippe Mathieu-Daudé <[email protected]>Signed-off-by Markus Armbruster <[email protected]>---
35 files changed, 36 deletions(-)
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
PATCH v2 4/19 Include qapi/error.h exactly where needed
In reply to Markus ArmbrusterThis cleanup makes the number of objects depending on qapi/error.h drop from 1910 (out of 4743) to 1612 in my "build everything" tree.
While there, separate #include from file comment with a blank line, and drop a useless comment on why qemu/osdep.h is included first.
--- audio/wavcapture.c | 1 + balloon.c | 1 + block.c | 2 ++ block/block-backend.c | 1 + block/iscsi.c | 1 + block/qapi.c | 1 + block/qcow2-cluster.c | 1 - block/qcow2.c | 2 ++ block/quorum.c | 1 + block/write-threshold.c | 1 + blockdev-nbd.c | 1 + blockdev.c | 1 + blockjob.c | 1 + chardev/char-ringbuf.c | 2 ++ chardev/char.c | 2 ++ chardev/spice.c | 1 + cpus.c | 2 +- crypto/hash.c | 1 - crypto/hmac.c | 1 - crypto/ivgen-essiv.c | 1 - crypto/ivgen-plain.c | 1 - crypto/ivgen-plain64.c | 1 - crypto/random-gnutls.c | 1 + crypto/random-platform.c | 1 + docs/devel/qapi-code-gen.txt | 2 -- dump.c | 1 + fsdev/qemu-fsdev-throttle.h | 1 - fsdev/qemu-fsdev.c | 3 ++- hmp.c | 1 + hw/9pfs/9p-local.c | 2 +- hw/9pfs/9p-proxy.c | 2 ++ hw/acpi/acpi-stub.c | 1 + hw/acpi/core.c | 2 ++ hw/acpi/memory_hotplug.c | 1 + hw/acpi/vmgenid.c | 1 + hw/adc/stm32f2xx_adc.c | 1 - hw/char/mcf_uart.c | 1 - hw/char/virtio-console.c | 1 + hw/core/qdev.c | 1 + hw/display/milkymist-tmu2.c | 1 + hw/display/qxl.c | 1 + hw/display/virtio-gpu-3d.c | 1 - hw/display/xlnx_dp.c | 1 + hw/i2c/ppc4xx_i2c.c | 1 - hw/i386/pc.c | 2 ++ hw/i386/pc_piix.c | 1 + hw/i386/pc_q35.c | 2 ++ hw/i386/xen/xen-hvm.c | 2 +- hw/ide/core.c | 2 ++ hw/intc/xics_pnv.c | 1 - hw/intc/xics_spapr.c | 1 - hw/ipmi/ipmi.c | 1 + hw/mips/mips_jazz.c | 1 + hw/mips/mips_malta.c | 1 + hw/misc/exynos4210_rng.c | 1 + hw/misc/mips_cmgcr.c | 1 - hw/misc/mps2-scc.c | 1 - hw/net/rocker/qmp-norocker.c | 1 + hw/net/rocker/rocker.c | 1 + hw/net/rocker/rocker_of_dpa.c | 1 + hw/net/virtio-net.c | 1 + hw/nios2/cpu_pic.c | 1 - hw/pci-bridge/i82801b11.c | 1 - hw/pci-bridge/ioh3420.c | 1 - hw/pci-bridge/xio3130_upstream.c | 1 - hw/pci-host/sabre.c | 1 - hw/pci/pci-stub.c | 1 + hw/pci/pci.c | 2 ++ hw/ppc/fdt.c | 1 - hw/ppc/pnv_bmc.c | 1 - hw/ppc/pnv_xscom.c | 1 - hw/ppc/ppc.c | 1 - hw/ppc/spapr_pci_vfio.c | 1 - hw/ppc/spapr_rtc.c | 3 ++- hw/s390x/s390-skeys.c | 1 + hw/scsi/esp.c | 1 - hw/scsi/vhost-scsi-common.c | 1 - hw/sd/sdhci.c | 1 - hw/smbios/smbios-stub.c | 1 + hw/sparc64/niagara.c | 1 - hw/sparc64/sun4u_iommu.c | 1 - hw/ssi/stm32f2xx_spi.c | 1 - hw/timer/m48t59.c | 1 - hw/timer/mc146818rtc.c | 2 ++ hw/usb/ccid-card-passthru.c | 1 - hw/virtio/virtio-balloon.c | 1 + hw/watchdog/watchdog.c | 1 + include/crypto/random.h | 1 - include/crypto/xts.h | 1 - include/hw/ide/internal.h | 1 - include/ui/console.h | 2 ++ iothread.c | 1 + migration/colo-failover.c | 1 + migration/colo.c | 1 + migration/exec.c | 1 - migration/fd.c | 1 - migration/migration.c | 1 + migration/ram.c | 2 ++ migration/savevm.c | 1 + monitor.c | 2 ++ nbd/common.c | 1 - net/filter-replay.c | 1 - net/filter-rewriter.c | 1 - net/net.c | 2 ++ net/vhost-user.c | 1 + numa.c | 1 + qdev-monitor.c | 1 + qga/commands-posix.c | 1 + qga/commands-win32.c | 2 ++ qga/commands.c | 1 + qga/main.c | 2 ++ qga/vss-win32.c | 1 + qmp.c | 1 + qobject/qnum.c | 1 - replay/replay-input.c | 1 - scripts/qapi-commands.py | 3 ++- scripts/qapi-event.py | 2 +- stubs/arch-query-cpu-def.c | 1 + stubs/arch-query-cpu-model-baseline.c | 1 + stubs/arch-query-cpu-model-comparison.c | 1 + stubs/arch-query-cpu-model-expansion.c | 1 + stubs/vmgenid.c | 1 + target/i386/cpu.c | 2 ++ target/i386/xsave_helper.c | 1 - target/nios2/helper.c | 1 - target/ppc/mmu-book3s-v3.c | 1 - target/ppc/mmu-hash64.c | 1 - target/ppc/mmu-radix64.c | 1 - target/ppc/mmu_helper.c | 1 - target/ppc/translate_init.c | 1 + target/s390x/excp_helper.c | 1 - target/s390x/helper.c | 1 - target/s390x/kvm.c | 1 + tests/check-qlist.c | 1 - tests/check-qnum.c | 1 - tests/io-channel-helpers.c | 1 - tests/test-aio-multithread.c | 1 - tests/test-qmp-commands.c | 1 + tests/test-qmp-event.c | 1 + tests/test-x86-cpuid-compat.c | 1 - tpm.c | 2 ++ trace/qmp.c | 1 + ui/console.c | 2 ++ ui/gtk.c | 1 + ui/input.c | 1 + ui/spice-core.c | 1 + ui/vnc.c | 1 + util/qemu-config.c | 1 + vl.c | 2 ++ 149 files changed, 116 insertions(+), 65 deletions(-)
audio/wavcapture.c +1 -0
@@ -1,6 +1,7 @@#include "qemu/osdep.h" #include "hw/hw.h" #include "monitor/monitor.h" +#include "qapi/error.h" #include "qemu/error-report.h" #include "audio.h"
balloon.c +1 -0
@@ -31,6 +31,7 @@#include "sysemu/balloon.h" #include "trace-root.h" #include "qmp-commands.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qapi/qmp/qjson.h"
block.c +2 -0
@@ -21,6 +21,7 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "block/trace.h" #include "block/block_int.h"
@@ -29,6 +30,7 @@#include "qemu/error-report.h" #include "module_block.h" #include "qemu/module.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qapi/qmp/qbool.h" #include "qapi/qmp/qjson.h"
block/block-backend.c +1 -0
@@ -18,6 +18,7 @@#include "sysemu/blockdev.h" #include "sysemu/sysemu.h" #include "qapi-event.h" +#include "qapi/error.h" #include "qemu/id.h" #include "trace.h" #include "migration/misc.h"
block/iscsi.c +1 -0
@@ -38,6 +38,7 @@#include "qemu/iov.h" #include "qemu/uuid.h" #include "qmp-commands.h" +#include "qapi/error.h" #include "qapi/qmp/qstring.h" #include "crypto/secret.h" #include "scsi/utils.h"
block/qapi.c +1 -0
@@ -29,6 +29,7 @@#include "block/write-threshold.h" #include "qmp-commands.h" #include "qapi-visit.h" +#include "qapi/error.h" #include "qapi/qobject-output-visitor.h" #include "qapi/qmp/types.h" #include "sysemu/block-backend.h"
block/qcow2-cluster.c +0 -1
@@ -25,7 +25,6 @@#include "qemu/osdep.h" #include <zlib.h> -#include "qapi/error.h" #include "qemu-common.h" #include "block/block_int.h" #include "block/qcow2.h"
block/qcow2.c +2 -0
@@ -21,6 +21,7 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "block/block_int.h" #include "sysemu/block-backend.h"
@@ -28,6 +29,7 @@#include <zlib.h> #include "block/qcow2.h" #include "qemu/error-report.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qapi/qmp/qbool.h" #include "qapi/qmp/types.h"
block/quorum.c +1 -0
@@ -16,6 +16,7 @@#include "qemu/osdep.h" #include "qemu/cutils.h" #include "block/block_int.h" +#include "qapi/error.h" #include "qapi/qmp/qbool.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qerror.h"
block/write-threshold.c +1 -0
@@ -16,6 +16,7 @@#include "block/write-threshold.h" #include "qemu/notify.h" #include "qapi-event.h" +#include "qapi/error.h" #include "qmp-commands.h"
blockdev-nbd.c +1 -0
@@ -13,6 +13,7 @@#include "sysemu/blockdev.h" #include "sysemu/block-backend.h" #include "hw/block/block.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "sysemu/sysemu.h" #include "qmp-commands.h"
blockdev.c +1 -0
@@ -42,6 +42,7 @@#include "qemu/config-file.h" #include "qapi/qmp/types.h" #include "qapi-visit.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qapi/qobject-output-visitor.h" #include "sysemu/sysemu.h"
blockjob.c +1 -0
@@ -29,6 +29,7 @@#include "block/blockjob_int.h" #include "block/block_int.h" #include "sysemu/block-backend.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qapi/qmp/qjson.h" #include "qemu/coroutine.h"
chardev/char-ringbuf.c +2 -0
@@ -21,9 +21,11 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "chardev/char.h" #include "qmp-commands.h" +#include "qapi/error.h" #include "qemu/base64.h" /* Ring buffer chardev */
chardev/char.c +2 -0
@@ -21,6 +21,7 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "qemu/cutils.h" #include "monitor/monitor.h"
@@ -30,6 +31,7 @@#include "chardev/char.h" #include "qmp-commands.h" #include "qapi-visit.h" +#include "qapi/error.h" #include "sysemu/replay.h" #include "qemu/help_option.h"
chardev/spice.c +1 -0
@@ -2,6 +2,7 @@#include "trace.h" #include "ui/qemu-spice.h" #include "chardev/char.h" +#include "qapi/error.h" #include "qemu/error-report.h" #include <spice.h> #include <spice/protocol.h>
cpus.c +1 -1
@@ -22,12 +22,12 @@* THE SOFTWARE. */ -/* Needed early for CONFIG_BSD etc. */ #include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/config-file.h" #include "cpu.h" #include "monitor/monitor.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qemu/error-report.h" #include "sysemu/sysemu.h"
crypto/hash.c +0 -1
@@ -19,7 +19,6 @@*/ #include "qemu/osdep.h" -#include "qapi/error.h" #include "crypto/hash.h" #include "hashpriv.h"
crypto/hmac.c +0 -1
@@ -10,7 +10,6 @@*/ #include "qemu/osdep.h" -#include "qapi/error.h" #include "crypto/hmac.h" #include "hmacpriv.h"
crypto/ivgen-essiv.c +0 -1
@@ -19,7 +19,6 @@*/ #include "qemu/osdep.h" -#include "qapi/error.h" #include "qemu/bswap.h" #include "crypto/ivgen-essiv.h"
crypto/ivgen-plain.c +0 -1
@@ -19,7 +19,6 @@*/ #include "qemu/osdep.h" -#include "qapi/error.h" #include "qemu/bswap.h" #include "crypto/ivgen-plain.h"
crypto/ivgen-plain64.c +0 -1
@@ -19,7 +19,6 @@*/ #include "qemu/osdep.h" -#include "qapi/error.h" #include "qemu/bswap.h" #include "crypto/ivgen-plain.h"
crypto/random-gnutls.c +1 -0
@@ -21,6 +21,7 @@#include "qemu/osdep.h" #include "crypto/random.h" +#include "qapi/error.h" #include <gnutls/gnutls.h> #include <gnutls/crypto.h>
crypto/random-platform.c +1 -0
@@ -21,6 +21,7 @@#include "qemu/osdep.h" #include "crypto/random.h" +#include "qapi/error.h" #ifdef _WIN32#include <wincrypt.h>
docs/devel/qapi-code-gen.txt +0 -2
@@ -1170,7 +1170,6 @@ Example: #include "example-qapi-types.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/dispatch.h" - #include "qapi/error.h" void example_qmp_init_marshal(QmpCommandList *cmds); UserDefOne *qmp_my_command(UserDefOneList *arg1, Error **errp);
@@ -1263,7 +1262,6 @@ Example: #ifndef EXAMPLE_QAPI_EVENT_H #define EXAMPLE_QAPI_EVENT_H - #include "qapi/error.h" #include "qapi/qmp/qdict.h" #include "example-qapi-types.h"
dump.c +1 -0
@@ -22,6 +22,7 @@#include "sysemu/sysemu.h" #include "sysemu/memory_mapping.h" #include "sysemu/cpus.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qmp-commands.h" #include "qapi-event.h"
fsdev/qemu-fsdev-throttle.h +0 -1
@@ -18,7 +18,6 @@#include "block/aio.h" #include "qemu/main-loop.h" #include "qemu/coroutine.h" -#include "qapi/error.h" #include "qemu/throttle.h" typedef struct FsThrottle {
fsdev/qemu-fsdev.c +2 -1
@@ -8,9 +8,10 @@* * This work is licensed under the terms of the GNU GPL, version 2. See * the COPYING file in the top-level directory. -* */ +#include "qemu/osdep.h" +#include "qapi/error.h" #include "qemu-fsdev.h" #include "qemu/queue.h" #include "qemu-common.h"
hmp.c +1 -0
@@ -27,6 +27,7 @@#include "qemu/sockets.h" #include "monitor/monitor.h" #include "monitor/qdev.h" +#include "qapi/error.h" #include "qapi/opts-visitor.h" #include "qapi/qmp/qerror.h" #include "qapi/string-input-visitor.h"
hw/9pfs/9p-local.c +1 -1
@@ -8,7 +8,6 @@* * This work is licensed under the terms of the GNU GPL, version 2. See * the COPYING file in the top-level directory. -* */ #include "qemu/osdep.h"
@@ -23,6 +22,7 @@#include <sys/socket.h> #include <sys/un.h> #include "qemu/xattr.h" +#include "qapi/error.h" #include "qemu/cutils.h" #include "qemu/error-report.h" #include <libgen.h>
hw/9pfs/9p-proxy.c +2 -0
@@ -9,10 +9,12 @@* This work is licensed under the terms of the GNU GPL, version 2. See * the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include <sys/socket.h> #include <sys/un.h> #include "9p.h" +#include "qapi/error.h" #include "qemu/cutils.h" #include "qemu/error-report.h" #include "fsdev/qemu-fsdev.h"
hw/acpi/acpi-stub.c +1 -0
@@ -19,6 +19,7 @@*/ #include "qemu/osdep.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qmp-commands.h" #include "hw/acpi/acpi.h"
hw/acpi/core.c +2 -0
@@ -18,12 +18,14 @@* Contributions after 2012-01-13 are licensed under the terms of the * GNU GPL, version 2 or (at your option) any later version. */ +#include "qemu/osdep.h" #include "sysemu/sysemu.h" #include "hw/hw.h" #include "hw/acpi/acpi.h" #include "hw/nvram/fw_cfg.h" #include "qemu/config-file.h" +#include "qapi/error.h" #include "qapi/opts-visitor.h" #include "qapi-visit.h" #include "qapi-event.h"
hw/acpi/memory_hotplug.c +1 -0
@@ -6,6 +6,7 @@#include "hw/qdev-core.h" #include "trace.h" #include "qapi-event.h" +#include "qapi/error.h" #define MEMORY_SLOTS_NUMBER "MDNR"#define MEMORY_HOTPLUG_IO_REGION "HPMR"
hw/acpi/vmgenid.c +1 -0
@@ -11,6 +11,7 @@*/ #include "qemu/osdep.h" +#include "qapi/error.h" #include "qmp-commands.h" #include "hw/acpi/acpi.h" #include "hw/acpi/aml-build.h"
hw/adc/stm32f2xx_adc.c +0 -1
@@ -25,7 +25,6 @@#include "qemu/osdep.h" #include "hw/sysbus.h" #include "hw/hw.h" -#include "qapi/error.h" #include "qemu/log.h" #include "hw/adc/stm32f2xx_adc.h"
hw/char/mcf_uart.c +0 -1
@@ -11,7 +11,6 @@#include "hw/m68k/mcf.h" #include "chardev/char-fe.h" #include "exec/address-spaces.h" -#include "qapi/error.h" typedef struct { SysBusDevice parent_obj;
hw/char/virtio-console.c +1 -0
@@ -16,6 +16,7 @@#include "trace.h" #include "hw/virtio/virtio-serial.h" #include "qapi-event.h" +#include "qapi/error.h" #define TYPE_VIRTIO_CONSOLE_SERIAL_PORT "virtserialport"#define VIRTIO_CONSOLE (obj) \
hw/core/qdev.c +1 -0
@@ -28,6 +28,7 @@#include "qemu/osdep.h" #include "hw/qdev.h" #include "sysemu/sysemu.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qapi/visitor.h" #include "qapi/qmp/qjson.h"
hw/display/milkymist-tmu2.c +1 -0
@@ -28,6 +28,7 @@#include "hw/hw.h" #include "hw/sysbus.h" #include "trace.h" +#include "qapi/error.h" #include "qemu/error-report.h" #include "qapi/error.h"
hw/display/qxl.c +1 -0
@@ -21,6 +21,7 @@#include "qemu/osdep.h" #include <zlib.h> +#include "qapi/error.h" #include "qemu-common.h" #include "qemu/timer.h" #include "qemu/queue.h"
hw/display/virtio-gpu-3d.c +0 -1
@@ -17,7 +17,6 @@#include "trace.h" #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-gpu.h" -#include "qapi/error.h" #ifdef CONFIG_VIRGL
hw/display/xlnx_dp.c +1 -0
@@ -23,6 +23,7 @@*/ #include "qemu/osdep.h" +#include "qapi/error.h" #include "qemu/log.h" #include "hw/display/xlnx_dp.h"
hw/i2c/ppc4xx_i2c.c +0 -1
@@ -25,7 +25,6 @@*/ #include "qemu/osdep.h" -#include "qapi/error.h" #include "qemu-common.h" #include "qemu/log.h" #include "cpu.h"
hw/i386/pc.c +2 -0
@@ -21,6 +21,7 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "hw/hw.h" #include "hw/i386/pc.h"
@@ -64,6 +65,7 @@#include "hw/pci/pci_host.h" #include "acpi-build.h" #include "hw/mem/pc-dimm.h" +#include "qapi/error.h" #include "qapi/visitor.h" #include "qapi-visit.h" #include "qom/cpu.h"
hw/i386/pc_piix.c +1 -0
@@ -47,6 +47,7 @@#include "exec/address-spaces.h" #include "hw/acpi/acpi.h" #include "cpu.h" +#include "qapi/error.h" #include "qemu/error-report.h" #ifdef CONFIG_XEN #include <xen/hvm/hvm_info_table.h>
hw/i386/pc_q35.c +2 -0
@@ -27,6 +27,7 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "hw/hw.h" #include "hw/loader.h"
@@ -48,6 +49,7 @@#include "hw/ide/pci.h" #include "hw/ide/ahci.h" #include "hw/usb.h" +#include "qapi/error.h" #include "qemu/error-report.h" #include "sysemu/numa.h"
hw/i386/xen/xen-hvm.c +1 -1
@@ -17,7 +17,7 @@#include "hw/xen/xen_common.h" #include "hw/xen/xen_backend.h" #include "qmp-commands.h" - +#include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/range.h" #include "sysemu/xen-mapcache.h"
hw/ide/core.c +2 -0
@@ -22,6 +22,7 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "hw/hw.h" #include "hw/pci/pci.h"
@@ -33,6 +34,7 @@#include "sysemu/dma.h" #include "hw/block/block.h" #include "sysemu/block-backend.h" +#include "qapi/error.h" #include "qemu/cutils.h" #include "hw/ide/internal.h"
hw/intc/xics_pnv.c +0 -1
@@ -19,7 +19,6 @@#include "qemu/osdep.h" #include "sysemu/sysemu.h" -#include "qapi/error.h" #include "qemu/log.h" #include "hw/ppc/xics.h"
hw/intc/xics_spapr.c +0 -1
@@ -34,7 +34,6 @@#include "hw/ppc/xics.h" #include "hw/ppc/fdt.h" #include "qapi/visitor.h" -#include "qapi/error.h" /* * Guest interfaces
hw/ipmi/ipmi.c +1 -0
@@ -28,6 +28,7 @@#include "sysemu/sysemu.h" #include "qmp-commands.h" #include "qom/object_interfaces.h" +#include "qapi/error.h" #include "qapi/visitor.h" static uint32_t ipmi_current_uuid =1 ;
hw/mips/mips_jazz.c +1 -0
@@ -45,6 +45,7 @@#include "hw/sysbus.h" #include "exec/address-spaces.h" #include "sysemu/qtest.h" +#include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/help_option.h"
hw/mips/mips_malta.c +1 -0
@@ -51,6 +51,7 @@#include "hw/sysbus.h" /* SysBusDevice */ #include "qemu/host-utils.h" #include "sysemu/qtest.h" +#include "qapi/error.h" #include "qemu/error-report.h" #include "hw/empty_slot.h" #include "sysemu/kvm.h"
hw/misc/exynos4210_rng.c +1 -0
@@ -20,6 +20,7 @@#include "qemu/osdep.h" #include "crypto/random.h" #include "hw/sysbus.h" +#include "qapi/error.h" #include "qemu/log.h" #define DEBUG_EXYNOS_RNG 0
hw/misc/mips_cmgcr.c +0 -1
@@ -10,7 +10,6 @@*/ #include "qemu/osdep.h" -#include "qapi/error.h" #include "qemu/log.h" #include "hw/hw.h" #include "hw/sysbus.h"
hw/misc/mps2-scc.c +0 -1
@@ -19,7 +19,6 @@#include "qemu/osdep.h" #include "qemu/log.h" -#include "qapi/error.h" #include "trace.h" #include "hw/sysbus.h" #include "hw/registerfields.h"
hw/net/rocker/qmp-norocker.c +1 -0
@@ -18,6 +18,7 @@#include "qemu/osdep.h" #include "qemu-common.h" #include "qmp-commands.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" RockerSwitch *qmp_query_rocker (const char *name,Error **errp)
hw/net/rocker/rocker.c +1 -0
@@ -21,6 +21,7 @@#include "hw/pci/msix.h" #include "net/net.h" #include "net/eth.h" +#include "qapi/error.h" #include "qemu/iov.h" #include "qemu/bitops.h" #include "qmp-commands.h"
hw/net/rocker/rocker_of_dpa.c +1 -0
@@ -16,6 +16,7 @@#include "qemu/osdep.h" #include "net/eth.h" +#include "qapi/error.h" #include "qemu/iov.h" #include "qemu/timer.h" #include "qmp-commands.h"
hw/net/virtio-net.c +1 -0
@@ -22,6 +22,7 @@#include "hw/virtio/virtio-net.h" #include "net/vhost_net.h" #include "hw/virtio/virtio-bus.h" +#include "qapi/error.h" #include "qapi/qmp/qjson.h" #include "qapi-event.h" #include "hw/virtio/virtio-access.h"
hw/nios2/cpu_pic.c +0 -1
@@ -19,7 +19,6 @@*/ #include "qemu/osdep.h" -#include "qapi/error.h" #include "qemu-common.h" #include "cpu.h"
hw/pci-bridge/i82801b11.c +0 -1
@@ -44,7 +44,6 @@#include "qemu/osdep.h" #include "hw/pci/pci.h" #include "hw/i386/ich9.h" -#include "qapi/error.h" /*****************************************************************************/
hw/pci-bridge/ioh3420.c +0 -1
@@ -25,7 +25,6 @@#include "hw/pci/msi.h" #include "hw/pci/pcie.h" #include "ioh3420.h" -#include "qapi/error.h" #define PCI_DEVICE_ID_IOH_EPORT 0x3420/* D0:F0 express mode */ #define PCI_DEVICE_ID_IOH_REV 0x2
hw/pci-bridge/xio3130_upstream.c +0 -1
@@ -24,7 +24,6 @@#include "hw/pci/msi.h" #include "hw/pci/pcie.h" #include "xio3130_upstream.h" -#include "qapi/error.h" #define PCI_DEVICE_ID_TI_XIO3130U 0x8232/* upstream port */ #define XIO3130_REVISION 0x2
hw/pci-host/sabre.c +0 -1
@@ -34,7 +34,6 @@#include "hw/pci-host/sabre.h" #include "sysemu/sysemu.h" #include "exec/address-spaces.h" -#include "qapi/error.h" #include "qemu/log.h" #include "trace.h"
hw/pci/pci-stub.c +1 -0
@@ -21,6 +21,7 @@#include "qemu/osdep.h" #include "sysemu/sysemu.h" #include "monitor/monitor.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "hw/pci/pci.h" #include "qmp-commands.h"
hw/pci/pci.c +2 -0
@@ -21,6 +21,7 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "hw/hw.h" #include "hw/pci/pci.h"
@@ -40,6 +41,7 @@#include "exec/address-spaces.h" #include "hw/hotplug.h" #include "hw/boards.h" +#include "qapi/error.h" #include "qemu/cutils.h" //#define DEBUG_PCI
hw/ppc/fdt.c +0 -1
@@ -8,7 +8,6 @@*/ #include "qemu/osdep.h" -#include "qapi/error.h" #include "target/ppc/cpu.h" #include "hw/ppc/fdt.h"
hw/ppc/pnv_bmc.c +0 -1
@@ -20,7 +20,6 @@#include "hw/hw.h" #include "sysemu/sysemu.h" #include "target/ppc/cpu.h" -#include "qapi/error.h" #include "qemu/log.h" #include "hw/ipmi/ipmi.h" #include "hw/ppc/fdt.h"
hw/ppc/pnv_xscom.c +0 -1
@@ -17,7 +17,6 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. */ #include "qemu/osdep.h" -#include "qapi/error.h" #include "hw/hw.h" #include "qemu/log.h" #include "sysemu/hw_accel.h"
hw/ppc/ppc.c +0 -1
@@ -33,7 +33,6 @@#include "hw/timer/m48t59.h" #include "qemu/log.h" #include "qemu/error-report.h" -#include "qapi/error.h" #include "hw/loader.h" #include "sysemu/kvm.h" #include "kvm_ppc.h"
hw/ppc/spapr_pci_vfio.c +0 -1
@@ -19,7 +19,6 @@#include "qemu/osdep.h" #include <linux/vfio.h> -#include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" #include "hw/ppc/spapr.h"
hw/ppc/spapr_rtc.c +2 -1
@@ -23,14 +23,15 @@* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. -* */ +#include "qemu/osdep.h" #include "cpu.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" #include "hw/ppc/spapr.h" #include "qapi-event.h" +#include "qapi/error.h" #include "qemu/cutils.h" void spapr_rtc_read (sPAPRRTCState *rtc,struct tm *tm,uint32_t *ns)
hw/s390x/s390-skeys.c +1 -0
@@ -13,6 +13,7 @@#include "hw/boards.h" #include "qmp-commands.h" #include "hw/s390x/storage-keys.h" +#include "qapi/error.h" #include "qemu/error-report.h" #include "sysemu/kvm.h" #include "migration/register.h"
hw/scsi/esp.c +0 -1
@@ -27,7 +27,6 @@#include "hw/sysbus.h" #include "hw/scsi/esp.h" #include "trace.h" -#include "qapi/error.h" #include "qemu/log.h" /*
hw/scsi/vhost-scsi-common.c +0 -1
@@ -16,7 +16,6 @@*/ #include "qemu/osdep.h" -#include "qapi/error.h" #include "qemu/error-report.h" #include "migration/migration.h" #include "hw/virtio/vhost.h"
hw/sd/sdhci.c +0 -1
@@ -32,7 +32,6 @@#include "qemu/bitops.h" #include "hw/sd/sdhci.h" #include "sdhci-internal.h" -#include "qapi/error.h" #include "qemu/log.h" #include "trace.h"
hw/smbios/smbios-stub.c +1 -0
@@ -21,6 +21,7 @@*/ #include "qemu/osdep.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qmp-commands.h" #include "hw/smbios/smbios.h"
hw/sparc64/niagara.c +0 -1
@@ -23,7 +23,6 @@*/ #include "qemu/osdep.h" -#include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" #include "hw/hw.h"
hw/sparc64/sun4u_iommu.c +0 -1
@@ -28,7 +28,6 @@#include "hw/sysbus.h" #include "hw/sparc/sun4u_iommu.h" #include "exec/address-spaces.h" -#include "qapi/error.h" #include "qemu/log.h" #include "trace.h"
hw/ssi/stm32f2xx_spi.c +0 -1
@@ -23,7 +23,6 @@*/ #include "qemu/osdep.h" -#include "qapi/error.h" #include "qemu/log.h" #include "hw/ssi/stm32f2xx_spi.h"
hw/timer/m48t59.c +0 -1
@@ -25,7 +25,6 @@#include "qemu/osdep.h" #include "hw/hw.h" #include "hw/timer/m48t59.h" -#include "qapi/error.h" #include "qemu/timer.h" #include "sysemu/sysemu.h" #include "hw/sysbus.h"
hw/timer/mc146818rtc.c +2 -0
@@ -21,6 +21,7 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "qemu/cutils.h" #include "qemu/bcd.h"
@@ -29,6 +30,7 @@#include "sysemu/sysemu.h" #include "sysemu/replay.h" #include "hw/timer/mc146818rtc.h" +#include "qapi/error.h" #include "qapi/visitor.h" #include "qapi-event.h" #include "qmp-commands.h"
hw/usb/ccid-card-passthru.c +0 -1
@@ -9,7 +9,6 @@*/ #include "qemu/osdep.h" -#include "qapi/error.h" #include <cacard/vscard_common.h> #include "chardev/char-fe.h" #include "qemu/error-report.h"
hw/virtio/virtio-balloon.c +1 -0
@@ -23,6 +23,7 @@#include "hw/virtio/virtio-balloon.h" #include "sysemu/kvm.h" #include "exec/address-spaces.h" +#include "qapi/error.h" #include "qapi/visitor.h" #include "qapi-event.h" #include "trace.h"
hw/watchdog/watchdog.c +1 -0
@@ -23,6 +23,7 @@#include "qemu/option.h" #include "qemu/config-file.h" #include "qemu/queue.h" +#include "qapi/error.h" #include "qapi/qmp/types.h" #include "sysemu/sysemu.h" #include "sysemu/watchdog.h"
include/crypto/random.h +0 -1
@@ -22,7 +22,6 @@#define QCRYPTO_RANDOM_H #include "qemu-common.h" -#include "qapi/error.h" /**
include/crypto/xts.h +0 -1
@@ -27,7 +27,6 @@#define QCRYPTO_XTS_H #include "qemu-common.h" -#include "qapi/error.h" #define XTS_BLOCK_SIZE 16
include/hw/ide/internal.h +0 -1
@@ -12,7 +12,6 @@#include "sysemu/sysemu.h" #include "hw/block/block.h" #include "scsi/constants.h" -#include "qapi/error.h" /* debug IDE devices */ #define USE_DMA_CDROM
include/ui/console.h +2 -0
@@ -6,7 +6,9 @@#include "qapi/qmp/qdict.h" #include "qemu/notify.h" #include "qemu/error-report.h" +#ifndef CONFIG_VNC #include "qapi/error.h" +#endif #ifdef CONFIG_OPENGL # include <epoxy/gl.h>
iothread.c +1 -0
@@ -19,6 +19,7 @@#include "block/block.h" #include "sysemu/iothread.h" #include "qmp-commands.h" +#include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/rcu.h" #include "qemu/main-loop.h"
migration/colo-failover.c +1 -0
@@ -16,6 +16,7 @@#include "qemu/main-loop.h" #include "migration.h" #include "qmp-commands.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qemu/error-report.h" #include "trace.h"
migration/colo.c +1 -0
@@ -12,6 +12,7 @@#include "qemu/osdep.h" #include "sysemu/sysemu.h" +#include "qapi/error.h" #include "qemu-file-channel.h" #include "migration.h" #include "qemu-file.h"
migration/exec.c +0 -1
@@ -18,7 +18,6 @@*/ #include "qemu/osdep.h" -#include "qapi/error.h" #include "channel.h" #include "exec.h" #include "io/channel-command.h"
migration/fd.c +0 -1
@@ -15,7 +15,6 @@*/ #include "qemu/osdep.h" -#include "qapi/error.h" #include "channel.h" #include "fd.h" #include "monitor/monitor.h"
migration/migration.c +1 -0
@@ -30,6 +30,7 @@#include "qemu-file.h" #include "migration/vmstate.h" #include "block/block.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qemu/rcu.h" #include "block.h"
migration/ram.c +2 -0
@@ -25,6 +25,7 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "cpu.h" #include <zlib.h>
@@ -42,6 +43,7 @@#include "postcopy-ram.h" #include "migration/page_cache.h" #include "qemu/error-report.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "trace.h" #include "exec/ram_addr.h"
migration/savevm.c +1 -0
@@ -40,6 +40,7 @@#include "qemu-file.h" #include "savevm.h" #include "postcopy-ram.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qemu/error-report.h" #include "sysemu/cpus.h"
monitor.c +2 -0
@@ -21,6 +21,7 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include <dirent.h> #include "qemu-common.h"
@@ -70,6 +71,7 @@#include "hmp.h" #include "qemu/thread.h" #include "block/qapi.h" +#include "qapi/error.h" #include "qapi/qmp-event.h" #include "qapi-event.h" #include "qmp-introspect.h"
nbd/common.c +0 -1
@@ -17,7 +17,6 @@*/ #include "qemu/osdep.h" -#include "qapi/error.h" #include "trace.h" #include "nbd-internal.h"
net/filter-replay.c +0 -1
@@ -11,7 +11,6 @@#include "qemu/osdep.h" #include "clients.h" -#include "qapi/error.h" #include "qemu-common.h" #include "qemu/error-report.h" #include "qemu/iov.h"
net/filter-rewriter.c +0 -1
@@ -15,7 +15,6 @@#include "net/filter.h" #include "net/net.h" #include "qemu-common.h" -#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qemu/error-report.h" #include "qapi-visit.h"
net/net.c +2 -0
@@ -21,6 +21,7 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "net/net.h"
@@ -43,6 +44,7 @@#include "qemu/iov.h" #include "qemu/main-loop.h" #include "qapi-visit.h" +#include "qapi/error.h" #include "qapi/opts-visitor.h" #include "sysemu/sysemu.h" #include "sysemu/qtest.h"
net/vhost-user.c +1 -0
@@ -13,6 +13,7 @@#include "net/vhost_net.h" #include "net/vhost-user.h" #include "chardev/char-fe.h" +#include "qapi/error.h" #include "qemu/config-file.h" #include "qemu/error-report.h" #include "qmp-commands.h"
numa.c +1 -0
@@ -30,6 +30,7 @@#include "qom/cpu.h" #include "qemu/error-report.h" #include "qapi-visit.h" +#include "qapi/error.h" #include "qapi/opts-visitor.h" #include "hw/boards.h" #include "sysemu/hostmem.h"
qdev-monitor.c +1 -0
@@ -24,6 +24,7 @@#include "monitor/qdev.h" #include "qmp-commands.h" #include "sysemu/arch_init.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qemu/config-file.h" #include "qemu/error-report.h"
qga/commands-posix.c +1 -0
@@ -18,6 +18,7 @@#include <dirent.h> #include "qga/guest-agent-core.h" #include "qga-qmp-commands.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qemu/queue.h" #include "qemu/host-utils.h"
qga/commands-win32.c +2 -0
@@ -14,6 +14,7 @@#ifndef _WIN32_WINNT# define _WIN32_WINNT 0x0600#endif +#include "qemu/osdep.h" #include <wtypes.h> #include <powrprof.h>
@@ -34,6 +35,7 @@#include "qga/guest-agent-core.h" #include "qga/vss-win32.h" #include "qga-qmp-commands.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qemu/queue.h" #include "qemu/host-utils.h"
qga/commands.c +1 -0
@@ -13,6 +13,7 @@#include "qemu/osdep.h" #include "qga/guest-agent-core.h" #include "qga-qmp-commands.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qemu/base64.h" #include "qemu/cutils.h"
qga/main.c +2 -0
@@ -10,6 +10,7 @@* This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include <getopt.h> #include <glib/gstdio.h>
@@ -23,6 +24,7 @@#include "qga/guest-agent-core.h" #include "qemu/module.h" #include "qapi/qmp/qerror.h" +#include "qapi/error.h" #include "qapi/qmp/dispatch.h" #include "qga/channel.h" #include "qemu/bswap.h"
qga/vss-win32.c +1 -0
@@ -12,6 +12,7 @@#include "qemu/osdep.h" #include <windows.h> +#include "qapi/error.h" #include "qemu/error-report.h" #include "qga/guest-agent-core.h" #include "qga/vss-win32.h"
qmp.c +1 -0
@@ -30,6 +30,7 @@#include "sysemu/blockdev.h" #include "sysemu/block-backend.h" #include "qom/qom-qobject.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qapi/qmp/qobject.h" #include "qapi/qobject-input-visitor.h"
qobject/qnum.c +0 -1
@@ -13,7 +13,6 @@*/ #include "qemu/osdep.h" -#include "qapi/error.h" #include "qapi/qmp/qnum.h" #include "qapi/qmp/qobject.h" #include "qemu-common.h"
replay/replay-input.c +0 -1
@@ -10,7 +10,6 @@*/ #include "qemu/osdep.h" -#include "qapi/error.h" #include "qemu-common.h" #include "sysemu/replay.h" #include "replay-internal.h"
scripts/qapi-commands.py +2 -1
@@ -289,6 +289,7 @@ h_comment = ''' c_comment, h_comment) fdef.write(mcgen(''' + #include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/module.h"
@@ -297,6 +298,7 @@ fdef.write(mcgen(''' #include "qapi/qobject-output-visitor.h" #include "qapi/qobject-input-visitor.h" #include "qapi/dealloc-visitor.h" +#include "qapi/error.h" #include "%(prefix)sqapi-types.h" #include "%(prefix)sqapi-visit.h" #include "%(prefix)sqmp-commands.h"
@@ -308,7 +310,6 @@ fdecl.write(mcgen(''' #include "%(prefix)sqapi-types.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/dispatch.h" -#include "qapi/error.h" void %(c_prefix)sqmp_init_marshal(QmpCommandList *cmds); ''',
scripts/qapi-event.py +1 -1
@@ -209,6 +209,7 @@ fdef.write(mcgen(''' #include "qemu-common.h" #include "%(prefix)sqapi-event.h" #include "%(prefix)sqapi-visit.h" +#include "qapi/error.h" #include "qapi/qobject-output-visitor.h" #include "qapi/qmp-event.h"
@@ -216,7 +217,6 @@ fdef.write(mcgen(''' prefix=prefix)) fdecl.write(mcgen(''' -#include "qapi/error.h" #include "qapi/util.h" #include "qapi/qmp/qdict.h" #include "%(prefix)sqapi-types.h"
stubs/arch-query-cpu-def.c +1 -0
@@ -1,6 +1,7 @@#include "qemu/osdep.h" #include "qemu-common.h" #include "sysemu/arch_init.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" CpuDefinitionInfoList *arch_query_cpu_definitions (Error **errp)
stubs/arch-query-cpu-model-baseline.c +1 -0
@@ -1,6 +1,7 @@#include "qemu/osdep.h" #include "qemu-common.h" #include "sysemu/arch_init.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" CpuModelBaselineInfo *arch_query_cpu_model_baseline(CpuModelInfo *modela,
stubs/arch-query-cpu-model-comparison.c +1 -0
@@ -1,6 +1,7 @@#include "qemu/osdep.h" #include "qemu-common.h" #include "sysemu/arch_init.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" CpuModelCompareInfo *arch_query_cpu_model_comparison(CpuModelInfo *modela,
stubs/arch-query-cpu-model-expansion.c +1 -0
@@ -1,6 +1,7 @@#include "qemu/osdep.h" #include "qemu-common.h" #include "sysemu/arch_init.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" CpuModelExpansionInfo *arch_query_cpu_model_expansion(CpuModelExpansionType type,
stubs/vmgenid.c +1 -0
@@ -1,5 +1,6 @@#include "qemu/osdep.h" #include "qmp-commands.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" GuidInfo *qmp_query_vm_generation_id (Error **errp)
target/i386/cpu.c +2 -0
@@ -16,6 +16,7 @@* You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ +#include "qemu/osdep.h" #include "qemu/cutils.h"
@@ -29,6 +30,7 @@#include "qemu/error-report.h" #include "qemu/option.h" #include "qemu/config-file.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qapi/qmp/types.h"
target/i386/xsave_helper.c +0 -1
@@ -3,7 +3,6 @@* See the COPYING file in the top-level directory. */ #include "qemu/osdep.h" -#include "qapi/error.h" #include "qemu-common.h" #include "cpu.h"
target/nios2/helper.c +0 -1
@@ -22,7 +22,6 @@#include "cpu.h" #include "qemu/host-utils.h" -#include "qapi/error.h" #include "exec/exec-all.h" #include "exec/log.h" #include "exec/helper-proto.h"
target/ppc/mmu-book3s-v3.c +0 -1
@@ -18,7 +18,6 @@*/ #include "qemu/osdep.h" -#include "qapi/error.h" #include "cpu.h" #include "mmu-hash64.h" #include "mmu-book3s-v3.h"
target/ppc/mmu-hash64.c +0 -1
@@ -18,7 +18,6 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. */ #include "qemu/osdep.h" -#include "qapi/error.h" #include "cpu.h" #include "exec/exec-all.h" #include "exec/helper-proto.h"
target/ppc/mmu-radix64.c +0 -1
@@ -18,7 +18,6 @@*/ #include "qemu/osdep.h" -#include "qapi/error.h" #include "cpu.h" #include "exec/exec-all.h" #include "exec/helper-proto.h"
target/ppc/mmu_helper.c +0 -1
@@ -17,7 +17,6 @@* License along with this library; if not, see <http://www.gnu.org/licenses/>. */ #include "qemu/osdep.h" -#include "qapi/error.h" #include "cpu.h" #include "exec/helper-proto.h" #include "sysemu/kvm.h"
target/ppc/translate_init.c +1 -0
@@ -29,6 +29,7 @@#include "mmu-hash32.h" #include "mmu-hash64.h" #include "qemu/error-report.h" +#include "qapi/error.h" #include "qapi/visitor.h" #include "hw/qdev-properties.h" #include "hw/ppc/ppc.h"
target/s390x/excp_helper.c +0 -1
@@ -19,7 +19,6 @@*/ #include "qemu/osdep.h" -#include "qapi/error.h" #include "cpu.h" #include "internal.h" #include "qemu/timer.h"
target/s390x/helper.c +0 -1
@@ -19,7 +19,6 @@*/ #include "qemu/osdep.h" -#include "qapi/error.h" #include "cpu.h" #include "internal.h" #include "exec/gdbstub.h"
target/s390x/kvm.c +1 -0
@@ -31,6 +31,7 @@#include "cpu.h" #include "internal.h" #include "kvm_s390x.h" +#include "qapi/error.h" #include "qemu/error-report.h" #include "qemu/timer.h" #include "sysemu/sysemu.h"
tests/check-qlist.c +0 -1
@@ -11,7 +11,6 @@*/ #include "qemu/osdep.h" -#include "qapi/error.h" #include "qapi/qmp/qnum.h" #include "qapi/qmp/qlist.h"
tests/check-qnum.c +0 -1
@@ -15,7 +15,6 @@#include "qemu/osdep.h" #include "qapi/qmp/qnum.h" -#include "qapi/error.h" #include "qemu-common.h" /*
tests/io-channel-helpers.c +0 -1
@@ -20,7 +20,6 @@#include "qemu/osdep.h" #include "io-channel-helpers.h" -#include "qapi/error.h" #include "qemu/iov.h" struct QIOChannelTest {
tests/test-aio-multithread.c +0 -1
@@ -12,7 +12,6 @@#include "qemu/osdep.h" #include "block/aio.h" -#include "qapi/error.h" #include "qemu/coroutine.h" #include "qemu/thread.h" #include "qemu/error-report.h"
tests/test-qmp-commands.c +1 -0
@@ -2,6 +2,7 @@#include "qemu-common.h" #include "qapi/qmp/types.h" #include "test-qmp-commands.h" +#include "qapi/error.h" #include "qapi/qmp/dispatch.h" #include "qemu/module.h" #include "qapi/qobject-input-visitor.h"
tests/test-qmp-event.c +1 -0
@@ -16,6 +16,7 @@#include "qemu-common.h" #include "test-qapi-visit.h" #include "test-qapi-event.h" +#include "qapi/error.h" #include "qapi/qmp/types.h" #include "qapi/qmp/qobject.h" #include "qapi/qmp-event.h"
tests/test-x86-cpuid-compat.c +0 -1
@@ -1,6 +1,5 @@#include "qemu/osdep.h" #include "qemu-common.h" -#include "qapi/error.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qnum.h" #include "qapi/qmp/qbool.h"
tpm.c +2 -0
@@ -11,8 +11,10 @@* * Based on net.c */ +#include "qemu/osdep.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "sysemu/tpm_backend.h" #include "sysemu/tpm.h"
trace/qmp.c +1 -0
@@ -8,6 +8,7 @@*/ #include "qemu/osdep.h" +#include "qapi/error.h" #include "qmp-commands.h" #include "trace/control.h"
ui/console.c +2 -0
@@ -21,10 +21,12 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "qemu-common.h" #include "ui/console.h" #include "hw/qdev-core.h" +#include "qapi/error.h" #include "qemu/timer.h" #include "qmp-commands.h" #include "chardev/char-fe.h"
ui/gtk.c +1 -0
@@ -36,6 +36,7 @@#include "qemu/osdep.h" #include "qemu-common.h" +#include "qapi/error.h" #include "qemu/cutils.h" #include "ui/console.h"
ui/input.c +1 -0
@@ -1,5 +1,6 @@#include "qemu/osdep.h" #include "sysemu/sysemu.h" +#include "qapi/error.h" #include "qemu/error-report.h" #include "qmp-commands.h" #include "trace.h"
ui/spice-core.c +1 -0
@@ -30,6 +30,7 @@#include "qemu-x509.h" #include "qemu/sockets.h" #include "qmp-commands.h" +#include "qapi/error.h" #include "qapi/qmp/qbool.h" #include "qapi/qmp/qstring.h" #include "qapi/qmp/qjson.h"
ui/vnc.c +1 -0
@@ -34,6 +34,7 @@#include "qemu/timer.h" #include "qemu/acl.h" #include "qemu/config-file.h" +#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qapi/qmp/types.h" #include "qmp-commands.h"
util/qemu-config.c +1 -0
@@ -1,4 +1,5 @@#include "qemu/osdep.h" +#include "qapi/error.h" #include "qemu-common.h" #include "qemu/error-report.h" #include "qemu/option.h"
vl.c +2 -0
@@ -21,7 +21,9 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" +#include "qapi/error.h" #include "qemu-version.h" #include "qemu/cutils.h" #include "qemu/help_option.h"
Signature · 1 line
2.13.6
Re: [Qemu-devel] [PATCH v2 04/19] Include qapi/error.h exactly where needed
Quoted 13 lines · Markus Armbruster
This cleanup makes the number of objects depending on
qapi/error.hdrop from 1910 (out of 4743) to 1612 in my "build everything" tree.While there, separate #include from file comment with a blank line, and drop a useless comment on why
qemu/osdep.his included first.Signed-off-by Markus Armbruster <[email protected]>Reviewed-by Eric Blake <[email protected]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>---
+++
b/block/write-threshold.c
block/write-threshold.c line 22
Quoted 7 lines
block/write-threshold.c +1
-0@@ -16,6 +16,7 @@#include "block/write-threshold.h" #include "qemu/notify.h" #include "qapi-event.h" +#include "qapi/error.h" #include "qmp-commands.h"
Worth squashing a double blank line while here?
hw/pci-bridge/i82801b11.c line 49
Quoted 9 lines
+++
b/hw/pci-bridge/i82801b11.chw/pci-bridge/i82801b11.c +0
-1@@ -44,7 +44,6 @@#include "qemu/osdep.h" #include "hw/pci/pci.h" #include "hw/i386/ich9.h" -#include "qapi/error.h" /*****************************************************************************/
And here
Quoted 14 lines
+++
b/include/crypto/random.hinclude/crypto/random.h +0
-1@@ -22,7 +22,6 @@#define QCRYPTO_RANDOM_H #include "qemu-common.h" -#include "qapi/error.h" /** include/crypto/xts.h +0
-0
include/crypto/xts.h line 32
Quoted 7 lines
include/crypto/xts.h +0
-1@@ -27,7 +27,6 @@#define QCRYPTO_XTS_H #include "qemu-common.h" -#include "qapi/error.h" #define XTS_BLOCK_SIZE 16
And here
include/crypto/xts.h line 11
Quoted 8 lines
+++
b/include/ui/console.hinclude/crypto/xts.h +2
-0@@ -6,7 +6,9 @@#include "qapi/qmp/qdict.h" #include "qemu/notify.h" #include "qemu/error-report.h" +#ifndef CONFIG_VNC #include "qapi/error.h" +#endif
Interesting conditional; it's because of the static inline fallbacks that are also conditional. Makes sense. An alternative would be having the fallbacks be in a .c rather than static inline in the .h, but it doesn't bother me enough to worry about it.
My R-b stands whether or not you make more whitespace tweaks.
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
Re: [Qemu-devel] [PATCH v2 04/19] Include qapi/error.h exactly where needed
Quoted 12 lines · Eric Blake
Quoted 10 lines · Markus Armbruster
This cleanup makes the number of objects depending on
qapi/error.hdrop from 1910 (out of 4743) to 1612 in my "build everything" tree.While there, separate #include from file comment with a blank line, and drop a useless comment on why
qemu/osdep.his included first.Signed-off-by Markus Armbruster <[email protected]>Reviewed-by Eric Blake <[email protected]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>---
Quoted 11 lines
block/write-threshold.c line 22
Quoted 9 lines
+++
b/block/write-threshold.cblock/write-threshold.c +1
-0@@ -16,6 +16,7 @@#include "block/write-threshold.h" #include "qemu/notify.h" #include "qapi-event.h" +#include "qapi/error.h" #include "qmp-commands.h" Worth squashing a double blank line while here?
Yes. Same for the other too.
Quoted 36 lines
hw/pci-bridge/i82801b11.c line 49
Quoted 9 lines
+++
b/hw/pci-bridge/i82801b11.chw/pci-bridge/i82801b11.c +0
-1@@ -44,7 +44,6 @@#include "qemu/osdep.h" #include "hw/pci/pci.h" #include "hw/i386/ich9.h" -#include "qapi/error.h" /*****************************************************************************/ And here
Quoted 14 lines
+++
b/include/crypto/random.hinclude/crypto/random.h +0
-1@@ -22,7 +22,6 @@#define QCRYPTO_RANDOM_H #include "qemu-common.h" -#include "qapi/error.h" /** include/crypto/xts.h +0
-0include/crypto/xts.h line 32
Quoted 7 lines
include/crypto/xts.h +0
-1@@ -27,7 +27,6 @@#define QCRYPTO_XTS_H #include "qemu-common.h" -#include "qapi/error.h" #define XTS_BLOCK_SIZE 16And here
Quoted 13 lines
include/crypto/xts.h line 11
Quoted 8 lines
+++
b/include/ui/console.hinclude/crypto/xts.h +2
-0@@ -6,7 +6,9 @@#include "qapi/qmp/qdict.h" #include "qemu/notify.h" #include "qemu/error-report.h" +#ifndef CONFIG_VNC #include "qapi/error.h" +#endif Interesting conditional; it's because of the static inline fallbacks that are also conditional. Makes sense. An alternative would be having the fallbacks be in a .c rather than static inline in the .h, but it doesn't bother me enough to worry about it.
In my opinion, they should really, really be made a stub so we don't have to include qapi/error.h in any configuration, but right now this simple ifdeffery is all I can do.
Quoted 1 line
My R-b stands whether or not you make more whitespace tweaks.
Thanks!
PATCH v2 5/19 Drop superfluous includes of qapi/qmp/qerror.h
In reply to Markus Armbruster--- backends/tpm.c | 1 - block/qcow.c | 1 - block/qed.c | 1 - blockdev-nbd.c | 1 - hw/s390x/s390-virtio-ccw.c | 1 - net/colo-compare.c | 1 - net/filter-mirror.c | 1 - net/filter-rewriter.c | 1 - qapi/qmp-dispatch.c | 1 - qemu-img.c | 1 - ui/vnc.c | 1 - 11 files changed, 11 deletions(-)
backends/tpm.c +0 -1
@@ -15,7 +15,6 @@#include "qemu/osdep.h" #include "sysemu/tpm_backend.h" #include "qapi/error.h" -#include "qapi/qmp/qerror.h" #include "sysemu/tpm.h" #include "qemu/thread.h" #include "qemu/main-loop.h"
block/qcow.c +0 -1
@@ -30,7 +30,6 @@#include "qemu/module.h" #include "qemu/bswap.h" #include <zlib.h> -#include "qapi/qmp/qerror.h" #include "qapi/qmp/qstring.h" #include "crypto/block.h" #include "migration/blocker.h"
block/qed.c +0 -1
@@ -18,7 +18,6 @@#include "qemu/bswap.h" #include "trace.h" #include "qed.h" -#include "qapi/qmp/qerror.h" #include "sysemu/block-backend.h" static int bdrv_qed_probe(const uint8_t *buf, int buf_size,
blockdev-nbd.c +0 -1
@@ -14,7 +14,6 @@#include "sysemu/block-backend.h" #include "hw/block/block.h" #include "qapi/error.h" -#include "qapi/qmp/qerror.h" #include "sysemu/sysemu.h" #include "qmp-commands.h" #include "block/nbd.h"
hw/s390x/s390-virtio-ccw.c +0 -1
@@ -33,7 +33,6 @@#include "hw/s390x/css-bridge.h" #include "migration/register.h" #include "cpu_models.h" -#include "qapi/qmp/qerror.h" #include "hw/nmi.h" S390CPU *s390_cpu_addr2state (uint16_t cpu_addr)
net/colo-compare.c +0 -1
@@ -16,7 +16,6 @@#include "qemu/error-report.h" #include "trace.h" #include "qemu-common.h" -#include "qapi/qmp/qerror.h" #include "qapi/error.h" #include "net/net.h" #include "net/eth.h"
net/filter-mirror.c +0 -1
@@ -14,7 +14,6 @@#include "net/net.h" #include "qemu-common.h" #include "qapi/error.h" -#include "qapi/qmp/qerror.h" #include "qapi-visit.h" #include "qom/object.h" #include "qemu/main-loop.h"
net/filter-rewriter.c +0 -1
@@ -15,7 +15,6 @@#include "net/filter.h" #include "net/net.h" #include "qemu-common.h" -#include "qapi/qmp/qerror.h" #include "qemu/error-report.h" #include "qapi-visit.h" #include "qom/object.h"
qapi/qmp-dispatch.c +0 -1
@@ -17,7 +17,6 @@#include "qapi/qmp/dispatch.h" #include "qapi/qmp/json-parser.h" #include "qapi/qmp/qjson.h" -#include "qapi/qmp/qerror.h" static QDict *qmp_dispatch_check_obj (const QObject *request,Error **errp) {
qemu-img.c +0 -1
@@ -28,7 +28,6 @@#include "qapi/error.h" #include "qapi-visit.h" #include "qapi/qobject-output-visitor.h" -#include "qapi/qmp/qerror.h" #include "qapi/qmp/qjson.h" #include "qapi/qmp/qbool.h" #include "qemu/cutils.h"
ui/vnc.c +0 -1
@@ -35,7 +35,6 @@#include "qemu/acl.h" #include "qemu/config-file.h" #include "qapi/error.h" -#include "qapi/qmp/qerror.h" #include "qapi/qmp/types.h" #include "qmp-commands.h" #include "ui/input.h"
Signature · 1 line
2.13.6
PATCH v2 6/19 Include qmp-commands.h exactly where needed
In reply to Markus Armbruster--- block.c | 1 - blockjob.c | 1 - hw/acpi/acpi-stub.c | 1 - hw/ppc/spapr.c | 1 - hw/s390x/s390-stattrib.c | 1 - hw/smbios/smbios-stub.c | 1 - hw/xen/xen-common.c | 1 - include/sysemu/arch_init.h | 1 - qga/guest-agent-core.h | 2 +- qga/main.c | 1 + stubs/dump.c | 1 - ui/cocoa.m | 1 - 12 files changed, 2 insertions(+), 11 deletions(-)
block.c +0 -1
@@ -39,7 +39,6 @@#include "qemu/notify.h" #include "qemu/coroutine.h" #include "block/qapi.h" -#include "qmp-commands.h" #include "qemu/timer.h" #include "qapi-event.h" #include "qemu/cutils.h"
blockjob.c +0 -1
@@ -34,7 +34,6 @@#include "qapi/qmp/qjson.h" #include "qemu/coroutine.h" #include "qemu/id.h" -#include "qmp-commands.h" #include "qemu/timer.h" #include "qapi-event.h"
hw/acpi/acpi-stub.c +0 -1
@@ -21,7 +21,6 @@#include "qemu/osdep.h" #include "qapi/error.h" #include "qapi/qmp/qerror.h" -#include "qmp-commands.h" #include "hw/acpi/acpi.h" void acpi_table_add (const QemuOpts *opts,Error **errp)
hw/ppc/spapr.c +0 -1
@@ -74,7 +74,6 @@#include "hw/compat.h" #include "qemu/cutils.h" #include "hw/ppc/spapr_cpu_core.h" -#include "qmp-commands.h" #include <libfdt.h>
hw/s390x/s390-stattrib.c +0 -1
@@ -12,7 +12,6 @@#include "qemu/osdep.h" #include "hw/boards.h" #include "cpu.h" -#include "qmp-commands.h" #include "migration/qemu-file.h" #include "migration/register.h" #include "hw/s390x/storage-attributes.h"
hw/smbios/smbios-stub.c +0 -1
@@ -23,7 +23,6 @@#include "qemu/osdep.h" #include "qapi/error.h" #include "qapi/qmp/qerror.h" -#include "qmp-commands.h" #include "hw/smbios/smbios.h" void smbios_entry_add (QemuOpts *opts,Error **errp)
hw/xen/xen-common.c +0 -1
@@ -10,7 +10,6 @@#include "qemu/osdep.h" #include "hw/xen/xen_backend.h" -#include "qmp-commands.h" #include "chardev/char.h" #include "sysemu/accel.h" #include "migration/misc.h"
include/sysemu/arch_init.h +0 -1
@@ -1,7 +1,6 @@#ifndef QEMU_ARCH_INIT_H #define QEMU_ARCH_INIT_H -#include "qmp-commands.h" #include "qemu/option.h" enum {
qga/guest-agent-core.h +1 -1
@@ -12,7 +12,7 @@*/ #include "qapi/qmp/dispatch.h" #include "qemu-common.h" -#include "qga-qmp-commands.h" +#include "qga-qapi-types.h" #define QGA_READ_COUNT_DEFAULT 4096
qga/main.c +1 -0
@@ -23,6 +23,7 @@#include "qapi/qmp/qjson.h" #include "qga/guest-agent-core.h" #include "qemu/module.h" +#include "qga-qmp-commands.h" #include "qapi/qmp/qerror.h" #include "qapi/error.h" #include "qapi/qmp/dispatch.h"
stubs/dump.c +0 -1
@@ -14,7 +14,6 @@#include "qemu/osdep.h" #include "qemu-common.h" #include "sysemu/dump-arch.h" -#include "qmp-commands.h" int cpu_get_dump_info (ArchDumpInfo *info,const struct GuestPhysBlockList *guest_phys_blocks)
ui/cocoa.m +0 -1
@@ -31,7 +31,6 @@ #include "ui/console.h" #include "ui/input.h" #include "sysemu/sysemu.h" -#include "qmp-commands.h" #include "sysemu/blockdev.h" #include "qemu-version.h" #include <Carbon/Carbon.h>
Signature · 1 line
2.13.6
PATCH v2 7/19 Typedef the subtypes of QObject in qemu/typedefs.h, too
In reply to Markus ArmbrusterThis renders many inclusions of qapi/qmp/q*.h superfluous. They'll be dropped in the next few commits.
--- include/qapi/qmp/qbool.h | 4 ++-- include/qapi/qmp/qdict.h | 4 ++-- include/qapi/qmp/qlist.h | 4 ++-- include/qapi/qmp/qnum.h | 4 ++-- include/qapi/qmp/qstring.h | 4 ++-- include/qemu/typedefs.h | 7 ++++++- 6 files changed, 16 insertions(+), 11 deletions(-)
include/qapi/qmp/qbool.h +2 -2
@@ -16,10 +16,10 @@#include "qapi/qmp/qobject.h" -typedef struct QBool { +struct QBool {QObject base;bool value; -}QBool ; +};QBool *qbool_from_bool (bool value);bool qbool_get_bool (const QBool *qb);
include/qapi/qmp/qdict.h +2 -2
@@ -27,11 +27,11 @@ typedef struct QDictEntry {QLIST_ENTRY (QDictEntry) next; } QDictEntry; -typedef struct QDict { +struct QDict {QObject base;size_t size; QLIST_HEAD(,QDictEntry) table[QDICT_BUCKET_MAX]; -}QDict ; +};/* Object API */ QDict *qdict_new (void );
include/qapi/qmp/qlist.h +2 -2
@@ -23,10 +23,10 @@ typedef struct QListEntry {QTAILQ_ENTRY (QListEntry) next; } QListEntry; -typedef struct QList { +struct QList {QObject base; QTAILQ_HEAD(,QListEntry) head; -}QList ; +};#define qlist_append (qlist, obj) \ qlist_append_obj(qlist, QOBJECT(obj))
include/qapi/qmp/qnum.h +2 -2
@@ -44,7 +44,7 @@ typedef enum {* in range: qnum_get_try_int() / qnum_get_try_uint() check range and * convert under the hood. */ -typedef struct QNum { +struct QNum {QObject base;QNumKind kind;union {
@@ -52,7 +52,7 @@ typedef struct QNum {uint64_t u64;double dbl; } u; -} QNum; +};QNum *qnum_from_int (int64_t value);QNum *qnum_from_uint (uint64_t value);
include/qapi/qmp/qstring.h +2 -2
@@ -15,12 +15,12 @@#include "qapi/qmp/qobject.h" -typedef struct QString { +struct QString {QObject base;char *string;size_t length;size_t capacity; -}QString ; +};QString *qstring_new (void );QString *qstring_from_str (const char *str);
include/qemu/typedefs.h +6 -1
@@ -92,8 +92,13 @@ typedef struct QemuOptsList QemuOptsList;typedef struct QEMUSGList QEMUSGList ;typedef struct QEMUTimer QEMUTimer ;typedef struct QEMUTimerListGroup QEMUTimerListGroup ; -typedef struct QObject QObject ; +typedef struct QBool QBool ; +typedef struct QDict QDict ; +typedef struct QList QList ;typedef struct QNull QNull ; +typedef struct QNum QNum ; +typedef struct QObject QObject ; +typedef struct QString QString ;typedef struct RAMBlock RAMBlock ;typedef struct Range Range ;typedef struct SerialState SerialState ;
Signature · 1 line
2.13.6
PATCH v2 8/19 Eliminate qapi/qmp/types.h
In reply to Markus Armbrusterqapi/qmp/types.h is a convenience header to include a number of qapi/qmp/ headers. Since we rarely need all of the headers qapi/qmp/types.h includes, we bypass it most of the time. Most of the places that use it don't need all the headers, either.
Include the necessary headers directly, and drop qapi/qmp/types.h.
--- block/qapi.c | 3 ++- block/qcow2.c | 3 ++- blockdev.c | 2 +- hw/pci/pcie_aer.c | 1 - hw/watchdog/watchdog.c | 1 - include/qapi/qmp/types.h | 24 ------------------------ monitor.c | 2 +- qapi/qapi-dealloc-visitor.c | 1 - qapi/qmp-dispatch.c | 1 - qapi/qobject-input-visitor.c | 2 +- qapi/qobject-output-visitor.c | 3 ++- qobject/json-parser.c | 3 ++- qobject/qjson.c | 2 +- qobject/qlit.c | 4 +++- qobject/qobject.c | 4 +++- scripts/qapi-commands.py | 1 - target/i386/cpu.c | 1 - tests/check-qjson.c | 2 +- tests/check-qobject.c | 3 ++- tests/cpu-plug-test.c | 1 - tests/qom-test.c | 1 - tests/test-clone-visitor.c | 1 - tests/test-qmp-commands.c | 3 ++- tests/test-qmp-event.c | 3 ++- tests/test-qobject-input-visitor.c | 2 +- tests/test-qobject-output-visitor.c | 2 +- tests/test-string-input-visitor.c | 1 - tests/test-string-output-visitor.c | 1 - tests/test-visitor-serialization.c | 1 - ui/vnc.c | 1 - util/qemu-option.c | 4 +++- 31 files changed, 30 insertions(+), 54 deletions(-) delete mode 100644 include/qapi/qmp/types.h
block/qapi.c +2 -1
@@ -31,7 +31,8 @@#include "qapi-visit.h" #include "qapi/error.h" #include "qapi/qobject-output-visitor.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qbool.h" +#include "qapi/qmp/qstring.h" #include "sysemu/block-backend.h" #include "qemu/cutils.h"
block/qcow2.c +2 -1
@@ -32,7 +32,8 @@#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qapi/qmp/qbool.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qstring.h" #include "qapi-event.h" #include "trace.h" #include "qemu/option_int.h"
blockdev.c +1 -1
@@ -40,7 +40,7 @@#include "qemu/error-report.h" #include "qemu/option.h" #include "qemu/config-file.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qstring.h" #include "qapi-visit.h" #include "qapi/error.h" #include "qapi/qmp/qerror.h"
hw/pci/pcie_aer.c +0 -1
@@ -20,7 +20,6 @@#include "qemu/osdep.h" #include "sysemu/sysemu.h" -#include "qapi/qmp/types.h" #include "qapi/qmp/qjson.h" #include "monitor/monitor.h" #include "hw/pci/pci_bridge.h"
hw/watchdog/watchdog.c +0 -1
@@ -24,7 +24,6 @@#include "qemu/config-file.h" #include "qemu/queue.h" #include "qapi/error.h" -#include "qapi/qmp/types.h" #include "sysemu/sysemu.h" #include "sysemu/watchdog.h" #include "qapi-event.h"
include/qapi/qmp/types.h deleted +0 -24
@@ -1,24 +0,0 @@ -/* -* Include all QEMU objects. -* -* Copyright (C) 2009 Red Hat Inc. -* -* Authors: -* Luiz Capitulino <[email protected]> -* -* This work is licensed under the terms of the GNU LGPL, version 2.1 or later. -* See the COPYING.LIB file in the top-level directory. -*/ - -#ifndef QAPI_QMP_TYPES_H -#define QAPI_QMP_TYPES_H - -#include "qapi/qmp/qobject.h" -#include "qapi/qmp/qnum.h" -#include "qapi/qmp/qbool.h" -#include "qapi/qmp/qstring.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qlist.h" -#include "qapi/qmp/qnull.h" - -#endif /* QAPI_QMP_TYPES_H */
monitor.c +1 -1
@@ -53,7 +53,7 @@#include "qemu/acl.h" #include "sysemu/tpm.h" #include "qapi/qmp/qerror.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qbool.h" #include "qapi/qmp/qjson.h" #include "qapi/qmp/json-streamer.h" #include "qapi/qmp/json-parser.h"
qapi/qapi-dealloc-visitor.c +0 -1
@@ -16,7 +16,6 @@#include "qapi/dealloc-visitor.h" #include "qemu/queue.h" #include "qemu-common.h" -#include "qapi/qmp/types.h" #include "qapi/visitor-impl.h" struct QapiDeallocVisitor
qapi/qmp-dispatch.c +0 -1
@@ -13,7 +13,6 @@#include "qemu/osdep.h" #include "qapi/error.h" -#include "qapi/qmp/types.h" #include "qapi/qmp/dispatch.h" #include "qapi/qmp/json-parser.h" #include "qapi/qmp/qjson.h"
qapi/qobject-input-visitor.c +1 -1
@@ -20,7 +20,7 @@#include "qemu/queue.h" #include "qemu-common.h" #include "qapi/qmp/qjson.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qbool.h" #include "qapi/qmp/qerror.h" #include "qemu/cutils.h" #include "qemu/option.h"
qapi/qobject-output-visitor.c +2 -1
@@ -17,7 +17,8 @@#include "qapi/visitor-impl.h" #include "qemu/queue.h" #include "qemu-common.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qbool.h" +#include "qapi/qmp/qstring.h" typedef struct QStackEntry { QObject *value;
qobject/json-parser.c +2 -1
@@ -15,7 +15,8 @@#include "qemu/cutils.h" #include "qapi/error.h" #include "qemu-common.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qbool.h" +#include "qapi/qmp/qstring.h" #include "qapi/qmp/json-parser.h" #include "qapi/qmp/json-lexer.h" #include "qapi/qmp/json-streamer.h"
qobject/qjson.c +1 -1
@@ -17,7 +17,7 @@#include "qapi/qmp/json-parser.h" #include "qapi/qmp/json-streamer.h" #include "qapi/qmp/qjson.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qbool.h" #include "qemu/unicode.h" typedef struct JSONParsingState
qobject/qlit.c +3 -1
@@ -16,7 +16,9 @@#include "qemu/osdep.h" #include "qapi/qmp/qlit.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qbool.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qstring.h" static bool qlit_equal_qdict (const QLitObject *lhs,const QDict *qdict) {
qobject/qobject.c +3 -1
@@ -9,7 +9,9 @@#include "qemu/osdep.h" #include "qemu-common.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qbool.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qstring.h" static void (*qdestroy[QTYPE__MAX ])(QObject *) = { [QTYPE_NONE ] =NULL ,/* No such object exists */
scripts/qapi-commands.py +0 -1
@@ -293,7 +293,6 @@ fdef.write(mcgen(''' #include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/module.h" -#include "qapi/qmp/types.h" #include "qapi/visitor.h" #include "qapi/qobject-output-visitor.h" #include "qapi/qobject-input-visitor.h"
target/i386/cpu.c +0 -1
@@ -32,7 +32,6 @@#include "qemu/config-file.h" #include "qapi/error.h" #include "qapi/qmp/qerror.h" -#include "qapi/qmp/types.h" #include "qapi-visit.h" #include "qapi/visitor.h"
tests/check-qjson.c +1 -1
@@ -14,7 +14,7 @@#include "qemu/osdep.h" #include "qapi/error.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qbool.h" #include "qapi/qmp/qjson.h" #include "qapi/qmp/qlit.h" #include "qemu-common.h"
tests/check-qobject.c +2 -1
@@ -8,7 +8,8 @@*/ #include "qemu/osdep.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qbool.h" +#include "qapi/qmp/qstring.h" #include "qemu-common.h" #include <math.h>
tests/cpu-plug-test.c +0 -1
@@ -11,7 +11,6 @@#include "qemu-common.h" #include "libqtest.h" -#include "qapi/qmp/types.h" struct PlugTestData {char *machine;
tests/qom-test.c +0 -1
@@ -12,7 +12,6 @@#include "qemu-common.h" #include "qemu/cutils.h" #include "libqtest.h" -#include "qapi/qmp/types.h" static const char *blacklist_x86[] = {"xenfv" ,"xenpv" ,NULL
tests/test-clone-visitor.c +0 -1
@@ -12,7 +12,6 @@#include "qemu-common.h" #include "qapi/clone-visitor.h" #include "test-qapi-visit.h" -#include "qapi/qmp/types.h" static void test_clone_struct (void ) {
tests/test-qmp-commands.c +2 -1
@@ -1,6 +1,7 @@#include "qemu/osdep.h" #include "qemu-common.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qstring.h" #include "test-qmp-commands.h" #include "qapi/error.h" #include "qapi/qmp/dispatch.h"
tests/test-qmp-event.c +2 -1
@@ -17,8 +17,9 @@#include "test-qapi-visit.h" #include "test-qapi-event.h" #include "qapi/error.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qbool.h" #include "qapi/qmp/qobject.h" +#include "qapi/qmp/qstring.h" #include "qapi/qmp-event.h" typedef struct TestEventData {
tests/test-qobject-input-visitor.c +1 -1
@@ -17,7 +17,7 @@#include "qapi/error.h" #include "qapi/qobject-input-visitor.h" #include "test-qapi-visit.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qbool.h" #include "qapi/qmp/qjson.h" #include "test-qmp-introspect.h" #include "qmp-introspect.h"
tests/test-qobject-output-visitor.c +1 -1
@@ -16,7 +16,7 @@#include "qapi/error.h" #include "qapi/qobject-output-visitor.h" #include "test-qapi-visit.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qbool.h" #include "qapi/qmp/qjson.h" typedef struct TestOutputVisitorData {
tests/test-string-input-visitor.c +0 -1
@@ -16,7 +16,6 @@#include "qapi/error.h" #include "qapi/string-input-visitor.h" #include "test-qapi-visit.h" -#include "qapi/qmp/types.h" typedef struct TestInputVisitorData { Visitor *v;
tests/test-string-output-visitor.c +0 -1
@@ -16,7 +16,6 @@#include "qapi/error.h" #include "qapi/string-output-visitor.h" #include "test-qapi-visit.h" -#include "qapi/qmp/types.h" typedef struct TestOutputVisitorData { Visitor *ov;
tests/test-visitor-serialization.c +0 -1
@@ -17,7 +17,6 @@#include "qemu-common.h" #include "test-qapi-visit.h" #include "qapi/error.h" -#include "qapi/qmp/types.h" #include "qapi/qmp/qjson.h" #include "qapi/qobject-input-visitor.h" #include "qapi/qobject-output-visitor.h"
ui/vnc.c +0 -1
@@ -35,7 +35,6 @@#include "qemu/acl.h" #include "qemu/config-file.h" #include "qapi/error.h" -#include "qapi/qmp/types.h" #include "qmp-commands.h" #include "ui/input.h" #include "qapi-event.h"
util/qemu-option.c +3 -1
@@ -28,7 +28,9 @@#include "qapi/error.h" #include "qemu-common.h" #include "qemu/error-report.h" -#include "qapi/qmp/types.h" +#include "qapi/qmp/qbool.h" +#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qstring.h" #include "qapi/qmp/qerror.h" #include "qemu/option_int.h" #include "qemu/cutils.h"
Signature · 1 line
2.13.6
PATCH v2 9/19 qdict qlist: Make most helper macros functions
In reply to Markus ArmbrusterThe macro expansions of qdict_put_TYPE() and qlist_append_TYPE() need qbool.h, qnull.h, qnum.h and qstring.h to compile. We include qnull.h and qnum.h in the headers, but not qbool.h and qstring.h. Works, because we include those wherever the macros get used.
Open-coding these helpers is of dubious value. Turn them into functions and drop the includes from the headers.
This cleanup makes the number of objects depending on qapi/qmp/qnum.h from 4551 (out of 4743) to 46 in my "build everything" tree. For qapi/qmp/qnull.h, the number drops from 4552 to 21.
--- block/qapi.c | 1 + blockdev.c | 1 + hw/i386/acpi-build.c | 1 + hw/ppc/spapr_drc.c | 1 + include/qapi/qmp/qdict.h | 16 ++++------------ include/qapi/qmp/qlist.h | 15 ++++----------- migration/migration.c | 1 + monitor.c | 1 + qapi/qapi-dealloc-visitor.c | 1 + qapi/qobject-input-visitor.c | 2 ++ qapi/qobject-output-visitor.c | 2 ++ qobject/json-parser.c | 2 ++ qobject/qdict.c | 21 +++++++++++++++++++++ qobject/qjson.c | 1 + qobject/qlist.c | 24 ++++++++++++++++++++++++ qobject/qlit.c | 1 + qobject/qobject.c | 2 ++ qom/object.c | 1 + target/ppc/translate.c | 1 + tests/check-qdict.c | 1 + tests/check-qjson.c | 2 ++ tests/check-qobject.c | 2 ++ tests/test-qmp-commands.c | 1 + tests/test-qmp-event.c | 1 + tests/test-qobject-input-visitor.c | 2 ++ tests/test-qobject-output-visitor.c | 2 ++ util/qemu-option.c | 1 + 27 files changed, 84 insertions(+), 23 deletions(-)
block/qapi.c +1 -0
@@ -32,6 +32,7 @@#include "qapi/error.h" #include "qapi/qobject-output-visitor.h" #include "qapi/qmp/qbool.h" +#include "qapi/qmp/qnum.h" #include "qapi/qmp/qstring.h" #include "sysemu/block-backend.h" #include "qemu/cutils.h"
blockdev.c +1 -0
@@ -40,6 +40,7 @@#include "qemu/error-report.h" #include "qemu/option.h" #include "qemu/config-file.h" +#include "qapi/qmp/qnum.h" #include "qapi/qmp/qstring.h" #include "qapi-visit.h" #include "qapi/error.h"
hw/i386/acpi-build.c +1 -0
@@ -22,6 +22,7 @@#include "qemu/osdep.h" #include "qapi/error.h" +#include "qapi/qmp/qnum.h" #include "acpi-build.h" #include "qemu-common.h" #include "qemu/bitmap.h"
hw/ppc/spapr_drc.c +1 -0
@@ -12,6 +12,7 @@#include "qemu/osdep.h" #include "qapi/error.h" +#include "qapi/qmp/qnull.h" #include "cpu.h" #include "qemu/cutils.h" #include "hw/ppc/spapr_drc.h"
include/qapi/qmp/qdict.h +4 -12
@@ -15,8 +15,6 @@#include "qapi/qmp/qobject.h" #include "qapi/qmp/qlist.h" -#include "qapi/qmp/qnull.h" -#include "qapi/qmp/qnum.h" #include "qemu/queue.h" #define QDICT_BUCKET_MAX 512
@@ -55,17 +53,11 @@ void qdict_destroy_obj(QObject *obj);#define qdict_put (qdict, key, obj) \ qdict_put_obj(qdict, key, QOBJECT(obj)) -/* Helpers for int, bool, null, and string */ -#define qdict_put_int (qdict, key, value) \ - qdict_put(qdict, key, qnum_from_int(value)) -#define qdict_put_bool (qdict, key, value) \ - qdict_put(qdict, key, qbool_from_bool(value)) -#define qdict_put_str (qdict, key, value) \ - qdict_put(qdict, key, qstring_from_str(value)) -#define qdict_put_null (qdict, key) \ - qdict_put(qdict, key, qnull()) +void qdict_put_bool (QDict *qdict,const char *key,bool value); +void qdict_put_int (QDict *qdict,const char *key,int64_t value); +void qdict_put_null (QDict *qdict,const char *key); +void qdict_put_str (QDict *qdict,const char *key,const char *value); -/* High level helpers */ double qdict_get_double (const QDict *qdict,const char *key);int64_t qdict_get_int (const QDict *qdict,const char *key);bool qdict_get_bool (const QDict *qdict,const char *key);
include/qapi/qmp/qlist.h +4 -11
@@ -14,8 +14,6 @@#define QLIST_H #include "qapi/qmp/qobject.h" -#include "qapi/qmp/qnum.h" -#include "qapi/qmp/qnull.h" #include "qemu/queue.h" typedef struct QListEntry {
@@ -31,15 +29,10 @@ struct QList {#define qlist_append (qlist, obj) \ qlist_append_obj(qlist, QOBJECT(obj)) -/* Helpers for int, bool, and string */ -#define qlist_append_int (qlist, value) \ - qlist_append(qlist, qnum_from_int(value)) -#define qlist_append_bool (qlist, value) \ - qlist_append(qlist, qbool_from_bool(value)) -#define qlist_append_str (qlist, value) \ - qlist_append(qlist, qstring_from_str(value)) -#define qlist_append_null (qlist) \ - qlist_append(qlist, qnull()) +void qlist_append_bool (QList *qlist,bool value); +void qlist_append_int (QList *qlist,int64_t value); +void qlist_append_null (QList *qlist); +void qlist_append_str (QList *qlist,const char *value);#define QLIST_FOREACH_ENTRY (qlist, var) \ for ((var) = ((qlist)->head.tqh_first); \
migration/migration.c +1 -0
@@ -32,6 +32,7 @@#include "block/block.h" #include "qapi/error.h" #include "qapi/qmp/qerror.h" +#include "qapi/qmp/qnull.h" #include "qemu/rcu.h" #include "block.h" #include "postcopy-ram.h"
monitor.c +1 -0
@@ -54,6 +54,7 @@#include "sysemu/tpm.h" #include "qapi/qmp/qerror.h" #include "qapi/qmp/qbool.h" +#include "qapi/qmp/qnum.h" #include "qapi/qmp/qjson.h" #include "qapi/qmp/json-streamer.h" #include "qapi/qmp/json-parser.h"
qapi/qapi-dealloc-visitor.c +1 -0
@@ -14,6 +14,7 @@#include "qemu/osdep.h" #include "qapi/dealloc-visitor.h" +#include "qapi/qmp/qnull.h" #include "qemu/queue.h" #include "qemu-common.h" #include "qapi/visitor-impl.h"
qapi/qobject-input-visitor.c +2 -0
@@ -22,6 +22,8 @@#include "qapi/qmp/qjson.h" #include "qapi/qmp/qbool.h" #include "qapi/qmp/qerror.h" +#include "qapi/qmp/qnull.h" +#include "qapi/qmp/qnum.h" #include "qemu/cutils.h" #include "qemu/option.h"
qapi/qobject-output-visitor.c +2 -0
@@ -18,6 +18,8 @@#include "qemu/queue.h" #include "qemu-common.h" #include "qapi/qmp/qbool.h" +#include "qapi/qmp/qnull.h" +#include "qapi/qmp/qnum.h" #include "qapi/qmp/qstring.h" typedef struct QStackEntry {
qobject/json-parser.c +2 -0
@@ -16,6 +16,8 @@#include "qapi/error.h" #include "qemu-common.h" #include "qapi/qmp/qbool.h" +#include "qapi/qmp/qnull.h" +#include "qapi/qmp/qnum.h" #include "qapi/qmp/qstring.h" #include "qapi/qmp/json-parser.h" #include "qapi/qmp/json-lexer.h"
qobject/qdict.c +21 -0
@@ -14,6 +14,7 @@#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 "qapi/qmp/qobject.h" #include "qapi/error.h"
@@ -143,6 +144,26 @@ void qdict_put_obj(QDict *qdict, const char *key, QObject *value) } } +void qdict_put_int (QDict *qdict,const char *key,int64_t value) +{ +qdict_put (qdict, key,qnum_from_int (value)); +} + +void qdict_put_bool (QDict *qdict,const char *key,bool value) +{ +qdict_put (qdict, key,qbool_from_bool (value)); +} + +void qdict_put_str (QDict *qdict,const char *key,const char *value) +{ +qdict_put (qdict, key,qstring_from_str (value)); +} + +void qdict_put_null (QDict *qdict,const char *key) +{ +qdict_put (qdict, key,qnull ()); +} +/** * qdict_get(): Lookup for a given 'key' *
qobject/qjson.c +1 -0
@@ -18,6 +18,7 @@#include "qapi/qmp/json-streamer.h" #include "qapi/qmp/qjson.h" #include "qapi/qmp/qbool.h" +#include "qapi/qmp/qnum.h" #include "qemu/unicode.h" typedef struct JSONParsingState
qobject/qlist.c +24 -0
@@ -11,8 +11,12 @@*/ #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/qobject.h" +#include "qapi/qmp/qstring.h" #include "qemu/queue.h" #include "qemu-common.h"
@@ -64,6 +68,26 @@ void qlist_append_obj(QList *qlist, QObject *value)QTAILQ_INSERT_TAIL (&qlist->head, entry, next); } +void qlist_append_int (QList *qlist,int64_t value) +{ +qlist_append (qlist,qnum_from_int (value)); +} + +void qlist_append_bool (QList *qlist,bool value) +{ +qlist_append (qlist,qbool_from_bool (value)); +} + +void qlist_append_str (QList *qlist,const char *value) +{ +qlist_append (qlist,qstring_from_str (value)); +} + +void qlist_append_null (QList *qlist) +{ +qlist_append (qlist,qnull ()); +} +/** * qlist_iter(): Iterate over all the list's stored values. *
qobject/qlit.c +1 -0
@@ -17,6 +17,7 @@#include "qapi/qmp/qlit.h" #include "qapi/qmp/qbool.h" +#include "qapi/qmp/qnum.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h"
qobject/qobject.c +2 -0
@@ -10,6 +10,8 @@#include "qemu/osdep.h" #include "qemu-common.h" #include "qapi/qmp/qbool.h" +#include "qapi/qmp/qnull.h" +#include "qapi/qmp/qnum.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h"
qom/object.c +1 -0
@@ -27,6 +27,7 @@#include "qom/qom-qobject.h" #include "qapi/qmp/qobject.h" #include "qapi/qmp/qbool.h" +#include "qapi/qmp/qnum.h" #include "qapi/qmp/qstring.h" #define MAX_INTERFACES 32
target/ppc/translate.c +1 -0
@@ -24,6 +24,7 @@#include "disas/disas.h" #include "exec/exec-all.h" #include "tcg-op.h" +#include "qapi/qmp/qnull.h" #include "qemu/host-utils.h" #include "exec/cpu_ldst.h"
tests/check-qdict.c +1 -0
@@ -12,6 +12,7 @@#include "qemu/osdep.h" #include "qapi/qmp/qdict.h" +#include "qapi/qmp/qnum.h" #include "qapi/qmp/qstring.h" #include "qapi/error.h" #include "qemu-common.h"
tests/check-qjson.c +2 -0
@@ -17,6 +17,8 @@#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 "qemu-common.h" static void escaped_string (void )
tests/check-qobject.c +2 -0
@@ -9,6 +9,8 @@#include "qemu/osdep.h" #include "qapi/qmp/qbool.h" +#include "qapi/qmp/qnull.h" +#include "qapi/qmp/qnum.h" #include "qapi/qmp/qstring.h" #include "qemu-common.h"
tests/test-qmp-commands.c +1 -0
@@ -1,6 +1,7 @@#include "qemu/osdep.h" #include "qemu-common.h" #include "qapi/qmp/qdict.h" +#include "qapi/qmp/qnum.h" #include "qapi/qmp/qstring.h" #include "test-qmp-commands.h" #include "qapi/error.h"
tests/test-qmp-event.c +1 -0
@@ -18,6 +18,7 @@#include "test-qapi-event.h" #include "qapi/error.h" #include "qapi/qmp/qbool.h" +#include "qapi/qmp/qnum.h" #include "qapi/qmp/qobject.h" #include "qapi/qmp/qstring.h" #include "qapi/qmp-event.h"
tests/test-qobject-input-visitor.c +2 -0
@@ -18,6 +18,8 @@#include "qapi/qobject-input-visitor.h" #include "test-qapi-visit.h" #include "qapi/qmp/qbool.h" +#include "qapi/qmp/qnull.h" +#include "qapi/qmp/qnum.h" #include "qapi/qmp/qjson.h" #include "test-qmp-introspect.h" #include "qmp-introspect.h"
tests/test-qobject-output-visitor.c +2 -0
@@ -17,6 +17,8 @@#include "qapi/qobject-output-visitor.h" #include "test-qapi-visit.h" #include "qapi/qmp/qbool.h" +#include "qapi/qmp/qnull.h" +#include "qapi/qmp/qnum.h" #include "qapi/qmp/qjson.h" typedef struct TestOutputVisitorData {
util/qemu-option.c +1 -0
@@ -30,6 +30,7 @@#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 "qemu/option_int.h"
Signature · 1 line
2.13.6
PATCH v2 10/19 Include qapi/qmp/qobject.h exactly where needed
In reply to Markus Armbruster--- include/block/block.h | 1 - include/qapi/qmp/dispatch.h | 1 - include/qapi/qmp/qjson.h | 1 - include/qapi/qobject-input-visitor.h | 1 - include/qapi/qobject-output-visitor.h | 1 - include/qapi/visitor.h | 2 +- qapi/qapi-visit-core.c | 1 - qmp.c | 1 - qobject/qbool.c | 1 - qobject/qdict.c | 1 - qobject/qlist.c | 1 - qobject/qnum.c | 1 - qobject/qstring.c | 1 - qom/object.c | 1 - tests/test-qmp-event.c | 1 - 15 files changed, 1 insertion(+), 15 deletions(-)
include/block/block.h +0 -1
@@ -8,7 +8,6 @@#include "block/accounting.h" #include "block/dirty-bitmap.h" #include "block/blockjob.h" -#include "qapi/qmp/qobject.h" #include "qemu/hbitmap.h" /* block.c */
include/qapi/qmp/dispatch.h +0 -1
@@ -14,7 +14,6 @@#ifndef QAPI_QMP_DISPATCH_H #define QAPI_QMP_DISPATCH_H -#include "qapi/qmp/qobject.h" #include "qapi/qmp/qdict.h" typedef void (QmpCommandFunc )(QDict *,QObject **,Error **);
include/qapi/qmp/qjson.h +0 -1
@@ -14,7 +14,6 @@#ifndef QJSON_H #define QJSON_H -#include "qapi/qmp/qobject.h" #include "qapi/qmp/qstring.h" QObject *qobject_from_json (const char *string,Error **errp);
include/qapi/qobject-input-visitor.h +0 -1
@@ -16,7 +16,6 @@#define QOBJECT_INPUT_VISITOR_H #include "qapi/visitor.h" -#include "qapi/qmp/qobject.h" typedef struct QObjectInputVisitor QObjectInputVisitor ;
include/qapi/qobject-output-visitor.h +0 -1
@@ -15,7 +15,6 @@#define QOBJECT_OUTPUT_VISITOR_H #include "qapi/visitor.h" -#include "qapi/qmp/qobject.h" typedef struct QObjectOutputVisitor QObjectOutputVisitor ;
include/qapi/visitor.h +1 -1
@@ -15,7 +15,7 @@#ifndef QAPI_VISITOR_H #define QAPI_VISITOR_H -#include "qapi/qmp/qobject.h" +#include "qapi-types.h" /* * The QAPI schema defines both a set of C data types, and a QMP wire
qapi/qapi-visit-core.c +0 -1
@@ -15,7 +15,6 @@#include "qemu/osdep.h" #include "qapi/error.h" #include "qemu-common.h" -#include "qapi/qmp/qobject.h" #include "qapi/qmp/qerror.h" #include "qapi/visitor.h" #include "qapi/visitor-impl.h"
qmp.c +0 -1
@@ -32,7 +32,6 @@#include "qom/qom-qobject.h" #include "qapi/error.h" #include "qapi/qmp/qerror.h" -#include "qapi/qmp/qobject.h" #include "qapi/qobject-input-visitor.h" #include "hw/boards.h" #include "qom/object_interfaces.h"
qobject/qbool.c +0 -1
@@ -13,7 +13,6 @@#include "qemu/osdep.h" #include "qapi/qmp/qbool.h" -#include "qapi/qmp/qobject.h" #include "qemu-common.h" /**
qobject/qdict.c +0 -1
@@ -16,7 +16,6 @@#include "qapi/qmp/qbool.h" #include "qapi/qmp/qnull.h" #include "qapi/qmp/qstring.h" -#include "qapi/qmp/qobject.h" #include "qapi/error.h" #include "qemu/queue.h" #include "qemu-common.h"
qobject/qlist.c +0 -1
@@ -15,7 +15,6 @@#include "qapi/qmp/qlist.h" #include "qapi/qmp/qnull.h" #include "qapi/qmp/qnum.h" -#include "qapi/qmp/qobject.h" #include "qapi/qmp/qstring.h" #include "qemu/queue.h" #include "qemu-common.h"
qobject/qnum.c +0 -1
@@ -14,7 +14,6 @@#include "qemu/osdep.h" #include "qapi/qmp/qnum.h" -#include "qapi/qmp/qobject.h" #include "qemu-common.h" /**
qobject/qstring.c +0 -1
@@ -11,7 +11,6 @@*/ #include "qemu/osdep.h" -#include "qapi/qmp/qobject.h" #include "qapi/qmp/qstring.h" #include "qemu-common.h"
qom/object.c +0 -1
@@ -25,7 +25,6 @@/* 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/qobject.h" #include "qapi/qmp/qbool.h" #include "qapi/qmp/qnum.h" #include "qapi/qmp/qstring.h"
tests/test-qmp-event.c +0 -1
@@ -19,7 +19,6 @@#include "qapi/error.h" #include "qapi/qmp/qbool.h" #include "qapi/qmp/qnum.h" -#include "qapi/qmp/qobject.h" #include "qapi/qmp/qstring.h" #include "qapi/qmp-event.h"
Signature · 1 line
2.13.6
PATCH v2 11/19 Include qapi/qmp/qlist.h exactly where needed
In reply to Markus ArmbrusterThis cleanup makes the number of objects depending on qapi/qmp/qlist.h drop from 4551 (out of 4743) to 16 in my "build everything" tree.
While there, separate #include from file comment with a blank line.
--- block/qapi.c | 1 + block/rbd.c | 1 + blockdev.c | 1 + include/qapi/qmp/json-parser.h | 1 - include/qapi/qmp/qdict.h | 1 - qapi/qobject-input-visitor.c | 1 + qapi/qobject-output-visitor.c | 1 + qobject/json-parser.c | 1 + qobject/qdict.c | 1 + qobject/qjson.c | 1 + qobject/qlit.c | 1 + qobject/qobject.c | 1 + tests/check-qdict.c | 3 ++- tests/check-qlit.c | 1 + tests/check-qobject.c | 3 ++- tests/device-introspect-test.c | 1 + tests/libqtest.c | 3 ++- tests/numa-test.c | 1 + tests/qmp-test.c | 1 + tests/qom-test.c | 1 + tests/test-keyval.c | 1 + tests/test-qga.c | 1 + tests/test-qobject-output-visitor.c | 1 + tests/test-x86-cpuid-compat.c | 1 + ui/vnc-palette.h | 1 - util/keyval.c | 1 + util/qemu-config.c | 1 + 27 files changed, 27 insertions(+), 6 deletions(-)
block/qapi.c +1 -0
@@ -32,6 +32,7 @@#include "qapi/error.h" #include "qapi/qobject-output-visitor.h" #include "qapi/qmp/qbool.h" +#include "qapi/qmp/qlist.h" #include "qapi/qmp/qnum.h" #include "qapi/qmp/qstring.h" #include "sysemu/block-backend.h"
block/rbd.c +1 -0
@@ -21,6 +21,7 @@#include "qemu/cutils.h" #include "qapi/qmp/qstring.h" #include "qapi/qmp/qjson.h" +#include "qapi/qmp/qlist.h" /* * When specifying the image filename use:
blockdev.c +1 -0
@@ -45,6 +45,7 @@#include "qapi-visit.h" #include "qapi/error.h" #include "qapi/qmp/qerror.h" +#include "qapi/qmp/qlist.h" #include "qapi/qobject-output-visitor.h" #include "sysemu/sysemu.h" #include "sysemu/iothread.h"
include/qapi/qmp/json-parser.h +0 -1
@@ -15,7 +15,6 @@#define QEMU_JSON_PARSER_H #include "qemu-common.h" -#include "qapi/qmp/qlist.h" QObject *json_parser_parse (GQueue *tokens,va_list *ap);QObject *json_parser_parse_err (GQueue *tokens,va_list *ap,Error **errp);
include/qapi/qmp/qdict.h +0 -1
@@ -14,7 +14,6 @@#define QDICT_H #include "qapi/qmp/qobject.h" -#include "qapi/qmp/qlist.h" #include "qemu/queue.h" #define QDICT_BUCKET_MAX 512
qapi/qobject-input-visitor.c +1 -0
@@ -22,6 +22,7 @@#include "qapi/qmp/qjson.h" #include "qapi/qmp/qbool.h" #include "qapi/qmp/qerror.h" +#include "qapi/qmp/qlist.h" #include "qapi/qmp/qnull.h" #include "qapi/qmp/qnum.h" #include "qemu/cutils.h"
qapi/qobject-output-visitor.c +1 -0
@@ -18,6 +18,7 @@#include "qemu/queue.h" #include "qemu-common.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"
qobject/json-parser.c +1 -0
@@ -16,6 +16,7 @@#include "qapi/error.h" #include "qemu-common.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"
qobject/qdict.c +1 -0
@@ -14,6 +14,7 @@#include "qapi/qmp/qnum.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qbool.h" +#include "qapi/qmp/qlist.h" #include "qapi/qmp/qnull.h" #include "qapi/qmp/qstring.h" #include "qapi/error.h"
qobject/qjson.c +1 -0
@@ -18,6 +18,7 @@#include "qapi/qmp/json-streamer.h" #include "qapi/qmp/qjson.h" #include "qapi/qmp/qbool.h" +#include "qapi/qmp/qlist.h" #include "qapi/qmp/qnum.h" #include "qemu/unicode.h"
qobject/qlit.c +1 -0
@@ -17,6 +17,7 @@#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"
qobject/qobject.c +1 -0
@@ -13,6 +13,7 @@#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" static void (*qdestroy[QTYPE__MAX ])(QObject *) = {
tests/check-qdict.c +2 -1
@@ -9,9 +9,10 @@* This work is licensed under the terms of the GNU LGPL, version 2.1 or later. * See the COPYING.LIB file in the top-level directory. */ +#include "qemu/osdep.h" -#include "qapi/qmp/qdict.h" +#include "qapi/qmp/qlist.h" #include "qapi/qmp/qnum.h" #include "qapi/qmp/qstring.h" #include "qapi/error.h"
tests/check-qlit.c +1 -0
@@ -11,6 +11,7 @@#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"
tests/check-qobject.c +2 -1
@@ -6,9 +6,10 @@* This work is licensed under the terms of the GNU LGPL, version 2.1 or later. * See the COPYING.LIB file in the top-level directory. */ +#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"
tests/device-introspect-test.c +1 -0
@@ -22,6 +22,7 @@#include "qapi/qmp/qstring.h" #include "qapi/qmp/qbool.h" #include "qapi/qmp/qdict.h" +#include "qapi/qmp/qlist.h" #include "libqtest.h" const char common_args[] ="-nodefaults -machine none" ;
tests/libqtest.c +2 -1
@@ -12,8 +12,8 @@* * This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. -* */ +#include "qemu/osdep.h" #include "libqtest.h"
@@ -25,6 +25,7 @@#include "qapi/qmp/json-parser.h" #include "qapi/qmp/json-streamer.h" #include "qapi/qmp/qjson.h" +#include "qapi/qmp/qlist.h" #define MAX_IRQ 256#define SOCKET_TIMEOUT 50
tests/numa-test.c +1 -0
@@ -11,6 +11,7 @@#include "qemu/osdep.h" #include "libqtest.h" +#include "qapi/qmp/qlist.h" static char *make_cli (const char *generic_cli,const char *test_cli) {
tests/qmp-test.c +1 -0
@@ -14,6 +14,7 @@#include "libqtest.h" #include "qapi-visit.h" #include "qapi/error.h" +#include "qapi/qmp/qlist.h" #include "qapi/qobject-input-visitor.h" #include "qapi/util.h" #include "qapi/visitor.h"
tests/qom-test.c +1 -0
@@ -10,6 +10,7 @@#include "qemu/osdep.h" #include "qemu-common.h" +#include "qapi/qmp/qlist.h" #include "qemu/cutils.h" #include "libqtest.h"
tests/test-keyval.c +1 -0
@@ -12,6 +12,7 @@#include "qemu/osdep.h" #include "qapi/error.h" +#include "qapi/qmp/qlist.h" #include "qapi/qmp/qstring.h" #include "qapi/qobject-input-visitor.h" #include "test-qapi-visit.h"
tests/test-qga.c +1 -0
@@ -5,6 +5,7 @@#include <sys/un.h> #include "libqtest.h" +#include "qapi/qmp/qlist.h" typedef struct { char *test_dir;
tests/test-qobject-output-visitor.c +1 -0
@@ -17,6 +17,7 @@#include "qapi/qobject-output-visitor.h" #include "test-qapi-visit.h" #include "qapi/qmp/qbool.h" +#include "qapi/qmp/qlist.h" #include "qapi/qmp/qnull.h" #include "qapi/qmp/qnum.h" #include "qapi/qmp/qjson.h"
tests/test-x86-cpuid-compat.c +1 -0
@@ -1,6 +1,7 @@#include "qemu/osdep.h" #include "qemu-common.h" #include "qapi/qmp/qdict.h" +#include "qapi/qmp/qlist.h" #include "qapi/qmp/qnum.h" #include "qapi/qmp/qbool.h" #include "libqtest.h"
ui/vnc-palette.h +0 -1
@@ -29,7 +29,6 @@#ifndef VNC_PALETTE_H #define VNC_PALETTE_H -#include "qapi/qmp/qlist.h" #include "qemu/queue.h" #define VNC_PALETTE_HASH_SIZE 256
util/keyval.c +1 -0
@@ -81,6 +81,7 @@#include "qemu/osdep.h" #include "qapi/error.h" +#include "qapi/qmp/qlist.h" #include "qapi/qmp/qstring.h" #include "qemu/cutils.h" #include "qemu/option.h"
util/qemu-config.c +1 -0
@@ -1,5 +1,6 @@#include "qemu/osdep.h" #include "qapi/error.h" +#include "qapi/qmp/qlist.h" #include "qemu-common.h" #include "qemu/error-report.h" #include "qemu/option.h"
Signature · 1 line
2.13.6
PATCH v2 12/19 Include qapi/qmp/qdict.h exactly where needed
In reply to Markus ArmbrusterThis cleanup makes the number of objects depending on qapi/qmp/qdict.h drop from 4550 (out of 4743) to 368 in my "build everything" tree. For qapi/qmp/qobject.h, the number drops from 4552 to 390.
While there, separate #include from file comment with a blank line.
--- block/crypto.c | 1 + block/curl.c | 2 ++ block/file-win32.c | 1 + block/gluster.c | 1 + block/qcow.c | 2 ++ block/rbd.c | 1 + block/snapshot.c | 1 + block/ssh.c | 1 + block/vvfat.c | 2 ++ device-hotplug.c | 1 + hmp.h | 1 - hw/pci/pcie_aer.c | 1 + hw/s390x/s390-stattrib.c | 1 + hw/usb/xen-usb.c | 1 + include/block/block.h | 1 + include/block/dirty-bitmap.h | 1 + include/hw/block/block.h | 1 + include/hw/block/fdc.h | 1 + include/hw/loader.h | 1 - include/migration/colo.h | 1 + include/migration/failover.h | 1 + include/monitor/monitor.h | 1 - include/net/net.h | 2 +- include/net/slirp.h | 1 - include/qapi/qmp-event.h | 1 - include/qapi/qmp/dispatch.h | 2 +- include/qemu/config-file.h | 1 - include/qemu/option.h | 1 - include/qemu/throttle.h | 1 + include/qom/object_interfaces.h | 1 - include/scsi/pr-manager.h | 1 - include/sysemu/arch_init.h | 1 + include/ui/console.h | 1 - migration/ram.h | 1 + net/slirp.c | 2 ++ net/tap_int.h | 1 + qapi/qmp-dispatch.c | 1 + qapi/qmp-event.c | 1 + qapi/qobject-input-visitor.c | 1 + qapi/qobject-output-visitor.c | 1 + qemu-img.c | 2 ++ qemu-io.c | 2 ++ qemu-nbd.c | 1 + qobject/json-parser.c | 1 + qobject/qjson.c | 1 + qom/object_interfaces.c | 1 + target/i386/cpu.c | 1 + target/i386/monitor.c | 2 ++ target/s390x/cpu_models.c | 1 + tests/ahci-test.c | 1 + tests/check-qobject.c | 1 + tests/cpu-plug-test.c | 1 + tests/drive_del-test.c | 1 + tests/libqos/libqos.c | 1 + tests/libqos/pci-pc.c | 2 +- tests/libqtest.c | 1 + tests/libqtest.h | 2 -- tests/migration-test.c | 1 + tests/numa-test.c | 1 + tests/pvpanic-test.c | 1 + tests/q35-test.c | 1 + tests/qmp-test.c | 1 + tests/qom-test.c | 1 + tests/tco-test.c | 2 ++ tests/test-keyval.c | 1 + tests/test-netfilter.c | 1 + tests/test-qemu-opts.c | 1 + tests/test-qga.c | 1 + tests/test-qmp-event.c | 1 + tests/test-qobject-input-visitor.c | 1 + tests/test-qobject-output-visitor.c | 1 + tests/test-replication.c | 1 + tests/tmp105-test.c | 1 + tests/vhost-user-test.c | 1 + tests/virtio-net-test.c | 1 + tests/vmgenid-test.c | 1 + tests/wdt_ib700-test.c | 1 + util/keyval.c | 1 + 78 files changed, 75 insertions(+), 15 deletions(-)
block/crypto.c +1 -0
@@ -24,6 +24,7 @@#include "sysemu/block-backend.h" #include "crypto/block.h" #include "qapi/opts-visitor.h" +#include "qapi/qmp/qdict.h" #include "qapi/qobject-input-visitor.h" #include "qapi-visit.h" #include "qapi/error.h"
block/curl.c +2 -0
@@ -21,12 +21,14 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "qapi/error.h" #include "qemu-common.h" #include "qemu/error-report.h" #include "block/block_int.h" #include "qapi/qmp/qbool.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" #include "crypto/secret.h" #include <curl/curl.h>
block/file-win32.c +1 -0
@@ -30,6 +30,7 @@#include "trace.h" #include "block/thread-pool.h" #include "qemu/iov.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" #include <windows.h> #include <winioctl.h>
block/gluster.c +1 -0
@@ -11,6 +11,7 @@#include <glusterfs/api/glfs.h> #include "block/block_int.h" #include "qapi/error.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qerror.h" #include "qemu/uri.h" #include "qemu/error-report.h"
block/qcow.c +2 -0
@@ -21,6 +21,7 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "qapi/error.h" #include "qemu-common.h"
@@ -30,6 +31,7 @@#include "qemu/module.h" #include "qemu/bswap.h" #include <zlib.h> +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" #include "crypto/block.h" #include "migration/blocker.h"
block/rbd.c +1 -0
@@ -20,6 +20,7 @@#include "crypto/secret.h" #include "qemu/cutils.h" #include "qapi/qmp/qstring.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qjson.h" #include "qapi/qmp/qlist.h"
block/snapshot.c +1 -0
@@ -26,6 +26,7 @@#include "block/snapshot.h" #include "block/block_int.h" #include "qapi/error.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qerror.h" #include "qapi/qmp/qstring.h"
block/ssh.c +1 -0
@@ -34,6 +34,7 @@#include "qemu/sockets.h" #include "qemu/uri.h" #include "qapi-visit.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" #include "qapi/qobject-input-visitor.h" #include "qapi/qobject-output-visitor.h"
block/vvfat.c +2 -0
@@ -22,6 +22,7 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include <dirent.h> #include "qapi/error.h"
@@ -30,6 +31,7 @@#include "qemu/bswap.h" #include "migration/blocker.h" #include "qapi/qmp/qbool.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" #include "qemu/cutils.h" #include "qemu/error-report.h"
device-hotplug.c +1 -0
@@ -27,6 +27,7 @@#include "hw/boards.h" #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" +#include "qapi/qmp/qdict.h" #include "qemu/config-file.h" #include "sysemu/sysemu.h" #include "monitor/monitor.h"
hmp.h +0 -1
@@ -16,7 +16,6 @@#include "qemu-common.h" #include "qemu/readline.h" -#include "qapi/qmp/qdict.h" void hmp_info_name (Monitor *mon,const QDict *qdict);void hmp_info_version (Monitor *mon,const QDict *qdict);
hw/pci/pcie_aer.c +1 -0
@@ -20,6 +20,7 @@#include "qemu/osdep.h" #include "sysemu/sysemu.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qjson.h" #include "monitor/monitor.h" #include "hw/pci/pci_bridge.h"
hw/s390x/s390-stattrib.c +1 -0
@@ -18,6 +18,7 @@#include "qemu/error-report.h" #include "exec/ram_addr.h" #include "qapi/error.h" +#include "qapi/qmp/qdict.h" #define CMMA_BLOCK_SIZE (1 << 10)
hw/usb/xen-usb.c +1 -0
@@ -30,6 +30,7 @@#include "hw/xen/xen_backend.h" #include "monitor/qdev.h" #include "qapi/qmp/qbool.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" #include "hw/xen/io/ring.h"
include/block/block.h +1 -0
@@ -2,6 +2,7 @@#define BLOCK_H #include "block/aio.h" +#include "qapi-types.h" #include "qemu/iov.h" #include "qemu/option.h" #include "qemu/coroutine.h"
include/block/dirty-bitmap.h +1 -0
@@ -2,6 +2,7 @@#define BLOCK_DIRTY_BITMAP_H #include "qemu-common.h" +#include "qapi-types.h" #include "qemu/hbitmap.h" BdrvDirtyBitmap *bdrv_create_dirty_bitmap(BlockDriverState *bs,
include/hw/block/block.h +1 -0
@@ -12,6 +12,7 @@#define HW_BLOCK_H #include "qemu-common.h" +#include "qapi-types.h" /* Configuration */
include/hw/block/fdc.h +1 -0
@@ -2,6 +2,7 @@#define HW_FDC_H #include "qemu-common.h" +#include "qapi-types.h" /* fdc.c */ #define MAX_FD 2
include/hw/loader.h +0 -1
@@ -1,6 +1,5 @@#ifndef LOADER_H #define LOADER_H -#include "qapi/qmp/qdict.h" #include "hw/nvram/fw_cfg.h" /* loader.c */
include/migration/colo.h +1 -0
@@ -14,6 +14,7 @@#define QEMU_COLO_H #include "qemu-common.h" +#include "qapi-types.h" void colo_info_init (void );
include/migration/failover.h +1 -0
@@ -14,6 +14,7 @@#define QEMU_FAILOVER_H #include "qemu-common.h" +#include "qapi-types.h" void failover_init_state (void ); FailoverStatus failover_set_state(FailoverStatus old_state,
include/monitor/monitor.h +0 -1
@@ -2,7 +2,6 @@#define MONITOR_H #include "qemu-common.h" -#include "qapi/qmp/qdict.h" #include "block/block.h" #include "qemu/readline.h"
include/net/net.h +1 -1
@@ -3,7 +3,7 @@#include "qemu/queue.h" #include "qemu-common.h" -#include "qapi/qmp/qdict.h" +#include "qapi-types.h" #include "qemu/option.h" #include "net/queue.h" #include "migration/vmstate.h"
include/net/slirp.h +0 -1
@@ -25,7 +25,6 @@#define QEMU_NET_SLIRP_H #include "qemu-common.h" -#include "qapi/qmp/qdict.h" #include "qemu/option.h" #ifdef CONFIG_SLIRP
include/qapi/qmp-event.h +0 -1
@@ -14,7 +14,6 @@#ifndef QMP_EVENT_H #define QMP_EVENT_H -#include "qapi/qmp/qdict.h" typedef void (*QMPEventFuncEmit )(unsigned event,QDict *dict,Error **errp);
include/qapi/qmp/dispatch.h +1 -1
@@ -14,7 +14,7 @@#ifndef QAPI_QMP_DISPATCH_H #define QAPI_QMP_DISPATCH_H -#include "qapi/qmp/qdict.h" +#include "qemu/queue.h" typedef void (QmpCommandFunc )(QDict *,QObject **,Error **);
include/qemu/config-file.h +0 -1
@@ -2,7 +2,6 @@#define QEMU_CONFIG_FILE_H #include "qemu/option.h" -#include "qapi/qmp/qdict.h" QemuOptsList *qemu_find_opts (const char *group);QemuOptsList *qemu_find_opts_err (const char *group,Error **errp);
include/qemu/option.h +0 -1
@@ -27,7 +27,6 @@#define QEMU_OPTION_H #include "qemu/queue.h" -#include "qapi/qmp/qdict.h" const char *get_opt_name (char *buf,int buf_size,const char *p,char delim);const char *get_opt_value (char *buf,int buf_size,const char *p);
include/qemu/throttle.h +1 -0
@@ -26,6 +26,7 @@#define THROTTLE_H #include "qemu-common.h" +#include "qapi-types.h" #include "qemu/timer.h" #define THROTTLE_VALUE_MAX 1000000000000000LL
include/qom/object_interfaces.h +0 -1
@@ -2,7 +2,6 @@#define OBJECT_INTERFACES_H #include "qom/object.h" -#include "qapi/qmp/qdict.h" #include "qapi/visitor.h" #define TYPE_USER_CREATABLE "user-creatable"
include/scsi/pr-manager.h +0 -1
@@ -2,7 +2,6 @@#define PR_MANAGER_H #include "qom/object.h" -#include "qapi/qmp/qdict.h" #include "qapi/visitor.h" #include "qom/object_interfaces.h" #include "block/aio.h"
include/sysemu/arch_init.h +1 -0
@@ -1,6 +1,7 @@#ifndef QEMU_ARCH_INIT_H #define QEMU_ARCH_INIT_H +#include "qapi-types.h" #include "qemu/option.h" enum {
include/ui/console.h +0 -1
@@ -3,7 +3,6 @@#include "ui/qemu-pixman.h" #include "qom/object.h" -#include "qapi/qmp/qdict.h" #include "qemu/notify.h" #include "qemu/error-report.h" #ifndef CONFIG_VNC
migration/ram.h +1 -0
@@ -30,6 +30,7 @@#define QEMU_MIGRATION_RAM_H #include "qemu-common.h" +#include "qapi-types.h" #include "exec/cpu-common.h" extern MigrationStats ram_counters;
net/slirp.c +2 -0
@@ -21,6 +21,7 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "net/slirp.h"
@@ -41,6 +42,7 @@#include "sysemu/sysemu.h" #include "qemu/cutils.h" #include "qapi/error.h" +#include "qapi/qmp/qdict.h" static int get_str_sep (char *buf,int buf_size,const char **pp,int sep) {
net/tap_int.h +1 -0
@@ -27,6 +27,7 @@#define NET_TAP_INT_H #include "qemu-common.h" +#include "qapi-types.h" int tap_open (char *ifname,int ifname_size,int *vnet_hdr,int vnet_hdr_required,int mq_required,Error **errp);
qapi/qmp-dispatch.c +1 -0
@@ -15,6 +15,7 @@#include "qapi/error.h" #include "qapi/qmp/dispatch.h" #include "qapi/qmp/json-parser.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qjson.h" static QDict *qmp_dispatch_check_obj (const QObject *request,Error **errp)
qapi/qmp-event.c +1 -0
@@ -16,6 +16,7 @@#include "qemu-common.h" #include "qapi/qmp-event.h" #include "qapi/qmp/qstring.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qjson.h" static QMPEventFuncEmit qmp_emit;
qapi/qobject-input-visitor.c +1 -0
@@ -21,6 +21,7 @@#include "qemu-common.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"
qapi/qobject-output-visitor.c +1 -0
@@ -18,6 +18,7 @@#include "qemu/queue.h" #include "qemu-common.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"
qemu-img.c +2 -0
@@ -21,6 +21,7 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include <getopt.h>
@@ -30,6 +31,7 @@#include "qapi/qobject-output-visitor.h" #include "qapi/qmp/qjson.h" #include "qapi/qmp/qbool.h" +#include "qapi/qmp/qdict.h" #include "qemu/cutils.h" #include "qemu/config-file.h" #include "qemu/option.h"
qemu-io.c +2 -0
@@ -7,6 +7,7 @@* This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include <getopt.h> #include <libgen.h>
@@ -21,6 +22,7 @@#include "qemu/log.h" #include "qapi/qmp/qstring.h" #include "qapi/qmp/qbool.h" +#include "qapi/qmp/qdict.h" #include "qom/object_interfaces.h" #include "sysemu/block-backend.h" #include "block/block_int.h"
qemu-nbd.c +1 -0
@@ -34,6 +34,7 @@#include "qemu/log.h" #include "qemu/systemd.h" #include "block/snapshot.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" #include "qom/object_interfaces.h" #include "io/channel-socket.h"
qobject/json-parser.c +1 -0
@@ -16,6 +16,7 @@#include "qapi/error.h" #include "qemu-common.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"
qobject/qjson.c +1 -0
@@ -18,6 +18,7 @@#include "qapi/qmp/json-streamer.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 "qemu/unicode.h"
qom/object_interfaces.c +1 -0
@@ -1,5 +1,6 @@#include "qemu/osdep.h" #include "qapi/error.h" +#include "qapi/qmp/qdict.h" #include "qom/object_interfaces.h" #include "qemu/module.h" #include "qapi-visit.h"
target/i386/cpu.c +1 -0
@@ -31,6 +31,7 @@#include "qemu/option.h" #include "qemu/config-file.h" #include "qapi/error.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qerror.h" #include "qapi-visit.h"
target/i386/monitor.c +2 -0
@@ -21,10 +21,12 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "cpu.h" #include "monitor/monitor.h" #include "monitor/hmp-target.h" +#include "qapi/qmp/qdict.h" #include "hw/i386/pc.h" #include "sysemu/kvm.h" #include "hmp.h"
target/s390x/cpu_models.c +1 -0
@@ -21,6 +21,7 @@#include "qapi/qmp/qerror.h" #include "qapi/qobject-input-visitor.h" #include "qapi/qmp/qbool.h" +#include "qapi/qmp/qdict.h" #ifndef CONFIG_USER_ONLY #include "sysemu/arch_init.h" #endif
tests/ahci-test.c +1 -0
@@ -31,6 +31,7 @@#include "libqos/pci-pc.h" #include "qemu-common.h" +#include "qapi/qmp/qdict.h" #include "qemu/host-utils.h" #include "hw/pci/pci_ids.h"
tests/check-qobject.c +1 -0
@@ -9,6 +9,7 @@#include "qemu/osdep.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"
tests/cpu-plug-test.c +1 -0
@@ -11,6 +11,7 @@#include "qemu-common.h" #include "libqtest.h" +#include "qapi/qmp/qdict.h" struct PlugTestData {char *machine;
tests/drive_del-test.c +1 -0
@@ -13,6 +13,7 @@#include "qemu/osdep.h" #include "libqtest.h" #include "libqos/virtio.h" +#include "qapi/qmp/qdict.h" static void drive_add (void ) {
tests/libqos/libqos.c +1 -0
@@ -4,6 +4,7 @@#include "libqtest.h" #include "libqos/libqos.h" #include "libqos/pci.h" +#include "qapi/qmp/qdict.h" /*** Test Setup & Teardown ***/
tests/libqos/pci-pc.c +1 -1
@@ -13,7 +13,7 @@#include "qemu/osdep.h" #include "libqtest.h" #include "libqos/pci-pc.h" - +#include "qapi/qmp/qdict.h" #include "hw/pci/pci_regs.h" #include "qemu-common.h"
tests/libqtest.c +1 -0
@@ -24,6 +24,7 @@#include "qapi/error.h" #include "qapi/qmp/json-parser.h" #include "qapi/qmp/json-streamer.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qjson.h" #include "qapi/qmp/qlist.h"
tests/libqtest.h +0 -2
@@ -17,8 +17,6 @@#ifndef LIBQTEST_H #define LIBQTEST_H -#include "qapi/qmp/qdict.h" -typedef struct QTestState QTestState ;extern QTestState *global_qtest;
tests/migration-test.c +1 -0
@@ -13,6 +13,7 @@#include "qemu/osdep.h" #include "libqtest.h" +#include "qapi/qmp/qdict.h" #include "qemu/option.h" #include "qemu/range.h" #include "qemu/sockets.h"
tests/numa-test.c +1 -0
@@ -11,6 +11,7 @@#include "qemu/osdep.h" #include "libqtest.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qlist.h" static char *make_cli (const char *generic_cli,const char *test_cli)
tests/pvpanic-test.c +1 -0
@@ -9,6 +9,7 @@#include "qemu/osdep.h" #include "libqtest.h" +#include "qapi/qmp/qdict.h" static void test_panic (void ) {
tests/q35-test.c +1 -0
@@ -14,6 +14,7 @@#include "libqos/pci.h" #include "libqos/pci-pc.h" #include "hw/pci-host/q35.h" +#include "qapi/qmp/qdict.h" #define TSEG_SIZE_TEST_GUEST_RAM_MBYTES 128
tests/qmp-test.c +1 -0
@@ -14,6 +14,7 @@#include "libqtest.h" #include "qapi-visit.h" #include "qapi/error.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qlist.h" #include "qapi/qobject-input-visitor.h" #include "qapi/util.h"
tests/qom-test.c +1 -0
@@ -10,6 +10,7 @@#include "qemu/osdep.h" #include "qemu-common.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qlist.h" #include "qemu/cutils.h" #include "libqtest.h"
tests/tco-test.c +2 -0
@@ -6,11 +6,13 @@* This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. */ +#include "qemu/osdep.h" #include "libqtest.h" #include "libqos/pci.h" #include "libqos/pci-pc.h" +#include "qapi/qmp/qdict.h" #include "hw/pci/pci_regs.h" #include "hw/i386/ich9.h" #include "hw/acpi/ich9.h"
tests/test-keyval.c +1 -0
@@ -12,6 +12,7 @@#include "qemu/osdep.h" #include "qapi/error.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qlist.h" #include "qapi/qmp/qstring.h" #include "qapi/qobject-input-visitor.h"
tests/test-netfilter.c +1 -0
@@ -10,6 +10,7 @@#include "qemu/osdep.h" #include "libqtest.h" +#include "qapi/qmp/qdict.h" /* add a netfilter to a netdev and then remove it */ static void add_one_netfilter (void )
tests/test-qemu-opts.c +1 -0
@@ -10,6 +10,7 @@#include "qemu/osdep.h" #include "qemu/cutils.h" #include "qapi/error.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" #include "qemu/config-file.h"
tests/test-qga.c +1 -0
@@ -5,6 +5,7 @@#include <sys/un.h> #include "libqtest.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qlist.h" typedef struct {
tests/test-qmp-event.c +1 -0
@@ -18,6 +18,7 @@#include "test-qapi-event.h" #include "qapi/error.h" #include "qapi/qmp/qbool.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qnum.h" #include "qapi/qmp/qstring.h" #include "qapi/qmp-event.h"
tests/test-qobject-input-visitor.c +1 -0
@@ -18,6 +18,7 @@#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/qjson.h"
tests/test-qobject-output-visitor.c +1 -0
@@ -17,6 +17,7 @@#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"
tests/test-replication.c +1 -0
@@ -11,6 +11,7 @@#include "qemu/osdep.h" #include "qapi/error.h" +#include "qapi/qmp/qdict.h" #include "replication.h" #include "block/block_int.h" #include "sysemu/block-backend.h"
tests/tmp105-test.c +1 -0
@@ -11,6 +11,7 @@#include "libqtest.h" #include "libqos/i2c.h" +#include "qapi/qmp/qdict.h" #include "hw/misc/tmp105_regs.h" #define OMAP2_I2C_1_BASE 0x48070000
tests/vhost-user-test.c +1 -0
@@ -12,6 +12,7 @@#include "libqtest.h" #include "qapi/error.h" +#include "qapi/qmp/qdict.h" #include "qemu/config-file.h" #include "qemu/option.h" #include "qemu/range.h"
tests/virtio-net-test.c +1 -0
@@ -16,6 +16,7 @@#include "libqos/libqos-spapr.h" #include "libqos/virtio.h" #include "libqos/virtio-pci.h" +#include "qapi/qmp/qdict.h" #include "qemu/bswap.h" #include "hw/virtio/virtio-net.h" #include "standard-headers/linux/virtio_ids.h"
tests/vmgenid-test.c +1 -0
@@ -15,6 +15,7 @@#include "boot-sector.h" #include "acpi-utils.h" #include "libqtest.h" +#include "qapi/qmp/qdict.h" #define VGID_GUID "324e6eaf-d1d1-4bf6-bf41-b9bb6c91fb87"#define VMGENID_GUID_OFFSET 40/* allow space for
tests/wdt_ib700-test.c +1 -0
@@ -9,6 +9,7 @@#include "qemu/osdep.h" #include "libqtest.h" +#include "qapi/qmp/qdict.h" #include "qemu/timer.h" static void qmp_check_no_event (void )
util/keyval.c +1 -0
@@ -81,6 +81,7 @@#include "qemu/osdep.h" #include "qapi/error.h" +#include "qapi/qmp/qdict.h" #include "qapi/qmp/qlist.h" #include "qapi/qmp/qstring.h" #include "qemu/cutils.h"
Signature · 1 line
2.13.6
PATCH v2 13/19 Include qapi/qmp/qstring.h exactly where needed
In reply to Markus Armbruster--- block.c | 1 + include/qapi/qmp/qjson.h | 2 -- monitor.c | 1 + qapi/qobject-input-visitor.c | 1 + qemu-img.c | 1 + qga/main.c | 1 + qobject/qjson.c | 1 + tests/check-qjson.c | 1 + tests/libqtest.c | 1 + tests/test-qobject-input-visitor.c | 1 + tests/test-qobject-output-visitor.c | 1 + tests/test-visitor-serialization.c | 1 + ui/spice-core.c | 1 - 13 files changed, 11 insertions(+), 3 deletions(-)
block.c +1 -0
@@ -34,6 +34,7 @@#include "qapi/qmp/qerror.h" #include "qapi/qmp/qbool.h" #include "qapi/qmp/qjson.h" +#include "qapi/qmp/qstring.h" #include "sysemu/block-backend.h" #include "sysemu/sysemu.h" #include "qemu/notify.h"
include/qapi/qmp/qjson.h +0 -2
@@ -14,8 +14,6 @@#ifndef QJSON_H #define QJSON_H -#include "qapi/qmp/qstring.h" -QObject *qobject_from_json (const char *string,Error **errp);QObject *qobject_from_jsonf (const char *string, ...)GCC_FMT_ATTR (1 ,2 );QObject *qobject_from_jsonv (const char *string,va_list *ap,Error **errp)
monitor.c +1 -0
@@ -55,6 +55,7 @@#include "qapi/qmp/qerror.h" #include "qapi/qmp/qbool.h" #include "qapi/qmp/qnum.h" +#include "qapi/qmp/qstring.h" #include "qapi/qmp/qjson.h" #include "qapi/qmp/json-streamer.h" #include "qapi/qmp/json-parser.h"
qapi/qobject-input-visitor.c +1 -0
@@ -26,6 +26,7 @@#include "qapi/qmp/qlist.h" #include "qapi/qmp/qnull.h" #include "qapi/qmp/qnum.h" +#include "qapi/qmp/qstring.h" #include "qemu/cutils.h" #include "qemu/option.h"
qemu-img.c +1 -0
@@ -32,6 +32,7 @@#include "qapi/qmp/qjson.h" #include "qapi/qmp/qbool.h" #include "qapi/qmp/qdict.h" +#include "qapi/qmp/qstring.h" #include "qemu/cutils.h" #include "qemu/config-file.h" #include "qemu/option.h"
qga/main.c +1 -0
@@ -21,6 +21,7 @@#include "qapi/qmp/json-streamer.h" #include "qapi/qmp/json-parser.h" #include "qapi/qmp/qjson.h" +#include "qapi/qmp/qstring.h" #include "qga/guest-agent-core.h" #include "qemu/module.h" #include "qga-qmp-commands.h"
qobject/qjson.c +1 -0
@@ -21,6 +21,7 @@#include "qapi/qmp/qdict.h" #include "qapi/qmp/qlist.h" #include "qapi/qmp/qnum.h" +#include "qapi/qmp/qstring.h" #include "qemu/unicode.h" typedef struct JSONParsingState
tests/check-qjson.c +1 -0
@@ -19,6 +19,7 @@#include "qapi/qmp/qlit.h" #include "qapi/qmp/qnull.h" #include "qapi/qmp/qnum.h" +#include "qapi/qmp/qstring.h" #include "qemu-common.h" static void escaped_string (void )
tests/libqtest.c +1 -0
@@ -27,6 +27,7 @@#include "qapi/qmp/qdict.h" #include "qapi/qmp/qjson.h" #include "qapi/qmp/qlist.h" +#include "qapi/qmp/qstring.h" #define MAX_IRQ 256#define SOCKET_TIMEOUT 50
tests/test-qobject-input-visitor.c +1 -0
@@ -21,6 +21,7 @@#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 "test-qmp-introspect.h" #include "qmp-introspect.h"
tests/test-qobject-output-visitor.c +1 -0
@@ -21,6 +21,7 @@#include "qapi/qmp/qlist.h" #include "qapi/qmp/qnull.h" #include "qapi/qmp/qnum.h" +#include "qapi/qmp/qstring.h" #include "qapi/qmp/qjson.h" typedef struct TestOutputVisitorData {
tests/test-visitor-serialization.c +1 -0
@@ -18,6 +18,7 @@#include "test-qapi-visit.h" #include "qapi/error.h" #include "qapi/qmp/qjson.h" +#include "qapi/qmp/qstring.h" #include "qapi/qobject-input-visitor.h" #include "qapi/qobject-output-visitor.h" #include "qapi/string-input-visitor.h"
ui/spice-core.c +0 -1
@@ -32,7 +32,6 @@#include "qmp-commands.h" #include "qapi/error.h" #include "qapi/qmp/qbool.h" -#include "qapi/qmp/qstring.h" #include "qapi/qmp/qjson.h" #include "qemu/notify.h" #include "migration/misc.h"
Signature · 1 line
2.13.6
PATCH v2 14/19 Include qapi/qmp/qbool.h exactly where needed
In reply to Markus Armbruster--- block.c | 1 - block/blkdebug.c | 1 - block/curl.c | 1 - block/qcow2.c | 1 - block/quorum.c | 1 - block/vvfat.c | 1 - hw/usb/xen-usb.c | 1 - monitor.c | 1 - qemu-img.c | 1 - qemu-io.c | 1 - target/s390x/cpu_models.c | 1 - tests/check-qlit.c | 1 - tests/device-introspect-test.c | 1 - ui/spice-core.c | 1 - 14 files changed, 14 deletions(-)
block.c +0 -1
@@ -32,7 +32,6 @@#include "qemu/module.h" #include "qapi/error.h" #include "qapi/qmp/qerror.h" -#include "qapi/qmp/qbool.h" #include "qapi/qmp/qjson.h" #include "qapi/qmp/qstring.h" #include "sysemu/block-backend.h"
block/blkdebug.c +0 -1
@@ -29,7 +29,6 @@#include "qemu/config-file.h" #include "block/block_int.h" #include "qemu/module.h" -#include "qapi/qmp/qbool.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" #include "sysemu/qtest.h"
block/curl.c +0 -1
@@ -27,7 +27,6 @@#include "qemu-common.h" #include "qemu/error-report.h" #include "block/block_int.h" -#include "qapi/qmp/qbool.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" #include "crypto/secret.h"
block/qcow2.c +0 -1
@@ -31,7 +31,6 @@#include "qemu/error-report.h" #include "qapi/error.h" #include "qapi/qmp/qerror.h" -#include "qapi/qmp/qbool.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" #include "qapi-event.h"
block/quorum.c +0 -1
@@ -17,7 +17,6 @@#include "qemu/cutils.h" #include "block/block_int.h" #include "qapi/error.h" -#include "qapi/qmp/qbool.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qerror.h" #include "qapi/qmp/qjson.h"
block/vvfat.c +0 -1
@@ -30,7 +30,6 @@#include "qemu/module.h" #include "qemu/bswap.h" #include "migration/blocker.h" -#include "qapi/qmp/qbool.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" #include "qemu/cutils.h"
hw/usb/xen-usb.c +0 -1
@@ -29,7 +29,6 @@#include "hw/usb.h" #include "hw/xen/xen_backend.h" #include "monitor/qdev.h" -#include "qapi/qmp/qbool.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h"
monitor.c +0 -1
@@ -53,7 +53,6 @@#include "qemu/acl.h" #include "sysemu/tpm.h" #include "qapi/qmp/qerror.h" -#include "qapi/qmp/qbool.h" #include "qapi/qmp/qnum.h" #include "qapi/qmp/qstring.h" #include "qapi/qmp/qjson.h"
qemu-img.c +0 -1
@@ -30,7 +30,6 @@#include "qapi-visit.h" #include "qapi/qobject-output-visitor.h" #include "qapi/qmp/qjson.h" -#include "qapi/qmp/qbool.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" #include "qemu/cutils.h"
qemu-io.c +0 -1
@@ -21,7 +21,6 @@#include "qemu/readline.h" #include "qemu/log.h" #include "qapi/qmp/qstring.h" -#include "qapi/qmp/qbool.h" #include "qapi/qmp/qdict.h" #include "qom/object_interfaces.h" #include "sysemu/block-backend.h"
target/s390x/cpu_models.c +0 -1
@@ -20,7 +20,6 @@#include "qemu/error-report.h" #include "qapi/qmp/qerror.h" #include "qapi/qobject-input-visitor.h" -#include "qapi/qmp/qbool.h" #include "qapi/qmp/qdict.h" #ifndef CONFIG_USER_ONLY #include "sysemu/arch_init.h"
tests/check-qlit.c +0 -1
@@ -9,7 +9,6 @@#include "qemu/osdep.h" -#include "qapi/qmp/qbool.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qlist.h" #include "qapi/qmp/qlit.h"
tests/device-introspect-test.c +0 -1
@@ -20,7 +20,6 @@#include "qemu/osdep.h" #include "qemu-common.h" #include "qapi/qmp/qstring.h" -#include "qapi/qmp/qbool.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qlist.h" #include "libqtest.h"
ui/spice-core.c +0 -1
@@ -31,7 +31,6 @@#include "qemu/sockets.h" #include "qmp-commands.h" #include "qapi/error.h" -#include "qapi/qmp/qbool.h" #include "qapi/qmp/qjson.h" #include "qemu/notify.h" #include "migration/misc.h"
Signature · 1 line
2.13.6
PATCH v2 15/19 Include qapi/qmp/qnum.h exactly where needed
In reply to Markus Armbruster--- tests/check-qlit.c | 1 - 1 file changed, 1 deletion(-)
tests/check-qlit.c +0 -1
@@ -12,7 +12,6 @@#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" static QLitObject qlit = QLIT_QDICT(((QLitDictEntry[]) {
Signature · 1 line
2.13.6
PATCH v2 16/19 Include qapi/qmp/qnull.h exactly where needed
In reply to Markus Armbruster--- target/ppc/translate.c | 1 - target/ppc/translate_init.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-)
target/ppc/translate.c +0 -1
@@ -24,7 +24,6 @@#include "disas/disas.h" #include "exec/exec-all.h" #include "tcg-op.h" -#include "qapi/qmp/qnull.h" #include "qemu/host-utils.h" #include "exec/cpu_ldst.h"
target/ppc/translate_init.c +1 -0
@@ -30,6 +30,7 @@#include "mmu-hash64.h" #include "qemu/error-report.h" #include "qapi/error.h" +#include "qapi/qmp/qnull.h" #include "qapi/visitor.h" #include "hw/qdev-properties.h" #include "hw/ppc/ppc.h"
Signature · 1 line
2.13.6
PATCH v2 17/19 Drop superfluous includes of qapi/qmp/dispatch.h
In reply to Markus Armbruster--- monitor.c | 1 - qga/main.c | 1 - tests/test-qmp-commands.c | 1 - 3 files changed, 3 deletions(-)
monitor.c +0 -1
@@ -79,7 +79,6 @@#include "sysemu/qtest.h" #include "sysemu/cpus.h" #include "qemu/cutils.h" -#include "qapi/qmp/dispatch.h" #if defined(TARGET_S390X )#include "hw/s390x/storage-keys.h"
qga/main.c +0 -1
@@ -27,7 +27,6 @@#include "qga-qmp-commands.h" #include "qapi/qmp/qerror.h" #include "qapi/error.h" -#include "qapi/qmp/dispatch.h" #include "qga/channel.h" #include "qemu/bswap.h" #include "qemu/help_option.h"
tests/test-qmp-commands.c +0 -1
@@ -5,7 +5,6 @@#include "qapi/qmp/qstring.h" #include "test-qmp-commands.h" #include "qapi/error.h" -#include "qapi/qmp/dispatch.h" #include "qemu/module.h" #include "qapi/qobject-input-visitor.h" #include "tests/test-qapi-types.h"
Signature · 1 line
2.13.6
PATCH v2 18/19 Drop superfluous includes of qapi/qmp/qjson.h
In reply to Markus Armbruster--- balloon.c | 1 - block/nbd.c | 1 - block/quorum.c | 1 - blockjob.c | 1 - hw/core/qdev.c | 1 - hw/net/virtio-net.c | 1 - hw/pci/pcie_aer.c | 1 - target/s390x/kvm.c | 1 - tests/test-qobject-output-visitor.c | 1 - ui/spice-core.c | 1 - vl.c | 1 - 11 files changed, 11 deletions(-)
balloon.c +0 -1
@@ -33,7 +33,6 @@#include "qmp-commands.h" #include "qapi/error.h" #include "qapi/qmp/qerror.h" -#include "qapi/qmp/qjson.h" static QEMUBalloonEvent *balloon_event_fn;static QEMUBalloonStatus *balloon_stat_fn;
block/nbd.c +0 -1
@@ -36,7 +36,6 @@#include "qapi/qobject-input-visitor.h" #include "qapi/qobject-output-visitor.h" #include "qapi/qmp/qdict.h" -#include "qapi/qmp/qjson.h" #include "qapi/qmp/qstring.h" #include "qemu/cutils.h"
block/quorum.c +0 -1
@@ -19,7 +19,6 @@#include "qapi/error.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qerror.h" -#include "qapi/qmp/qjson.h" #include "qapi/qmp/qlist.h" #include "qapi/qmp/qstring.h" #include "qapi-event.h"
blockjob.c +0 -1
@@ -31,7 +31,6 @@#include "sysemu/block-backend.h" #include "qapi/error.h" #include "qapi/qmp/qerror.h" -#include "qapi/qmp/qjson.h" #include "qemu/coroutine.h" #include "qemu/id.h" #include "qemu/timer.h"
hw/core/qdev.c +0 -1
@@ -31,7 +31,6 @@#include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qapi/visitor.h" -#include "qapi/qmp/qjson.h" #include "qemu/error-report.h" #include "hw/hotplug.h" #include "hw/boards.h"
hw/net/virtio-net.c +0 -1
@@ -23,7 +23,6 @@#include "net/vhost_net.h" #include "hw/virtio/virtio-bus.h" #include "qapi/error.h" -#include "qapi/qmp/qjson.h" #include "qapi-event.h" #include "hw/virtio/virtio-access.h" #include "migration/misc.h"
hw/pci/pcie_aer.c +0 -1
@@ -21,7 +21,6 @@#include "qemu/osdep.h" #include "sysemu/sysemu.h" #include "qapi/qmp/qdict.h" -#include "qapi/qmp/qjson.h" #include "monitor/monitor.h" #include "hw/pci/pci_bridge.h" #include "hw/pci/pcie.h"
target/s390x/kvm.c +0 -1
@@ -38,7 +38,6 @@#include "sysemu/hw_accel.h" #include "hw/hw.h" #include "sysemu/device_tree.h" -#include "qapi/qmp/qjson.h" #include "exec/gdbstub.h" #include "exec/address-spaces.h" #include "trace.h"
tests/test-qobject-output-visitor.c +0 -1
@@ -22,7 +22,6 @@#include "qapi/qmp/qnull.h" #include "qapi/qmp/qnum.h" #include "qapi/qmp/qstring.h" -#include "qapi/qmp/qjson.h" typedef struct TestOutputVisitorData { Visitor *ov;
ui/spice-core.c +0 -1
@@ -31,7 +31,6 @@#include "qemu/sockets.h" #include "qmp-commands.h" #include "qapi/error.h" -#include "qapi/qmp/qjson.h" #include "qemu/notify.h" #include "migration/misc.h" #include "hw/hw.h"
vl.c +0 -1
@@ -98,7 +98,6 @@ int main(int argc, char **argv)#include "sysemu/hax.h" #include "qapi/qobject-input-visitor.h" #include "qapi-visit.h" -#include "qapi/qmp/qjson.h" #include "qemu/option.h" #include "qemu/config-file.h" #include "qemu-options.h"
Signature · 1 line
2.13.6
PATCH v2 19/19 Move include qemu/option.h from qemu-common.h to actual users
In reply to Markus Armbrusterqemu-common.h includes qemu/option.h, but most places that include the former don't actually need the latter. Drop the include, and add it to the places that actually need it.
While there, drop superfluous includes of both headers, and separate #include from file comment with a blank line.
This cleanup makes the number of objects depending on qemu/option.h drop from 4545 (out of 4743) to 284 in my "build everything" tree.
--- accel/accel.c | 2 +- block.c | 1 + block/blkdebug.c | 1 + block/blkverify.c | 1 + block/block-backend.c | 1 + block/crypto.c | 1 + block/curl.c | 2 +- block/file-posix.c | 2 ++ block/file-win32.c | 2 ++ block/gluster.c | 2 ++ block/iscsi-opts.c | 1 + block/iscsi.c | 2 +- block/nbd.c | 1 + block/nfs.c | 2 +- block/null.c | 1 + block/parallels.c | 3 ++- block/qcow.c | 2 +- block/qed.c | 1 + block/quorum.c | 1 + block/rbd.c | 1 + block/replication.c | 2 +- block/sheepdog.c | 1 + block/snapshot.c | 1 + block/ssh.c | 1 + block/throttle.c | 1 + block/vdi.c | 1 + block/vhdx.c | 2 +- block/vmdk.c | 1 + block/vpc.c | 3 ++- block/vvfat.c | 1 + chardev/char-file.c | 3 ++- chardev/char-mux.c | 3 ++- chardev/char-parallel.c | 2 ++ chardev/char-pipe.c | 2 ++ chardev/char-ringbuf.c | 1 + chardev/char-serial.c | 2 ++ chardev/char-socket.c | 2 ++ chardev/char-stdio.c | 3 ++- chardev/char-udp.c | 2 ++ chardev/char.c | 1 + chardev/spice.c | 1 + contrib/ivshmem-server/main.c | 2 +- cpus.c | 2 +- device-hotplug.c | 1 + device_tree.c | 2 +- fsdev/qemu-fsdev-throttle.c | 1 + fsdev/qemu-fsdev.c | 2 +- fsdev/qemu-fsdev.h | 1 - hw/9pfs/9p-handle.c | 1 + hw/9pfs/9p-local.c | 1 + hw/9pfs/9p-proxy.c | 1 + hw/9pfs/xen-9p-backend.c | 1 + hw/acpi/core.c | 1 + hw/arm/boot.c | 1 + hw/core/qdev.c | 1 + hw/i386/multiboot.c | 2 +- hw/i386/pc.c | 1 + hw/i386/pc_sysfw.c | 1 + hw/nvram/fw_cfg.c | 2 ++ hw/ppc/e500.c | 2 +- hw/ppc/virtex_ml507.c | 1 + hw/s390x/s390-virtio-ccw.c | 2 +- hw/scsi/scsi-bus.c | 1 + hw/smbios/smbios.c | 1 + hw/usb/xen-usb.c | 2 +- hw/vfio/pci.c | 1 + hw/xen/xen_devconfig.c | 1 + hw/xtensa/xtfpga.c | 2 +- include/block/block.h | 1 - include/block/block_int.h | 1 - include/block/nbd.h | 2 -- include/block/snapshot.h | 2 -- include/chardev/char.h | 2 -- include/hw/acpi/acpi.h | 1 - include/hw/qdev-core.h | 1 - include/hw/smbios/smbios.h | 1 - include/net/net.h | 2 -- include/net/slirp.h | 2 -- include/qapi/opts-visitor.h | 1 - include/qemu-common.h | 2 -- include/qemu/config-file.h | 1 - include/sysemu/arch_init.h | 1 - include/sysemu/hostmem.h | 1 - include/sysemu/numa.h | 1 - include/sysemu/sysemu.h | 1 - include/ui/qemu-spice.h | 1 - monitor.c | 2 +- net/net.c | 2 +- net/vhost-user.c | 1 + qdev-monitor.c | 1 + qemu-io-cmds.c | 1 + qemu-nbd.c | 2 +- qmp.c | 1 + qom/object_interfaces.c | 1 + replay/replay.c | 2 +- tests/test-char.c | 2 +- tests/test-qemu-opts.c | 1 + tests/test-replication.c | 1 + trace/control.c | 1 + ui/console.c | 2 +- ui/spice-core.c | 2 +- ui/spice-display.c | 2 +- ui/vnc.c | 1 + 103 files changed, 98 insertions(+), 54 deletions(-)
accel/accel.c +1 -1
@@ -26,7 +26,6 @@#include "qemu/osdep.h" #include "sysemu/accel.h" #include "hw/boards.h" -#include "qemu-common.h" #include "sysemu/arch_init.h" #include "sysemu/sysemu.h" #include "sysemu/kvm.h"
@@ -34,6 +33,7 @@#include "hw/xen/xen.h" #include "qom/object.h" #include "qemu/error-report.h" +#include "qemu/option.h" static const TypeInfo accel_type = { .name =TYPE_ACCEL ,
block.c +1 -0
@@ -37,6 +37,7 @@#include "sysemu/block-backend.h" #include "sysemu/sysemu.h" #include "qemu/notify.h" +#include "qemu/option.h" #include "qemu/coroutine.h" #include "block/qapi.h" #include "qemu/timer.h"
block/blkdebug.c +1 -0
@@ -29,6 +29,7 @@#include "qemu/config-file.h" #include "block/block_int.h" #include "qemu/module.h" +#include "qemu/option.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" #include "sysemu/qtest.h"
block/blkverify.c +1 -0
@@ -14,6 +14,7 @@#include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" #include "qemu/cutils.h" +#include "qemu/option.h" typedef struct { BdrvChild *test_file;
block/block-backend.c +1 -0
@@ -20,6 +20,7 @@#include "qapi-event.h" #include "qapi/error.h" #include "qemu/id.h" +#include "qemu/option.h" #include "trace.h" #include "migration/misc.h"
block/crypto.c +1 -0
@@ -28,6 +28,7 @@#include "qapi/qobject-input-visitor.h" #include "qapi-visit.h" #include "qapi/error.h" +#include "qemu/option.h" #include "block/crypto.h" typedef struct BlockCrypto BlockCrypto ;
block/curl.c +1 -1
@@ -24,8 +24,8 @@#include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "block/block_int.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h"
block/file-posix.c +2 -0
@@ -21,12 +21,14 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/cutils.h" #include "qemu/error-report.h" #include "block/block_int.h" #include "qemu/module.h" +#include "qemu/option.h" #include "trace.h" #include "block/thread-pool.h" #include "qemu/iov.h"
block/file-win32.c +2 -0
@@ -21,11 +21,13 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/cutils.h" #include "block/block_int.h" #include "qemu/module.h" +#include "qemu/option.h" #include "block/raw-aio.h" #include "trace.h" #include "block/thread-pool.h"
block/gluster.c +2 -0
@@ -7,6 +7,7 @@* See the COPYING file in the top-level directory. * */ +#include "qemu/osdep.h" #include <glusterfs/api/glfs.h> #include "block/block_int.h"
@@ -15,6 +16,7 @@#include "qapi/qmp/qerror.h" #include "qemu/uri.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "qemu/cutils.h" #define GLUSTER_OPT_FILENAME "filename"
block/iscsi-opts.c +1 -0
@@ -25,6 +25,7 @@#include "qemu/osdep.h" #include "qemu-common.h" #include "qemu/config-file.h" +#include "qemu/option.h" static QemuOptsList qemu_iscsi_opts = { .name ="iscsi" ,
block/iscsi.c +1 -1
@@ -28,7 +28,6 @@#include <poll.h> #include <math.h> #include <arpa/inet.h> -#include "qemu-common.h" #include "qemu/config-file.h" #include "qemu/error-report.h" #include "qemu/bitops.h"
@@ -36,6 +35,7 @@#include "block/block_int.h" #include "scsi/constants.h" #include "qemu/iov.h" +#include "qemu/option.h" #include "qemu/uuid.h" #include "qmp-commands.h" #include "qapi/error.h"
block/nbd.c +1 -0
@@ -32,6 +32,7 @@#include "qemu/uri.h" #include "block/block_int.h" #include "qemu/module.h" +#include "qemu/option.h" #include "qapi-visit.h" #include "qapi/qobject-input-visitor.h" #include "qapi/qobject-output-visitor.h"
block/nfs.c +1 -1
@@ -25,13 +25,13 @@#include "qemu/osdep.h" #include <poll.h> -#include "qemu-common.h" #include "qemu/config-file.h" #include "qemu/error-report.h" #include "qapi/error.h" #include "block/block_int.h" #include "trace.h" #include "qemu/iov.h" +#include "qemu/option.h" #include "qemu/uri.h" #include "qemu/cutils.h" #include "sysemu/sysemu.h"
block/null.c +1 -0
@@ -14,6 +14,7 @@#include "qapi/error.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h" +#include "qemu/option.h" #include "block/block_int.h" #define NULL_OPT_LATENCY "latency-ns"
block/parallels.c +2 -1
@@ -27,12 +27,13 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "block/block_int.h" #include "sysemu/block-backend.h" #include "qemu/module.h" +#include "qemu/option.h" #include "qemu/bswap.h" #include "qemu/bitmap.h" #include "migration/blocker.h"
block/qcow.c +1 -1
@@ -24,11 +24,11 @@#include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "qemu/error-report.h" #include "block/block_int.h" #include "sysemu/block-backend.h" #include "qemu/module.h" +#include "qemu/option.h" #include "qemu/bswap.h" #include <zlib.h> #include "qapi/qmp/qdict.h"
block/qed.c +1 -0
@@ -16,6 +16,7 @@#include "qapi/error.h" #include "qemu/timer.h" #include "qemu/bswap.h" +#include "qemu/option.h" #include "trace.h" #include "qed.h" #include "sysemu/block-backend.h"
block/quorum.c +1 -0
@@ -15,6 +15,7 @@#include "qemu/osdep.h" #include "qemu/cutils.h" +#include "qemu/option.h" #include "block/block_int.h" #include "qapi/error.h" #include "qapi/qmp/qdict.h"
block/rbd.c +1 -0
@@ -16,6 +16,7 @@#include <rbd/librbd.h> #include "qapi/error.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "block/block_int.h" #include "crypto/secret.h" #include "qemu/cutils.h"
block/replication.c +1 -1
@@ -13,7 +13,7 @@*/ #include "qemu/osdep.h" -#include "qemu-common.h" +#include "qemu/option.h" #include "block/nbd.h" #include "block/blockjob.h" #include "block/block_int.h"
block/sheepdog.c +1 -0
@@ -19,6 +19,7 @@#include "qapi/qobject-input-visitor.h" #include "qemu/uri.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "qemu/sockets.h" #include "block/block_int.h" #include "sysemu/block-backend.h"
block/snapshot.c +1 -0
@@ -29,6 +29,7 @@#include "qapi/qmp/qdict.h" #include "qapi/qmp/qerror.h" #include "qapi/qmp/qstring.h" +#include "qemu/option.h" QemuOptsList internal_snapshot_opts = { .name ="snapshot" ,
block/ssh.c +1 -0
@@ -30,6 +30,7 @@#include "block/block_int.h" #include "qapi/error.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "qemu/cutils.h" #include "qemu/sockets.h" #include "qemu/uri.h"
block/throttle.c +1 -0
@@ -19,6 +19,7 @@#include "qemu/osdep.h" #include "block/throttle-groups.h" +#include "qemu/option.h" #include "qemu/throttle-options.h" #include "qapi/error.h"
block/vdi.c +1 -0
@@ -54,6 +54,7 @@#include "block/block_int.h" #include "sysemu/block-backend.h" #include "qemu/module.h" +#include "qemu/option.h" #include "qemu/bswap.h" #include "migration/blocker.h" #include "qemu/coroutine.h"
block/vhdx.c +1 -1
@@ -17,10 +17,10 @@#include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "block/block_int.h" #include "sysemu/block-backend.h" #include "qemu/module.h" +#include "qemu/option.h" #include "qemu/crc32c.h" #include "qemu/bswap.h" #include "block/vhdx.h"
block/vmdk.c +1 -0
@@ -30,6 +30,7 @@#include "qapi/qmp/qerror.h" #include "qemu/error-report.h" #include "qemu/module.h" +#include "qemu/option.h" #include "qemu/bswap.h" #include "migration/blocker.h" #include "qemu/cutils.h"
block/vpc.c +2 -1
@@ -22,12 +22,13 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "block/block_int.h" #include "sysemu/block-backend.h" #include "qemu/module.h" +#include "qemu/option.h" #include "migration/blocker.h" #include "qemu/bswap.h" #include "qemu/uuid.h"
block/vvfat.c +1 -0
@@ -28,6 +28,7 @@#include "qapi/error.h" #include "block/block_int.h" #include "qemu/module.h" +#include "qemu/option.h" #include "qemu/bswap.h" #include "migration/blocker.h" #include "qapi/qmp/qdict.h"
chardev/char-file.c +2 -1
@@ -21,9 +21,10 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" +#include "qemu/option.h" #include "chardev/char.h" #ifdef _WIN32
chardev/char-mux.c +2 -1
@@ -21,9 +21,10 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" +#include "qemu/option.h" #include "chardev/char.h" #include "sysemu/block-backend.h" #include "chardev/char-mux.h"
chardev/char-parallel.c +2 -0
@@ -21,9 +21,11 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "chardev/char.h" #include "qapi/error.h" +#include "qemu/option.h" #include <sys/ioctl.h> #ifdef CONFIG_BSD
chardev/char-pipe.c +2 -0
@@ -21,8 +21,10 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/option.h" #include "chardev/char.h" #ifdef _WIN32
chardev/char-ringbuf.c +1 -0
@@ -27,6 +27,7 @@#include "qmp-commands.h" #include "qapi/error.h" #include "qemu/base64.h" +#include "qemu/option.h" /* Ring buffer chardev */
chardev/char-serial.c +2 -0
@@ -21,7 +21,9 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" +#include "qemu/option.h" #include "qemu/sockets.h" #include "io/channel-file.h" #include "qapi/error.h"
chardev/char-socket.c +2 -0
@@ -21,12 +21,14 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "chardev/char.h" #include "io/channel-socket.h" #include "io/channel-tls.h" #include "io/net-listener.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "qapi/error.h" #include "qapi/clone-visitor.h"
chardev/char-stdio.c +2 -1
@@ -21,10 +21,11 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" +#include "qemu/option.h" #include "qemu/sockets.h" #include "qapi/error.h" -#include "qemu-common.h" #include "chardev/char.h" #ifdef _WIN32
chardev/char-udp.c +2 -0
@@ -21,10 +21,12 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "chardev/char.h" #include "io/channel-socket.h" #include "qapi/error.h" +#include "qemu/option.h" #include "chardev/char-io.h"
chardev/char.c +1 -0
@@ -34,6 +34,7 @@#include "qapi/error.h" #include "sysemu/replay.h" #include "qemu/help_option.h" +#include "qemu/option.h" #include "chardev/char-mux.h"
chardev/spice.c +1 -0
@@ -4,6 +4,7 @@#include "chardev/char.h" #include "qapi/error.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include <spice.h> #include <spice/protocol.h>
contrib/ivshmem-server/main.c +1 -1
@@ -9,7 +9,7 @@#include "qemu/osdep.h" #include "qapi/error.h" #include "qemu/cutils.h" - +#include "qemu/option.h" #include "ivshmem-server.h" #define IVSHMEM_SERVER_DEFAULT_VERBOSE 0
cpus.c +1 -1
@@ -23,7 +23,6 @@*/ #include "qemu/osdep.h" -#include "qemu-common.h" #include "qemu/config-file.h" #include "cpu.h" #include "monitor/monitor.h"
@@ -45,6 +44,7 @@#include "sysemu/cpus.h" #include "sysemu/qtest.h" #include "qemu/main-loop.h" +#include "qemu/option.h" #include "qemu/bitmap.h" #include "qemu/seqlock.h" #include "tcg.h"
device-hotplug.c +1 -0
@@ -29,6 +29,7 @@#include "sysemu/blockdev.h" #include "qapi/qmp/qdict.h" #include "qemu/config-file.h" +#include "qemu/option.h" #include "sysemu/sysemu.h" #include "monitor/monitor.h" #include "block/block_int.h"
device_tree.c +1 -1
@@ -18,8 +18,8 @@#endif #include "qapi/error.h" -#include "qemu-common.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "qemu/bswap.h" #include "sysemu/device_tree.h" #include "sysemu/sysemu.h"
fsdev/qemu-fsdev-throttle.c +1 -0
@@ -16,6 +16,7 @@#include "qemu/error-report.h" #include "qemu-fsdev-throttle.h" #include "qemu/iov.h" +#include "qemu/option.h" static void fsdev_throttle_read_timer_cb (void *opaque) {
fsdev/qemu-fsdev.c +1 -1
@@ -14,9 +14,9 @@#include "qapi/error.h" #include "qemu-fsdev.h" #include "qemu/queue.h" -#include "qemu-common.h" #include "qemu/config-file.h" #include "qemu/error-report.h" +#include "qemu/option.h" static QTAILQ_HEAD(FsDriverEntry_head, FsDriverListEntry) fsdriver_entries =QTAILQ_HEAD_INITIALIZER (fsdriver_entries);
fsdev/qemu-fsdev.h +0 -1
@@ -12,7 +12,6 @@*/ #ifndef QEMU_FSDEV_H #define QEMU_FSDEV_H -#include "qemu/option.h" #include "file-op-9p.h"
hw/9pfs/9p-handle.c +1 -0
@@ -22,6 +22,7 @@#include "qemu/xattr.h" #include "qemu/cutils.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include <linux/fs.h> #ifdef CONFIG_LINUX_MAGIC_H #include <linux/magic.h>
hw/9pfs/9p-local.c +1 -0
@@ -25,6 +25,7 @@#include "qapi/error.h" #include "qemu/cutils.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include <libgen.h> #include <linux/fs.h> #ifdef CONFIG_LINUX_MAGIC_H
hw/9pfs/9p-proxy.c +1 -0
@@ -17,6 +17,7 @@#include "qapi/error.h" #include "qemu/cutils.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "fsdev/qemu-fsdev.h" #include "9p-proxy.h"
hw/9pfs/xen-9p-backend.c +1 -0
@@ -15,6 +15,7 @@#include "hw/xen/xen_backend.h" #include "hw/9pfs/xen-9pfs.h" #include "qemu/config-file.h" +#include "qemu/option.h" #include "fsdev/qemu-fsdev.h" #define VERSIONS "1"
hw/acpi/core.c +1 -0
@@ -30,6 +30,7 @@#include "qapi-visit.h" #include "qapi-event.h" #include "qemu/error-report.h" +#include "qemu/option.h" struct acpi_table_header {uint16_t _length;/* our length, not actual part of the hdr */
hw/arm/boot.c +1 -0
@@ -21,6 +21,7 @@#include "elf.h" #include "sysemu/device_tree.h" #include "qemu/config-file.h" +#include "qemu/option.h" #include "exec/address-spaces.h" /* Kernel boot protocol is specified in the kernel docs
hw/core/qdev.c +1 -0
@@ -32,6 +32,7 @@#include "qapi/qmp/qerror.h" #include "qapi/visitor.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "hw/hotplug.h" #include "hw/boards.h" #include "hw/sysbus.h"
hw/i386/multiboot.c +1 -1
@@ -23,7 +23,7 @@*/ #include "qemu/osdep.h" -#include "qemu-common.h" +#include "qemu/option.h" #include "cpu.h" #include "hw/hw.h" #include "hw/nvram/fw_cfg.h"
hw/i386/pc.c +1 -0
@@ -59,6 +59,7 @@#include "qemu/bitmap.h" #include "qemu/config-file.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "hw/acpi/acpi.h" #include "hw/acpi/cpu_hotplug.h" #include "hw/boards.h"
hw/i386/pc_sysfw.c +1 -0
@@ -27,6 +27,7 @@#include "qapi/error.h" #include "sysemu/block-backend.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "hw/sysbus.h" #include "hw/hw.h" #include "hw/i386/pc.h"
hw/nvram/fw_cfg.c +2 -0
@@ -21,6 +21,7 @@* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ +#include "qemu/osdep.h" #include "hw/hw.h" #include "sysemu/sysemu.h"
@@ -31,6 +32,7 @@#include "hw/sysbus.h" #include "trace.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "qemu/config-file.h" #include "qemu/cutils.h" #include "qapi/error.h"
hw/ppc/e500.c +1 -1
@@ -16,7 +16,6 @@#include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "e500.h" #include "e500-ccsr.h" #include "net/net.h"
@@ -36,6 +35,7 @@#include "hw/sysbus.h" #include "exec/address-spaces.h" #include "qemu/host-utils.h" +#include "qemu/option.h" #include "hw/pci-host/ppce500.h" #include "qemu/error-report.h" #include "hw/platform-bus.h"
hw/ppc/virtex_ml507.c +1 -0
@@ -36,6 +36,7 @@#include "elf.h" #include "qemu/error-report.h" #include "qemu/log.h" +#include "qemu/option.h" #include "exec/address-spaces.h" #include "hw/ppc/ppc.h"
hw/s390x/s390-virtio-ccw.c +1 -1
@@ -12,7 +12,6 @@#include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include "hw/boards.h" #include "exec/address-spaces.h"
@@ -24,6 +23,7 @@#include "virtio-ccw.h" #include "qemu/config-file.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "s390-pci-bus.h" #include "hw/s390x/storage-keys.h" #include "hw/s390x/storage-attributes.h"
hw/scsi/scsi-bus.c +1 -0
@@ -2,6 +2,7 @@#include "hw/hw.h" #include "qapi/error.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "hw/scsi/scsi.h" #include "scsi/constants.h" #include "hw/qdev.h"
hw/smbios/smbios.c +1 -0
@@ -19,6 +19,7 @@#include "qapi/error.h" #include "qemu/config-file.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "sysemu/sysemu.h" #include "qemu/uuid.h" #include "sysemu/cpus.h"
hw/usb/xen-usb.c +1 -1
@@ -23,8 +23,8 @@#include <libusb.h> #include <sys/user.h> -#include "qemu-common.h" #include "qemu/config-file.h" +#include "qemu/option.h" #include "hw/sysbus.h" #include "hw/usb.h" #include "hw/xen/xen_backend.h"
hw/vfio/pci.c +1 -0
@@ -26,6 +26,7 @@#include "hw/pci/msix.h" #include "hw/pci/pci_bridge.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "qemu/range.h" #include "sysemu/kvm.h" #include "sysemu/sysemu.h"
hw/xen/xen_devconfig.c +1 -0
@@ -1,5 +1,6 @@#include "qemu/osdep.h" #include "hw/xen/xen_backend.h" +#include "qemu/option.h" #include "sysemu/block-backend.h" #include "sysemu/blockdev.h"
hw/xtensa/xtfpga.c +1 -1
@@ -27,7 +27,6 @@#include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "cpu.h" #include "sysemu/sysemu.h" #include "hw/boards.h"
@@ -43,6 +42,7 @@#include "chardev/char.h" #include "sysemu/device_tree.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "bootparam.h" #include "xtensa_memory.h"
include/block/block.h +0 -1
@@ -4,7 +4,6 @@#include "block/aio.h" #include "qapi-types.h" #include "qemu/iov.h" -#include "qemu/option.h" #include "qemu/coroutine.h" #include "block/accounting.h" #include "block/dirty-bitmap.h"
include/block/block_int.h +0 -1
@@ -26,7 +26,6 @@#include "block/accounting.h" #include "block/block.h" -#include "qemu/option.h" #include "qemu/queue.h" #include "qemu/coroutine.h" #include "qemu/stats64.h"
include/block/nbd.h +0 -2
@@ -21,8 +21,6 @@#define NBD_H -#include "qemu-common.h" -#include "qemu/option.h" #include "io/channel-socket.h" #include "crypto/tlscreds.h"
include/block/snapshot.h +0 -2
@@ -25,8 +25,6 @@#ifndef SNAPSHOT_H #define SNAPSHOT_H -#include "qemu-common.h" -#include "qemu/option.h" #define SNAPSHOT_OPT_BASE "snapshot."
include/chardev/char.h +0 -2
@@ -1,8 +1,6 @@#ifndef QEMU_CHAR_H #define QEMU_CHAR_H -#include "qemu-common.h" -#include "qemu/option.h" #include "qemu/main-loop.h" #include "qemu/bitmap.h" #include "qom/object.h"
include/hw/acpi/acpi.h +0 -1
@@ -21,7 +21,6 @@*/ #include "qemu/notify.h" -#include "qemu/option.h" #include "exec/memory.h" #include "hw/irq.h" #include "hw/acpi/acpi_dev_interface.h"
include/hw/qdev-core.h +0 -1
@@ -2,7 +2,6 @@#define QDEV_CORE_H #include "qemu/queue.h" -#include "qemu/option.h" #include "qemu/bitmap.h" #include "qom/object.h" #include "hw/irq.h"
include/hw/smbios/smbios.h +0 -1
@@ -14,7 +14,6 @@* */ -#include "qemu/option.h" #define SMBIOS_MAX_TYPE 127
include/net/net.h +0 -2
@@ -2,9 +2,7 @@#define QEMU_NET_H #include "qemu/queue.h" -#include "qemu-common.h" #include "qapi-types.h" -#include "qemu/option.h" #include "net/queue.h" #include "migration/vmstate.h"
include/net/slirp.h +0 -2
@@ -24,8 +24,6 @@#ifndef QEMU_NET_SLIRP_H #define QEMU_NET_SLIRP_H -#include "qemu-common.h" -#include "qemu/option.h" #ifdef CONFIG_SLIRP
include/qapi/opts-visitor.h +0 -1
@@ -14,7 +14,6 @@#define OPTS_VISITOR_H #include "qapi/visitor.h" -#include "qemu/option.h" /* Inclusive upper bound on the size of any flattened range. This is a safety * (= anti-annoyance) measure; wrong ranges should not cause long startup
include/qemu-common.h +0 -2
@@ -16,8 +16,6 @@#define TFR (expr) do { if ((expr) != -1) break; } while (errno == EINTR) -#include "qemu/option.h" -/* Copyright string for -version arguments, About dialogs, etc */ #define QEMU_COPYRIGHT "Copyright (c) 2003-2017 " \ "Fabrice Bellard and the QEMU Project developers"
include/qemu/config-file.h +0 -1
@@ -1,7 +1,6 @@#ifndef QEMU_CONFIG_FILE_H #define QEMU_CONFIG_FILE_H -#include "qemu/option.h" QemuOptsList *qemu_find_opts (const char *group);QemuOptsList *qemu_find_opts_err (const char *group,Error **errp);
include/sysemu/arch_init.h +0 -1
@@ -2,7 +2,6 @@#define QEMU_ARCH_INIT_H #include "qapi-types.h" -#include "qemu/option.h" enum {QEMU_ARCH_ALL =-1 ,
include/sysemu/hostmem.h +0 -1
@@ -16,7 +16,6 @@#include "sysemu/sysemu.h" /* for MAX_NODES */ #include "qom/object.h" #include "exec/memory.h" -#include "qemu/option.h" #include "qemu/bitmap.h" #define TYPE_MEMORY_BACKEND "memory-backend"
include/sysemu/numa.h +0 -1
@@ -2,7 +2,6 @@#define SYSEMU_NUMA_H #include "qemu/bitmap.h" -#include "qemu/option.h" #include "sysemu/sysemu.h" #include "sysemu/hostmem.h" #include "hw/boards.h"
include/sysemu/sysemu.h +0 -1
@@ -2,7 +2,6 @@#define SYSEMU_H /* Misc. things related to the system emulator. */ -#include "qemu/option.h" #include "qemu/queue.h" #include "qemu/timer.h" #include "qemu/notify.h"
include/ui/qemu-spice.h +0 -1
@@ -23,7 +23,6 @@#ifdef CONFIG_SPICE #include <spice.h> -#include "qemu/option.h" #include "qemu/config-file.h" extern int using_spice;
monitor.c +1 -1
@@ -24,7 +24,6 @@#include "qemu/osdep.h" #include <dirent.h> -#include "qemu-common.h" #include "cpu.h" #include "hw/hw.h" #include "monitor/qdev.h"
@@ -68,6 +67,7 @@#include "exec/memory.h" #include "exec/exec-all.h" #include "qemu/log.h" +#include "qemu/option.h" #include "qmp-commands.h" #include "hmp.h" #include "qemu/thread.h"
net/net.c +1 -1
@@ -32,7 +32,6 @@#include "util.h" #include "monitor/monitor.h" -#include "qemu-common.h" #include "qemu/help_option.h" #include "qapi/qmp/qerror.h" #include "qemu/error-report.h"
@@ -43,6 +42,7 @@#include "hw/qdev.h" #include "qemu/iov.h" #include "qemu/main-loop.h" +#include "qemu/option.h" #include "qapi-visit.h" #include "qapi/error.h" #include "qapi/opts-visitor.h"
net/vhost-user.c +1 -0
@@ -16,6 +16,7 @@#include "qapi/error.h" #include "qemu/config-file.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "qmp-commands.h" #include "trace.h"
qdev-monitor.c +1 -0
@@ -29,6 +29,7 @@#include "qemu/config-file.h" #include "qemu/error-report.h" #include "qemu/help_option.h" +#include "qemu/option.h" #include "sysemu/block-backend.h" #include "migration/misc.h"
qemu-io-cmds.c +1 -0
@@ -17,6 +17,7 @@#include "block/qapi.h" #include "qemu/error-report.h" #include "qemu/main-loop.h" +#include "qemu/option.h" #include "qemu/timer.h" #include "qemu/cutils.h"
qemu-nbd.c +1 -1
@@ -22,12 +22,12 @@#include <pthread.h> #include "qapi/error.h" -#include "qemu-common.h" #include "qemu/cutils.h" #include "sysemu/block-backend.h" #include "block/block_int.h" #include "block/nbd.h" #include "qemu/main-loop.h" +#include "qemu/option.h" #include "qemu/error-report.h" #include "qemu/config-file.h" #include "qemu/bswap.h"
qmp.c +1 -0
@@ -16,6 +16,7 @@#include "qemu/osdep.h" #include "qemu-version.h" #include "qemu/cutils.h" +#include "qemu/option.h" #include "monitor/monitor.h" #include "sysemu/sysemu.h" #include "qemu/config-file.h"
qom/object_interfaces.c +1 -0
@@ -3,6 +3,7 @@#include "qapi/qmp/qdict.h" #include "qom/object_interfaces.h" #include "qemu/module.h" +#include "qemu/option.h" #include "qapi-visit.h" #include "qapi/opts-visitor.h" #include "qemu/config-file.h"
replay/replay.c +1 -1
@@ -11,11 +11,11 @@#include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu-common.h" #include "sysemu/replay.h" #include "replay-internal.h" #include "qemu/timer.h" #include "qemu/main-loop.h" +#include "qemu/option.h" #include "sysemu/cpus.h" #include "sysemu/sysemu.h" #include "qemu/error-report.h"
tests/test-char.c +1 -1
@@ -1,8 +1,8 @@#include "qemu/osdep.h" #include <glib/gstdio.h> -#include "qemu-common.h" #include "qemu/config-file.h" +#include "qemu/option.h" #include "qemu/sockets.h" #include "chardev/char-fe.h" #include "chardev/char-mux.h"
tests/test-qemu-opts.c +1 -0
@@ -9,6 +9,7 @@#include "qemu/osdep.h" #include "qemu/cutils.h" +#include "qemu/option.h" #include "qapi/error.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qstring.h"
tests/test-replication.c +1 -0
@@ -12,6 +12,7 @@#include "qapi/error.h" #include "qapi/qmp/qdict.h" +#include "qemu/option.h" #include "replication.h" #include "block/block_int.h" #include "sysemu/block-backend.h"
trace/control.c +1 -0
@@ -18,6 +18,7 @@#endif #ifdef CONFIG_TRACE_LOG #include "qemu/log.h" +#include "qemu/option.h" #endif #ifdef CONFIG_TRACE_SYSLOG #include <syslog.h>
ui/console.c +1 -1
@@ -23,10 +23,10 @@*/ #include "qemu/osdep.h" -#include "qemu-common.h" #include "ui/console.h" #include "hw/qdev-core.h" #include "qapi/error.h" +#include "qemu/option.h" #include "qemu/timer.h" #include "qmp-commands.h" #include "chardev/char-fe.h"
ui/spice-core.c +1 -1
@@ -21,7 +21,6 @@#include <netdb.h> #include "sysemu/sysemu.h" -#include "qemu-common.h" #include "ui/qemu-spice.h" #include "qemu/error-report.h" #include "qemu/thread.h"
@@ -32,6 +31,7 @@#include "qmp-commands.h" #include "qapi/error.h" #include "qemu/notify.h" +#include "qemu/option.h" #include "migration/misc.h" #include "hw/hw.h" #include "ui/spice-display.h"
ui/spice-display.c +1 -1
@@ -16,9 +16,9 @@*/ #include "qemu/osdep.h" -#include "qemu-common.h" #include "ui/qemu-spice.h" #include "qemu/timer.h" +#include "qemu/option.h" #include "qemu/queue.h" #include "ui/console.h" #include "sysemu/sysemu.h"
ui/vnc.c +1 -0
@@ -30,6 +30,7 @@#include "trace.h" #include "sysemu/sysemu.h" #include "qemu/error-report.h" +#include "qemu/option.h" #include "qemu/sockets.h" #include "qemu/timer.h" #include "qemu/acl.h"
Signature · 1 line
2.13.6
This series failed docker-mingw@fedora build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally.
Hi,
This series failed docker-mingw@fedora build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally.
Type: series
Message-id: [email protected]
Subject: [Qemu-devel] [PATCH v2 00/19] Clean up includes to reduce compile time
=== TEST SCRIPT BEGIN ===
#!/bin/bash
set -e
git submodule update --init dtc
# Let docker tests dump environment info
export SHOW_ENV=1
export J=8
time make docker-test-mingw@fedora
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
Switched to a new branch 'test'67a33c5fec Move include qemu/option.h from qemu-common.h to actual users cd2c1126ab Drop superfluous includes of qapi/qmp/qjson.h 4d18d0848b Drop superfluous includes of qapi/qmp/dispatch.h 48eefe66be Include qapi/qmp/qnull.h exactly where needed 0f55428685 Include qapi/qmp/qnum.h exactly where needed bd750dc372 Include qapi/qmp/qbool.h exactly where needed 463082bfed Include qapi/qmp/qstring.h exactly where needed c7bb6bf0ef Include qapi/qmp/qdict.h exactly where needed 049c1375e0 Include qapi/qmp/qlist.h exactly where needed 714d6d19c5 Include qapi/qmp/qobject.h exactly where needed 27a25cf6db qdict qlist: Make most helper macros functions b3cb1813bd Eliminate qapi/qmp/types.hbc5b117d58 Typedef the subtypes of QObject in qemu/typedefs.h, too 3cca6f7aaa Include qmp-commands.h exactly where needed aed5933536 Drop superfluous includes of qapi/qmp/qerror.h b6aa7afcab Include qapi/error.h exactly where needed 4d7c94268f Drop superfluous includes of qapi-types.h and test-qapi-types.h 2b66ce2d15 Clean up includes85853bd315 Use #include "..." for our own headers, <...> for others
=== OUTPUT BEGIN ===
Submodule 'dtc' (git://git.qemu-project.org/dtc.git) registered for path 'dtc'
Cloning into '/var/tmp/patchew-tester-tmp-tlpj1m1c/src/dtc'...
Submodule path 'dtc': checked out 'e54388015af1fb4bf04d0bca99caba1074d9cc42'
BUILD fedora
GEN /var/tmp/patchew-tester-tmp-tlpj1m1c/src/docker-src.2018-01-31-10.38.14.6599/qemu.tar
Cloning into '/var/tmp/patchew-tester-tmp-tlpj1m1c/src/docker-src.2018-01-31-10.38.14.6599/qemu.tar.vroot'... done.
Your branch is up-to-date with 'origin/test'.
Submodule 'dtc' (git://git.qemu-project.org/dtc.git) registered for path 'dtc'
Cloning into '/var/tmp/patchew-tester-tmp-tlpj1m1c/src/docker-src.2018-01-31-10.38.14.6599/qemu.tar.vroot/dtc'... Submodule path 'dtc': checked out 'e54388015af1fb4bf04d0bca99caba1074d9cc42'
Submodule 'ui/keycodemapdb' (git://git.qemu.org/keycodemapdb.git) registered for path 'ui/keycodemapdb' Cloning into '/var/tmp/patchew-tester-tmp-tlpj1m1c/src/docker-src.2018-01-31-10.38.14.6599/qemu.tar.vroot/ui/keycodemapdb'... Submodule path 'ui/keycodemapdb': checked out '10739aa26051a5d49d88132604539d3ed085e72e'
COPY RUNNER
RUN test-mingw in qemu:fedora
Packages installed:
PyYAML-3.11-13.fc25.x86_64
SDL-devel-1.2.15-21.fc24.x86_64
bc-1.06.95-16.fc24.x86_64
bison-3.0.4-4.fc24.x86_64
bzip2-1.0.6-21.fc25.x86_64
ccache-3.3.4-1.fc25.x86_64
clang-3.9.1-2.fc25.x86_64
findutils-4.6.0-8.fc25.x86_64
flex-2.6.0-3.fc25.x86_64
gcc-6.4.1-1.fc25.x86_64
gcc-c++-6.4.1-1.fc25.x86_64
gettext-0.19.8.1-3.fc25.x86_64
git-2.9.5-3.fc25.x86_64
glib2-devel-2.50.3-1.fc25.x86_64
hostname-3.15-8.fc25.x86_64
libaio-devel-0.3.110-6.fc24.x86_64
libasan-6.4.1-1.fc25.x86_64
libfdt-devel-1.4.2-1.fc25.x86_64
libubsan-6.4.1-1.fc25.x86_64
make-4.1-6.fc25.x86_64
mingw32-SDL-1.2.15-7.fc24.noarch
mingw32-bzip2-1.0.6-7.fc24.noarch
mingw32-curl-7.47.0-1.fc24.noarch
mingw32-glib2-2.50.3-1.fc25.noarch
mingw32-gmp-6.1.1-1.fc25.noarch
mingw32-gnutls-3.5.5-2.fc25.noarch
mingw32-gtk2-2.24.31-2.fc25.noarch
mingw32-gtk3-3.22.17-1.fc25.noarch
mingw32-libjpeg-turbo-1.5.1-1.fc25.noarch
mingw32-libpng-1.6.27-1.fc25.noarch
mingw32-libssh2-1.4.3-5.fc24.noarch
mingw32-libtasn1-4.9-1.fc25.noarch
mingw32-nettle-3.3-1.fc25.noarch
mingw32-pixman-0.34.0-1.fc25.noarch
mingw32-pkg-config-0.28-6.fc24.x86_64
mingw64-SDL-1.2.15-7.fc24.noarch
mingw64-bzip2-1.0.6-7.fc24.noarch
mingw64-curl-7.47.0-1.fc24.noarch
mingw64-glib2-2.50.3-1.fc25.noarch
mingw64-gmp-6.1.1-1.fc25.noarch
mingw64-gnutls-3.5.5-2.fc25.noarch
mingw64-gtk2-2.24.31-2.fc25.noarch
mingw64-gtk3-3.22.17-1.fc25.noarch
mingw64-libjpeg-turbo-1.5.1-1.fc25.noarch
mingw64-libpng-1.6.27-1.fc25.noarch
mingw64-libssh2-1.4.3-5.fc24.noarch
mingw64-libtasn1-4.9-1.fc25.noarch
mingw64-nettle-3.3-1.fc25.noarch
mingw64-pixman-0.34.0-1.fc25.noarch
mingw64-pkg-config-0.28-6.fc24.x86_64
nettle-devel-3.3-1.fc25.x86_64
package python2 is not installed
perl-5.24.3-389.fc25.x86_64
pixman-devel-0.34.0-2.fc24.x86_64
sparse-0.5.0-10.fc25.x86_64
tar-1.29-3.fc25.x86_64
which-2.21-1.fc25.x86_64
zlib-devel-1.2.8-10.fc24.x86_64
Environment variables:
PACKAGES=ccache gettext git tar PyYAML sparse flex bison python2 bzip2 hostname glib2-devel pixman-devel zlib-devel SDL-devel libfdt-devel gcc gcc-c++ clang make perl which bc findutils libaio-devel nettle-devel libasan libubsan mingw32-pixman mingw32-glib2 mingw32-gmp mingw32-SDL mingw32-pkg-config mingw32-gtk2 mingw32-gtk3 mingw32-gnutls mingw32-nettle mingw32-libtasn1 mingw32-libjpeg-turbo mingw32-libpng mingw32-curl mingw32-libssh2 mingw32-bzip2 mingw64-pixman mingw64-glib2 mingw64-gmp mingw64-SDL mingw64-pkg-config mingw64-gtk2 mingw64-gtk3 mingw64-gnutls mingw64-nettle mingw64-libtasn1 mingw64-libjpeg-turbo mingw64-libpng mingw64-curl mingw64-libssh2 mingw64-bzip2
HOSTNAME=17faaa66defe
MAKEFLAGS= -j8
J=8
CCACHE_DIR=/var/tmp/ccache
EXTRA_CONFIGURE_OPTS=
V=
SHOW_ENV=1 PATH=/usr/lib/ccache:/usr/lib64/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin PWD=/
TARGET_LIST=
FGC=f25
SHLVL=1
HOME=/root
TEST_DIR=/tmp/qemu-test
DISTTAG=f25container
FEATURES=mingw clang pyyaml asan dtc
DEBUG=
_=/usr/bin/env
Configure options:
--enable-werror --target-list=x86_64-softmmu,aarch64-softmmu --prefix=/tmp/qemu-test/install --cross-prefix=x86_64-w64-mingw32- --enable-trace-backends=simple --enable-gnutls --enable-nettle --enable-curl --enable-vnc --enable-bzip2 --enable-guest-agent --with-sdlabi=1.2 --with-gtkabi=2.0
Install prefix /tmp/qemu-test/install BIOS directory /tmp/qemu-test/install firmware path /tmp/qemu-test/install/share/qemu-firmware binary directory /tmp/qemu-test/install
library directory /tmp/qemu-test/install/lib
module directory /tmp/qemu-test/install/lib
libexec directory /tmp/qemu-test/install/libexec
include directory /tmp/qemu-test/install/include
config directory /tmp/qemu-test/install
local state directory queried at runtime
Windows SDK no Source path /tmp/qemu-test/src GIT binary git GIT submodules C compiler x86_64-w64-mingw32-gcc Host C compiler cc C++ compiler x86_64-w64-mingw32-g++ Objective-C compiler clang ARFLAGS rv CFLAGS -O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -g QEMU_CFLAGS -I/usr/x86_64-w64-mingw32/sys-root/mingw/include/pixman-1 -I$(SRC_PATH)/dtc/libfdt -Werror -mms-bitfields -I/usr/x86_64-w64-mingw32/sys-root/mingw/include/glib-2.0 -I/usr/x86_64-w64-mingw32/sys-root/mingw/lib/glib-2.0/include -I/usr/x86_64-w64-mingw32/sys-root/mingw/include -m64 -mcx16 -mthreads -D__USE_MINGW_ANSI_STDIO=1 -DWIN32_LEAN_AND_MEAN -DWINVER=0x501 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv -Wendif-labels -Wno-shift-negative-value -Wno-missing-include-dirs -Wempty-body -Wnested-externs -Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers -Wold-style-declaration -Wold-style-definition -Wtype-limits -fstack-protector-strong -I/usr/x86_64-w64-mingw32/sys-root/mingw/include -I/usr/x86_64-w64-mingw32/sys-root/mingw/include/p11-kit-1 -I/usr/x86_64-w64-mingw32/sys-root/mingw/include -I/usr/x86_64-w64-mingw32/sys-root/mingw/include -I/usr/x86_64-w64-mingw32/sys-root/mingw/include/libpng16 LDFLAGS -Wl,--nxcompat -Wl,--no-seh -Wl,--dynamicbase -Wl,--warn-common -m64 -g make make install install python python -B smbd /usr/sbin/smbd module support no host CPU x86_64 host big endian no target list x86_64-softmmu aarch64-softmmu gprof enabled no sparse enabled no strip binaries yes profiler no static build no SDL support yes (1.2.15) GTK support yes (2.24.31) GTK GL support no VTE support no TLS priority NORMAL GNUTLS support yes GNUTLS rnd yes libgcrypt no libgcrypt kdf no nettle yes (3.3) nettle kdf yes libtasn1 yes curses support no virgl support no curl support yes mingw32 support yes Audio drivers dsound
Block whitelist (rw)
Block whitelist (ro)
VirtFS support no
Multipath support no
VNC support yes VNC SASL support no VNC JPEG support yes VNC PNG support yes xen support no brlapi support no bluez support no Documentation no PIE no vde support no netmap support no Linux AIO support no ATTR/XATTR support no Install blobs yes KVM support no HAX support yes HVF support no TCG support yes TCG debug enabled no TCG interpreter no malloc trim support no RDMA support no fdt support yes preadv support no fdatasync no madvise no posix_madvise no
libcap-ng support no
vhost-net support no
vhost-scsi support no
vhost-vsock support no
vhost-user support no
Trace backends simple
Trace output file trace-<pid>
spice support no rbd support no xfsctl support no smartcard support no libusb no usb net redir no OpenGL support no OpenGL dmabufs no libiscsi support no libnfs support no
build guest agent yes
QGA VSS support no
QGA w32 disk info yes
QGA MSI support no
seccomp support no
coroutine backend win32
coroutine pool yes
debug stack usage no
crypto afalg no
GlusterFS support no
gcov gcov gcov enabled no TPM support yes libssh2 support yes TPM passthrough no TPM emulator no QOM debugging yes Live block migration yes lzo support no snappy support no bzip2 support yes NUMA host support no libxml2 no tcmalloc support no jemalloc support no
avx2 optimization yes
replication support yes
VxHS block device no
capstone no
WARNING: Use of GTK 2.0 is deprecated and will be removed in
WARNING: future releases. Please switch to using GTK 3.0
WARNING: Use of SDL 1.2 is deprecated and will be removed in
WARNING: future releases. Please switch to using SDL 2.0
GEN x86_64-softmmu/config-devices.mak.tmp GEN aarch64-softmmu/config-devices.mak.tmp GEN config-host.h GEN qemu-options.def GEN qapi-types.h GEN qmp-commands.h GEN qapi-visit.h GEN qapi-event.h GEN qmp-marshal.c GEN x86_64-softmmu/config-devices.mak GEN aarch64-softmmu/config-devices.mak GEN qapi-types.c GEN qapi-visit.c GEN qapi-event.c GEN qmp-introspect.h GEN qmp-introspect.c GEN trace/generated-tcg-tracers.h GEN trace/generated-helpers-wrappers.h GEN trace/generated-helpers.h GEN trace/generated-helpers.c GEN module_block.h GEN ui/input-keymap-atset1-to-qcode.c GEN ui/input-keymap-linux-to-qcode.c GEN ui/input-keymap-qcode-to-atset1.c GEN ui/input-keymap-qcode-to-atset2.c GEN ui/input-keymap-qcode-to-atset3.c GEN ui/input-keymap-qcode-to-linux.c GEN ui/input-keymap-qcode-to-qnum.c GEN ui/input-keymap-qcode-to-sun.c GEN ui/input-keymap-qnum-to-qcode.c GEN ui/input-keymap-usb-to-qcode.c GEN ui/input-keymap-win32-to-qcode.c GEN ui/input-keymap-x11-to-qcode.c GEN ui/input-keymap-xorgevdev-to-qcode.c GEN ui/input-keymap-xorgkbd-to-qcode.c GEN ui/input-keymap-xorgxquartz-to-qcode.c GEN ui/input-keymap-xorgxwin-to-qcode.c GEN tests/test-qapi-types.h GEN tests/test-qapi-visit.h GEN tests/test-qmp-commands.h GEN tests/test-qapi-event.h GEN tests/test-qmp-introspect.h GEN trace-root.h GEN util/trace.h GEN crypto/trace.h GEN io/trace.h GEN migration/trace.h GEN block/trace.h GEN chardev/trace.h GEN hw/block/trace.h GEN hw/block/dataplane/trace.h GEN hw/char/trace.h GEN hw/intc/trace.h GEN hw/net/trace.h GEN hw/virtio/trace.h GEN hw/audio/trace.h GEN hw/misc/trace.h GEN hw/usb/trace.h GEN hw/scsi/trace.h GEN hw/nvram/trace.h GEN hw/display/trace.h GEN hw/input/trace.h GEN hw/timer/trace.h GEN hw/dma/trace.h GEN hw/sparc/trace.h GEN hw/sparc64/trace.h GEN hw/sd/trace.h GEN hw/isa/trace.h GEN hw/mem/trace.h GEN hw/i386/trace.h GEN hw/i386/xen/trace.h GEN hw/9pfs/trace.h GEN hw/ppc/trace.h GEN hw/pci/trace.h GEN hw/pci-host/trace.h GEN hw/s390x/trace.h GEN hw/vfio/trace.h GEN hw/acpi/trace.h GEN hw/arm/trace.h GEN hw/alpha/trace.h GEN hw/xen/trace.h GEN hw/ide/trace.h GEN ui/trace.h GEN audio/trace.h GEN net/trace.h GEN target/arm/trace.h GEN target/i386/trace.h GEN target/mips/trace.h GEN target/sparc/trace.h GEN target/s390x/trace.h GEN target/ppc/trace.h GEN qom/trace.h GEN linux-user/trace.h GEN qapi/trace.h GEN accel/tcg/trace.h GEN accel/kvm/trace.h GEN nbd/trace.h GEN scsi/trace.h GEN trace-root.c GEN util/trace.c GEN crypto/trace.c GEN io/trace.c GEN migration/trace.c GEN block/trace.c GEN chardev/trace.c GEN hw/block/trace.c GEN hw/block/dataplane/trace.c GEN hw/char/trace.c GEN hw/intc/trace.c GEN hw/net/trace.c GEN hw/virtio/trace.c GEN hw/audio/trace.c GEN hw/misc/trace.c GEN hw/usb/trace.c GEN hw/scsi/trace.c GEN hw/nvram/trace.c GEN hw/display/trace.c GEN hw/input/trace.c GEN hw/timer/trace.c GEN hw/dma/trace.c GEN hw/sparc/trace.c GEN hw/sparc64/trace.c GEN hw/sd/trace.c GEN hw/isa/trace.c GEN hw/mem/trace.c GEN hw/i386/trace.c GEN hw/i386/xen/trace.c GEN hw/9pfs/trace.c GEN hw/ppc/trace.c GEN hw/pci/trace.c GEN hw/pci-host/trace.c GEN hw/s390x/trace.c GEN hw/vfio/trace.c GEN hw/acpi/trace.c GEN hw/arm/trace.c GEN hw/alpha/trace.c GEN hw/xen/trace.c GEN hw/ide/trace.c GEN ui/trace.c GEN audio/trace.c GEN net/trace.c GEN target/arm/trace.c GEN target/i386/trace.c GEN target/mips/trace.c GEN target/sparc/trace.c GEN target/s390x/trace.c GEN target/ppc/trace.c GEN qom/trace.c GEN linux-user/trace.c GEN qapi/trace.c GEN accel/tcg/trace.c GEN accel/kvm/trace.c GEN nbd/trace.c GEN scsi/trace.c GEN config-all-devices.mak
DEP /tmp/qemu-test/src/dtc/tests/dumptrees.c
DEP /tmp/qemu-test/src/dtc/tests/trees.S
DEP /tmp/qemu-test/src/dtc/tests/testutils.c
DEP /tmp/qemu-test/src/dtc/tests/value-labels.c DEP /tmp/qemu-test/src/dtc/tests/asm_tree_dump.c DEP /tmp/qemu-test/src/dtc/tests/overlay_bad_fixup.c DEP /tmp/qemu-test/src/dtc/tests/truncated_property.c DEP /tmp/qemu-test/src/dtc/tests/check_path.c
DEP /tmp/qemu-test/src/dtc/tests/overlay.c
DEP /tmp/qemu-test/src/dtc/tests/property_iterate.c DEP /tmp/qemu-test/src/dtc/tests/subnode_iterate.c DEP /tmp/qemu-test/src/dtc/tests/utilfdt_test.c DEP /tmp/qemu-test/src/dtc/tests/integer-expressions.c DEP /tmp/qemu-test/src/dtc/tests/path_offset_aliases.c DEP /tmp/qemu-test/src/dtc/tests/add_subnode_with_nops.c DEP /tmp/qemu-test/src/dtc/tests/dtbs_equal_unordered.c DEP /tmp/qemu-test/src/dtc/tests/dtb_reverse.c DEP /tmp/qemu-test/src/dtc/tests/dtbs_equal_ordered.c DEP /tmp/qemu-test/src/dtc/tests/extra-terminating-null.c DEP /tmp/qemu-test/src/dtc/tests/boot-cpuid.c
DEP /tmp/qemu-test/src/dtc/tests/incbin.c
DEP /tmp/qemu-test/src/dtc/tests/phandle_format.c DEP /tmp/qemu-test/src/dtc/tests/path-references.c DEP /tmp/qemu-test/src/dtc/tests/references.c
DEP /tmp/qemu-test/src/dtc/tests/string_escapes.c DEP /tmp/qemu-test/src/dtc/tests/propname_escapes.c DEP /tmp/qemu-test/src/dtc/tests/appendprop2.c DEP /tmp/qemu-test/src/dtc/tests/appendprop1.c DEP /tmp/qemu-test/src/dtc/tests/del_node.c
DEP /tmp/qemu-test/src/dtc/tests/del_property.c DEP /tmp/qemu-test/src/dtc/tests/setprop.c
DEP /tmp/qemu-test/src/dtc/tests/set_name.c
DEP /tmp/qemu-test/src/dtc/tests/rw_tree1.c
DEP /tmp/qemu-test/src/dtc/tests/open_pack.c
DEP /tmp/qemu-test/src/dtc/tests/nopulate.c
DEP /tmp/qemu-test/src/dtc/tests/move_and_save.c DEP /tmp/qemu-test/src/dtc/tests/mangle-layout.c DEP /tmp/qemu-test/src/dtc/tests/sw_tree1.c
DEP /tmp/qemu-test/src/dtc/tests/nop_node.c
DEP /tmp/qemu-test/src/dtc/tests/nop_property.c DEP /tmp/qemu-test/src/dtc/tests/setprop_inplace.c DEP /tmp/qemu-test/src/dtc/tests/notfound.c
DEP /tmp/qemu-test/src/dtc/tests/addr_size_cells.c DEP /tmp/qemu-test/src/dtc/tests/stringlist.c
DEP /tmp/qemu-test/src/dtc/tests/sized_cells.c DEP /tmp/qemu-test/src/dtc/tests/char_literal.c DEP /tmp/qemu-test/src/dtc/tests/get_alias.c
DEP /tmp/qemu-test/src/dtc/tests/node_offset_by_compatible.c DEP /tmp/qemu-test/src/dtc/tests/node_check_compatible.c DEP /tmp/qemu-test/src/dtc/tests/node_offset_by_phandle.c DEP /tmp/qemu-test/src/dtc/tests/parent_offset.c DEP /tmp/qemu-test/src/dtc/tests/supernode_atdepth_offset.c DEP /tmp/qemu-test/src/dtc/tests/node_offset_by_prop_value.c DEP /tmp/qemu-test/src/dtc/tests/get_phandle.c DEP /tmp/qemu-test/src/dtc/tests/get_path.c
DEP /tmp/qemu-test/src/dtc/tests/getprop.c
DEP /tmp/qemu-test/src/dtc/tests/get_name.c
DEP /tmp/qemu-test/src/dtc/tests/subnode_offset.c DEP /tmp/qemu-test/src/dtc/tests/path_offset.c DEP /tmp/qemu-test/src/dtc/tests/find_property.c DEP /tmp/qemu-test/src/dtc/tests/root_node.c
DEP /tmp/qemu-test/src/dtc/libfdt/fdt_overlay.c DEP /tmp/qemu-test/src/dtc/tests/get_mem_rsv.c DEP /tmp/qemu-test/src/dtc/libfdt/fdt_addresses.c DEP /tmp/qemu-test/src/dtc/libfdt/fdt_strerror.c DEP /tmp/qemu-test/src/dtc/libfdt/fdt_empty_tree.c DEP /tmp/qemu-test/src/dtc/libfdt/fdt_rw.c
DEP /tmp/qemu-test/src/dtc/libfdt/fdt_sw.c
DEP /tmp/qemu-test/src/dtc/libfdt/fdt.c
DEP /tmp/qemu-test/src/dtc/libfdt/fdt_ro.c
DEP /tmp/qemu-test/src/dtc/util.c
DEP /tmp/qemu-test/src/dtc/libfdt/fdt_wip.c
DEP /tmp/qemu-test/src/dtc/fdtoverlay.c
DEP /tmp/qemu-test/src/dtc/fdtput.c
DEP /tmp/qemu-test/src/dtc/fdtget.c
DEP /tmp/qemu-test/src/dtc/fdtdump.c
LEX convert-dtsv0-lexer.lex.c
DEP /tmp/qemu-test/src/dtc/srcpos.c
LEX dtc-lexer.lex.c
BISON dtc-parser.tab.c
DEP /tmp/qemu-test/src/dtc/treesource.c
DEP /tmp/qemu-test/src/dtc/livetree.c
DEP /tmp/qemu-test/src/dtc/fstree.c
DEP /tmp/qemu-test/src/dtc/flattree.c
DEP /tmp/qemu-test/src/dtc/dtc.c
DEP /tmp/qemu-test/src/dtc/data.c
DEP /tmp/qemu-test/src/dtc/checks.c
DEP convert-dtsv0-lexer.lex.c
DEP dtc-parser.tab.c
DEP dtc-lexer.lex.c
CHK version_gen.h
UPD version_gen.h
DEP /tmp/qemu-test/src/dtc/util.c
CC libfdt/fdt.o
CC libfdt/fdt_ro.o
CC libfdt/fdt_wip.o
CC libfdt/fdt_sw.o
CC libfdt/fdt_rw.o
CC libfdt/fdt_strerror.o
CC libfdt/fdt_empty_tree.o
CC libfdt/fdt_addresses.o
CC libfdt/fdt_overlay.o
AR libfdt/libfdt.a
x86_64-w64-mingw32-ar: creating libfdt/libfdt.a
a - libfdt/fdt.o
a - libfdt/fdt_ro.o
a - libfdt/fdt_wip.o
a - libfdt/fdt_sw.o
a - libfdt/fdt_rw.o
a - libfdt/fdt_strerror.o
a - libfdt/fdt_empty_tree.o
a - libfdt/fdt_addresses.o
a - libfdt/fdt_overlay.o
RC version.o GEN qga/qapi-generated/qga-qapi-types.h GEN qga/qapi-generated/qga-qmp-commands.h GEN qga/qapi-generated/qga-qapi-types.c GEN qga/qapi-generated/qga-qapi-visit.c GEN qga/qapi-generated/qga-qapi-visit.h CC qmp-introspect.o CC qapi-types.o GEN qga/qapi-generated/qga-qmp-marshal.c CC qapi-visit.o CC qapi-event.o CC qapi/qapi-visit-core.o CC qapi/qapi-dealloc-visitor.o CC qapi/qobject-input-visitor.o CC qapi/qobject-output-visitor.o CC qapi/qmp-registry.o CC qapi/qmp-dispatch.o CC qapi/string-input-visitor.o CC qapi/string-output-visitor.o CC qapi/opts-visitor.o CC qapi/qapi-clone-visitor.o CC qapi/qmp-event.o CC qapi/qapi-util.o CC qobject/qnull.o CC qobject/qnum.o CC qobject/qstring.o CC qobject/qdict.o CC qobject/qlist.o CC qobject/qbool.o CC qobject/qlit.o CC qobject/qjson.o CC qobject/qobject.o CC qobject/json-lexer.o CC qobject/json-streamer.o CC qobject/json-parser.o CC trace/simple.o CC trace/control.o CC trace/qmp.o CC util/osdep.o CC util/cutils.o CC util/unicode.o CC util/qemu-timer-common.o CC util/bufferiszero.o CC util/lockcnt.o CC util/aiocb.o
/tmp/qemu-test/src/trace/control.c:43:1: error: variable 'qemu_trace_opts' has initializer but incomplete type
QemuOptsList qemu_trace_opts = {
^~~~~~~~~~~~/tmp/qemu-test/src/trace/control.c:44:5: error: unknown field 'name' specified in initializer
.name = "trace",
^
/tmp/qemu-test/src/trace/control.c:44:13: error: excess elements in struct initializer [-Werror]
.name = "trace",
^~~~~~~/tmp/qemu-test/src/trace/control.c:44:13: note: (near initialization for 'qemu_trace_opts') /tmp/qemu-test/src/trace/control.c:45:5: error: unknown field 'implied_opt_name' specified in initializer
.implied_opt_name = "enable",
^/tmp/qemu-test/src/trace/control.c:45:25: error: excess elements in struct initializer [-Werror]
.implied_opt_name = "enable",
^~~~~~~~/tmp/qemu-test/src/trace/control.c:45:25: note: (near initialization for 'qemu_trace_opts') /tmp/qemu-test/src/trace/control.c:46:5: error: unknown field 'head' specified in initializer
.head = QTAILQ_HEAD_INITIALIZER(qemu_trace_opts.head),
^
In file included from /tmp/qemu-test/src/include/hw/qdev-core.h:4:0,
from /tmp/qemu-test/src/include/qom/cpu.h:23,
from /tmp/qemu-test/src/trace/control-internal.h:13,
from /tmp/qemu-test/src/trace/control.h:270,
from /tmp/qemu-test/src/trace/control.c:11:
/tmp/qemu-test/src/include/qemu/queue.h:352:9: error: extra brace group at end of initializer
{ NULL, &(head).tqh_first }
^/tmp/qemu-test/src/trace/control.c:46:13: note: in expansion of macro 'QTAILQ_HEAD_INITIALIZER'
.head = QTAILQ_HEAD_INITIALIZER(qemu_trace_opts.head),
^~~~~~~~~~~~~~~~~~~~~~~/tmp/qemu-test/src/include/qemu/queue.h:352:9: note: (near initialization for 'qemu_trace_opts')
{ NULL, &(head).tqh_first }
^/tmp/qemu-test/src/trace/control.c:46:13: note: in expansion of macro 'QTAILQ_HEAD_INITIALIZER'
.head = QTAILQ_HEAD_INITIALIZER(qemu_trace_opts.head),
^~~~~~~~~~~~~~~~~~~~~~~/tmp/qemu-test/src/trace/control.c:46:5: error: invalid use of incomplete typedef 'QemuOptsList {aka struct QemuOptsList}'
.head = QTAILQ_HEAD_INITIALIZER(qemu_trace_opts.head),
^
In file included from /tmp/qemu-test/src/include/hw/qdev-core.h:4:0,
from /tmp/qemu-test/src/include/qom/cpu.h:23,
from /tmp/qemu-test/src/trace/control-internal.h:13,
from /tmp/qemu-test/src/trace/control.h:270,
from /tmp/qemu-test/src/trace/control.c:11:
/tmp/qemu-test/src/include/qemu/queue.h:352:9: error: excess elements in struct initializer [-Werror]
{ NULL, &(head).tqh_first }
^/tmp/qemu-test/src/trace/control.c:46:13: note: in expansion of macro 'QTAILQ_HEAD_INITIALIZER'
.head = QTAILQ_HEAD_INITIALIZER(qemu_trace_opts.head),
^~~~~~~~~~~~~~~~~~~~~~~/tmp/qemu-test/src/include/qemu/queue.h:352:9: note: (near initialization for 'qemu_trace_opts')
{ NULL, &(head).tqh_first }
^/tmp/qemu-test/src/trace/control.c:46:13: note: in expansion of macro 'QTAILQ_HEAD_INITIALIZER'
.head = QTAILQ_HEAD_INITIALIZER(qemu_trace_opts.head),
^~~~~~~~~~~~~~~~~~~~~~~/tmp/qemu-test/src/trace/control.c:47:5: error: unknown field 'desc' specified in initializer
.desc = {
^
/tmp/qemu-test/src/trace/control.c:47:13: error: extra brace group at end of initializer
.desc = {
^
/tmp/qemu-test/src/trace/control.c:47:13: note: (near initialization for 'qemu_trace_opts')
/tmp/qemu-test/src/trace/control.c:48:9: error: extra brace group at end of initializer
{
^/tmp/qemu-test/src/trace/control.c:48:9: note: (near initialization for 'qemu_trace_opts') /tmp/qemu-test/src/trace/control.c:50:21: error: 'QEMU_OPT_STRING' undeclared here (not in a function)
.type = QEMU_OPT_STRING,
^~~~~~~~~~~~~~~/tmp/qemu-test/src/trace/control.c:52:9: error: extra brace group at end of initializer
{
^
/tmp/qemu-test/src/trace/control.c:52:9: note: (near initialization for 'qemu_trace_opts')
/tmp/qemu-test/src/trace/control.c:55:11: error: extra brace group at end of initializer
},{
^
/tmp/qemu-test/src/trace/control.c:55:11: note: (near initialization for 'qemu_trace_opts')
/tmp/qemu-test/src/trace/control.c:59:9: error: extra brace group at end of initializer
{ /* end of list */ }
^
/tmp/qemu-test/src/trace/control.c:59:9: note: (near initialization for 'qemu_trace_opts')
/tmp/qemu-test/src/trace/control.c:47:13: error: excess elements in struct initializer [-Werror]
.desc = {
^/tmp/qemu-test/src/trace/control.c:47:13: note: (near initialization for 'qemu_trace_opts') /tmp/qemu-test/src/trace/control.c: In function 'trace_opt_parse':/tmp/qemu-test/src/trace/control.c:315:22: error: implicit declaration of function 'qemu_opts_parse_noisily' [-Werror=implicit-function-declaration]
QemuOpts *opts = qemu_opts_parse_noisily(qemu_find_opts("trace"),
^~~~~~~~~~~~~~~~~~~~~~~/tmp/qemu-test/src/trace/control.c:315:5: error: nested extern declaration of 'qemu_opts_parse_noisily' [-Werror=nested-externs]
QemuOpts *opts = qemu_opts_parse_noisily(qemu_find_opts("trace"),
^~~~~~~~/tmp/qemu-test/src/trace/control.c:315:22: error: initialization makes pointer from integer without a cast [-Werror=int-conversion]
QemuOpts *opts = qemu_opts_parse_noisily(qemu_find_opts("trace"),
^~~~~~~~~~~~~~~~~~~~~~~/tmp/qemu-test/src/trace/control.c:320:9: error: implicit declaration of function 'qemu_opt_get' [-Werror=implicit-function-declaration]
if (qemu_opt_get(opts, "enable")) {
^~~~~~~~~~~~
/tmp/qemu-test/src/trace/control.c:320:5: error: nested extern declaration of 'qemu_opt_get' [-Werror=nested-externs]
if (qemu_opt_get(opts, "enable")) {
^~
/tmp/qemu-test/src/trace/control.c:321:29: error: passing argument 1 of 'trace_enable_events' makes pointer from integer without a cast [-Werror=int-conversion]
trace_enable_events(qemu_opt_get(opts, "enable"));
^~~~~~~~~~~~
/tmp/qemu-test/src/trace/control.c:202:6: note: expected 'const char *' but argument is of type 'int'
void trace_enable_events(const char *line_buf)
^~~~~~~~~~~~~~~~~~~
/tmp/qemu-test/src/trace/control.c:323:23: error: passing argument 1 of 'trace_init_events' makes pointer from integer without a cast [-Werror=int-conversion]
trace_init_events(qemu_opt_get(opts, "events"));
^~~~~~~~~~~~
/tmp/qemu-test/src/trace/control.c:214:13: note: expected 'const char *' but argument is of type 'int'
static void trace_init_events(const char *fname)
^~~~~~~~~~~~~~~~~
/tmp/qemu-test/src/trace/control.c:324:27: error: passing argument 1 of 'g_strdup' makes pointer from integer without a cast [-Werror=int-conversion]
trace_file = g_strdup(qemu_opt_get(opts, "file"));
^~~~~~~~~~~~
In file included from /usr/x86_64-w64-mingw32/sys-root/mingw/include/glib-2.0/glib.h:79:0,
from /tmp/qemu-test/src/include/glib-compat.h:19,
from /tmp/qemu-test/src/include/qemu/osdep.h:107,
from /tmp/qemu-test/src/trace/control.c:10:
/usr/x86_64-w64-mingw32/sys-root/mingw/include/glib-2.0/glib/gstrfuncs.h:216:22: note: expected 'const gchar * {aka const char *}' but argument is of type 'int'
gchar* g_strdup (const gchar *str) G_GNUC_MALLOC;
^~~~~~~~
/tmp/qemu-test/src/trace/control.c:325:5: error: implicit declaration of function 'qemu_opts_del' [-Werror=implicit-function-declaration]
qemu_opts_del(opts);
^~~~~~~~~~~~~
/tmp/qemu-test/src/trace/control.c:325:5: error: nested extern declaration of 'qemu_opts_del' [-Werror=nested-externs]
/tmp/qemu-test/src/trace/control.c: At top level:
/tmp/qemu-test/src/trace/control.c:43:14: error: storage size of 'qemu_trace_opts' isn't known
QemuOptsList qemu_trace_opts = {
^~~~~~~~~~~~~~~cc1: all warnings being treated as errors /tmp/qemu-test/src/rules.mak:66: recipe for target 'trace/control.o' failed
make: *** [trace/control.o] Error 1
make: *** Waiting for unfinished jobs....
Traceback (most recent call last):
File "./tests/docker/docker.py", line 407, in <module>
sys.exit(main())
File "./tests/docker/docker.py", line 404, in main
return args.cmdobj.run(args, argv)
File "./tests/docker/docker.py", line 261, in run
return Docker().run(argv, args.keep, quiet=args.quiet)
File "./tests/docker/docker.py", line 229, in run
quiet=quiet)
File "./tests/docker/docker.py", line 147, in _do_check
return subprocess.check_call(self._command + cmd, **kwargs)
File "/usr/lib64/python2.7/subprocess.py", line 186, in check_call
raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['docker', 'run', '--label', 'com.qemu.instance.uuid=c94d15f6069c11e8919052540069c830', '-u', '0', '--security-opt', 'seccomp=unconfined', '--rm', '--net=none', '-e', 'TARGET_LIST=', '-e', 'EXTRA_CONFIGURE_OPTS=', '-e', 'V=', '-e', 'J=8', '-e', 'DEBUG=', '-e', 'SHOW_ENV=1', '-e', 'CCACHE_DIR=/var/tmp/ccache', '-v', '/root/.cache/qemu-docker-ccache:/var/tmp/ccache:z', '-v', '/var/tmp/patchew-tester-tmp-tlpj1m1c/src/docker-src.2018-01-31-10.38.14.6599:/var/tmp/qemu:z,ro', 'qemu:fedora', '/var/tmp/qemu/run', 'test-mingw']' returned non-zero exit status 2 make[1]: *** [tests/docker/Makefile.include:129: docker-run] Error 1
make: *** [tests/docker/Makefile.include:163: docker-run-test-mingw@fedora] Error 2
real 1m38.937s
user 0m4.614s
sys 0m3.323s
=== OUTPUT END ===
Test command exited with code: 2
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to [email protected]