Commit 4b3aab20 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/vivier2/tags/trivial-patches-pull-request' into staging 



Trivial patches (2018-12-11)

# gpg: Signature made Tue 11 Dec 2018 18:02:20 GMT
# gpg:                using RSA key F30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>"
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>"
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>"
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier2/tags/trivial-patches-pull-request: (30 commits)
  Fixes i386 xchgq test
  maint: Grammar fix to mailmap
  MAINTAINERS: Update email address for Fam Zheng
  cutils: Assert in-range base for string-to-integer conversions
  util: vfio-helpers: use ARRAY_SIZE in qemu_vfio_init_pci()
  target: hax: fix errors in comment
  MAINTAINERS: Use my work email to review Build and test automation patches
  MAINTAINERS: Add a missing entry for the NVDIMM device
  MAINTAINERS: Add a missing entry to the QMP section
  MAINTAINERS: Add a missing entry to SPICE
  MAINTAINERS: Add missing entries for the MPS2 machine
  MAINTAINERS: Add missing entries for the Canon DIGIC machine
  MAINTAINERS: Add missing entries to the vhost section
  MAINTAINERS: Add missing entries to the PC Chipset section
  MAINTAINERS: Add a missing entry for the sun4m machines
  MAINTAINERS: Add a missing entry for the Old World machines
  MAINTAINERS: Add a missing entry for the Xilinx S3A-DSP 1800 machine
  MAINTAINERS: Add missing entries for the Jazz machine
  MAINTAINERS: Add missing entries for the Xilinx ZynqMP machine
  MAINTAINERS: Add a missing entry to the SPARC CPU
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents bb9bf94b 82c48fb7

.gitignore

+4 −68
Original line number Diff line number Diff line
@@ -30,78 +30,14 @@ 
/qapi-gen-timestamp

/qapi/qapi-builtin-types.[ch]

/qapi/qapi-builtin-visit.[ch]

/qapi/qapi-commands-block-core.[ch]

/qapi/qapi-commands-block.[ch]

/qapi/qapi-commands-char.[ch]

/qapi/qapi-commands-common.[ch]

/qapi/qapi-commands-crypto.[ch]

/qapi/qapi-commands-introspect.[ch]

/qapi/qapi-commands-job.[ch]

/qapi/qapi-commands-migration.[ch]

/qapi/qapi-commands-misc.[ch]

/qapi/qapi-commands-net.[ch]

/qapi/qapi-commands-rocker.[ch]

/qapi/qapi-commands-run-state.[ch]

/qapi/qapi-commands-sockets.[ch]

/qapi/qapi-commands-tpm.[ch]

/qapi/qapi-commands-trace.[ch]

/qapi/qapi-commands-transaction.[ch]

/qapi/qapi-commands-ui.[ch]

/qapi/qapi-commands-*.[ch]

/qapi/qapi-commands.[ch]

/qapi/qapi-events-block-core.[ch]

/qapi/qapi-events-block.[ch]

/qapi/qapi-events-char.[ch]

/qapi/qapi-events-common.[ch]

/qapi/qapi-events-crypto.[ch]

/qapi/qapi-events-introspect.[ch]

/qapi/qapi-events-job.[ch]

/qapi/qapi-events-migration.[ch]

/qapi/qapi-events-misc.[ch]

/qapi/qapi-events-net.[ch]

/qapi/qapi-events-rocker.[ch]

/qapi/qapi-events-run-state.[ch]

/qapi/qapi-events-sockets.[ch]

/qapi/qapi-events-tpm.[ch]

/qapi/qapi-events-trace.[ch]

/qapi/qapi-events-transaction.[ch]

/qapi/qapi-events-ui.[ch]

/qapi/qapi-events-*.[ch]

/qapi/qapi-events.[ch]

/qapi/qapi-introspect.[ch]

/qapi/qapi-types-block-core.[ch]

/qapi/qapi-types-block.[ch]

/qapi/qapi-types-char.[ch]

/qapi/qapi-types-common.[ch]

/qapi/qapi-types-crypto.[ch]

/qapi/qapi-types-introspect.[ch]

/qapi/qapi-types-job.[ch]

/qapi/qapi-types-migration.[ch]

/qapi/qapi-types-misc.[ch]

/qapi/qapi-types-net.[ch]

/qapi/qapi-types-rocker.[ch]

/qapi/qapi-types-run-state.[ch]

/qapi/qapi-types-sockets.[ch]

/qapi/qapi-types-tpm.[ch]

/qapi/qapi-types-trace.[ch]

/qapi/qapi-types-transaction.[ch]

/qapi/qapi-types-ui.[ch]

/qapi/qapi-types-*.[ch]

/qapi/qapi-types.[ch]

/qapi/qapi-visit-block-core.[ch]

/qapi/qapi-visit-block.[ch]

/qapi/qapi-visit-char.[ch]

/qapi/qapi-visit-common.[ch]

/qapi/qapi-visit-crypto.[ch]

/qapi/qapi-visit-introspect.[ch]

/qapi/qapi-visit-job.[ch]

/qapi/qapi-visit-migration.[ch]

/qapi/qapi-visit-misc.[ch]

/qapi/qapi-visit-net.[ch]

/qapi/qapi-visit-rocker.[ch]

/qapi/qapi-visit-run-state.[ch]

/qapi/qapi-visit-sockets.[ch]

/qapi/qapi-visit-tpm.[ch]

/qapi/qapi-visit-trace.[ch]

/qapi/qapi-visit-transaction.[ch]

/qapi/qapi-visit-ui.[ch]

/qapi/qapi-visit-*.[ch]

/qapi/qapi-visit.[ch]

/qapi/qapi-doc.texi

/qemu-doc.html

.mailmap

+1 −1
Original line number Diff line number Diff line
@@ -34,6 +34,6 @@ Justin Terry (VM) <juterry@microsoft.com> Justin Terry (VM) via Qemu-devel <qemu 




# Also list preferred name forms where people have changed their

# git author config, or having utf8/latin1 encoding issues.

# git author config, or had utf8/latin1 encoding issues.

Daniel P. Berrangé <berrange@redhat.com>

Reimar Döffinger <Reimar.Doeffinger@gmx.de>

MAINTAINERS

+36 −13
Original line number Diff line number Diff line
@@ -233,7 +233,9 @@ M: Marek Vasut <marex@denx.de> 
S: Maintained

F: target/nios2/

F: hw/nios2/

F: hw/intc/nios2_iic.c

F: disas/nios2.c

F: default-configs/nios2-softmmu.mak



OpenRISC

M: Stafford Horne <shorne@gmail.com>
@@ -289,6 +291,7 @@ S: Maintained 
F: target/sparc/

F: hw/sparc/

F: hw/sparc64/

F: include/hw/sparc/sparc64.h

F: disas/sparc.c



UniCore32
@@ -538,6 +541,7 @@ L: qemu-arm@nongnu.org 
S: Odd Fixes

F: include/hw/arm/digic.h

F: hw/*/digic*

F: include/hw/*/digic*



Gumstix

M: Peter Maydell <peter.maydell@linaro.org>
@@ -608,6 +612,8 @@ F: hw/misc/mps2-*.c 
F: include/hw/misc/mps2-*.h

F: hw/arm/iotkit.c

F: include/hw/arm/iotkit.h

F: hw/misc/iotkit-secctl.c

F: include/hw/misc/iotkit-secctl.h

F: hw/misc/iotkit-sysctl.c

F: include/hw/misc/iotkit-sysctl.h

F: hw/misc/iotkit-sysinfo.c
@@ -738,6 +744,9 @@ L: qemu-arm@nongnu.org 
S: Maintained

F: hw/*/xlnx*.c

F: include/hw/*/xlnx*.h

F: include/hw/ssi/xilinx_spips.h

F: hw/display/dpcd.c

F: include/hw/display/dpcd.h



ARM ACPI Subsystem

M: Shannon Zhao <shannon.zhaosl@gmail.com>
@@ -846,6 +855,7 @@ petalogix_s3adsp1800 
M: Edgar E. Iglesias <edgar.iglesias@gmail.com>

S: Maintained

F: hw/microblaze/petalogix_s3adsp1800_mmu.c

F: include/hw/char/xilinx_uartlite.h



petalogix_ml605

M: Edgar E. Iglesias <edgar.iglesias@gmail.com>
@@ -859,6 +869,8 @@ M: Hervé Poussineau <hpoussin@reactos.org> 
R: Stefan Markovic <smarkovic@wavecomp.com>

S: Maintained

F: hw/mips/mips_jazz.c

F: hw/display/jazz_led.c

F: hw/dma/rc4030.c



Malta

M: Aurelien Jarno <aurelien@aurel32.net>
@@ -885,7 +897,7 @@ R: Stefan Markovic <smarkovic@wavecomp.com> 
S: Odd Fixes

F: hw/mips/mips_fulong2e.c

F: hw/isa/vt82c686.c



F: hw/pci-host/bonito.c

F: include/hw/isa/vt82c686.h



Boston
@@ -895,6 +907,7 @@ S: Maintained 
F: hw/core/loader-fit.c

F: hw/mips/boston.c

F: hw/pci-host/xilinx-pcie.c

F: include/hw/pci-host/xilinx-pcie.h



OpenRISC Machines

-----------------
@@ -947,6 +960,7 @@ F: hw/nvram/mac_nvram.c 
F: include/hw/misc/macio/

F: include/hw/misc/mos6522.h

F: include/hw/ppc/mac_dbdma.h

F: include/hw/pci-host/uninorth.h



Old World

M: David Gibson <david@gibson.dropbear.id.au>
@@ -956,6 +970,7 @@ F: hw/ppc/mac_oldworld.c 
F: hw/pci-host/grackle.c

F: hw/misc/macio/

F: hw/intc/heathrow_pic.c

F: include/hw/intc/heathrow_pic.h



PReP

M: Hervé Poussineau <hpoussin@reactos.org>
@@ -1032,12 +1047,15 @@ F: hw/misc/eccmemctl.c 
F: hw/misc/slavio_misc.c

F: include/hw/sparc/sparc32_dma.h

F: pc-bios/openbios-sparc32

F: include/hw/sparc/sun4m_iommu.h



Sun4u

M: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>

S: Maintained

F: hw/sparc64/sun4u.c

F: pc-bios/openbios-sparc64

F: hw/pci-host/sabre.c

F: include/hw/pci-host/sabre.h



Sun4v

M: Artyom Tarasenko <atar4qemu@gmail.com>
@@ -1136,11 +1154,13 @@ F: hw/timer/hpet* 
F: hw/timer/i8254*

F: hw/timer/mc146818rtc*

F: hw/watchdog/wdt_ib700.c

F: hw/watchdog/wdt_i6300esb.c

F: include/hw/display/vga.h

F: include/hw/char/parallel.h

F: include/hw/dma/i8257.h

F: include/hw/i2c/pm_smbus.h

F: include/hw/input/i8042.h

F: include/hw/isa/i8259_internal.h

F: include/hw/isa/superio.h

F: include/hw/timer/hpet.h

F: include/hw/timer/i8254*
@@ -1246,8 +1266,7 @@ F: hw/i386/acpi-build.[hc] 
F: hw/arm/virt-acpi-build.c

F: tests/bios-tables-test.c

F: tests/acpi-utils.[hc]

F: tests/acpi-test-data/*

F: tests/acpi-test-data/*/*

F: tests/data/acpi/



ppc4xx

M: David Gibson <david@gibson.dropbear.id.au>
@@ -1282,7 +1301,7 @@ T: git https://github.com/jasowang/qemu.git net 


SCSI

M: Paolo Bonzini <pbonzini@redhat.com>

R: Fam Zheng <famz@redhat.com>

R: Fam Zheng <fam@euphon.net>

S: Supported

F: include/hw/scsi/*

F: hw/scsi/*
@@ -1366,6 +1385,7 @@ M: Michael S. Tsirkin <mst@redhat.com> 
S: Supported

F: hw/*/*vhost*

F: docs/interop/vhost-user.txt

F: contrib/vhost-user-*/



virtio

M: Michael S. Tsirkin <mst@redhat.com>
@@ -1478,6 +1498,7 @@ S: Maintained 
F: hw/acpi/nvdimm.c

F: hw/mem/nvdimm.c

F: include/hw/mem/nvdimm.h

F: docs/nvdimm.txt



e1000x

M: Dmitry Fleytman <dmitry.fleytman@gmail.com>
@@ -1608,7 +1629,7 @@ T: git https://repo.or.cz/qemu/kevin.git block 


Block I/O path

M: Stefan Hajnoczi <stefanha@redhat.com>

M: Fam Zheng <famz@redhat.com>

M: Fam Zheng <fam@euphon.net>

L: qemu-block@nongnu.org

S: Supported

F: util/async.c
@@ -1622,7 +1643,7 @@ T: git https://github.com/stefanha/qemu.git block 


Block SCSI subsystem

M: Paolo Bonzini <pbonzini@redhat.com>

R: Fam Zheng <famz@redhat.com>

R: Fam Zheng <fam@euphon.net>

L: qemu-block@nongnu.org

S: Supported

F: include/scsi/*
@@ -1654,7 +1675,7 @@ F: qapi/transaction.json 
T: git https://repo.or.cz/qemu/armbru.git block-next



Dirty Bitmaps

M: Fam Zheng <famz@redhat.com>

M: Fam Zheng <fam@euphon.net>

M: John Snow <jsnow@redhat.com>

L: qemu-block@nongnu.org

S: Supported
@@ -1752,6 +1773,7 @@ F: ui/spice-*.c 
F: audio/spiceaudio.c

F: hw/display/qxl*

F: qapi/ui.json

F: docs/spice-port-fqdn.txt



Graphics

M: Gerd Hoffmann <kraxel@redhat.com>
@@ -1896,6 +1918,7 @@ S: Supported 
F: qmp.c

F: monitor.c

F: docs/devel/*qmp-*

F: docs/interop/*qmp-*

F: scripts/qmp/

F: tests/qmp-test.c

F: tests/qmp-cmd-test.c
@@ -2028,7 +2051,7 @@ F: tests/test-throttle.c 
L: qemu-block@nongnu.org



UUID

M: Fam Zheng <famz@redhat.com>

M: Fam Zheng <fam@euphon.net>

S: Supported

F: util/uuid.c

F: include/qemu/uuid.h
@@ -2159,7 +2182,7 @@ F: disas/tci.c 
Block drivers

-------------

VMDK

M: Fam Zheng <famz@redhat.com>

M: Fam Zheng <fam@euphon.net>

L: qemu-block@nongnu.org

S: Supported

F: block/vmdk.c
@@ -2245,13 +2268,13 @@ F: block/gluster.c 
T: git https://github.com/codyprime/qemu-kvm-jtc.git block



Null Block Driver

M: Fam Zheng <famz@redhat.com>

M: Fam Zheng <fam@euphon.net>

L: qemu-block@nongnu.org

S: Supported

F: block/null.c



NVMe Block Driver

M: Fam Zheng <famz@redhat.com>

M: Fam Zheng <fam@euphon.net>

L: qemu-block@nongnu.org

S: Supported

F: block/nvme*
@@ -2382,8 +2405,8 @@ Build and test automation 
-------------------------

Build and test automation

M: Alex Bennée <alex.bennee@linaro.org>

M: Fam Zheng <famz@redhat.com>

R: Philippe Mathieu-Daudé <f4bug@amsat.org>

M: Fam Zheng <fam@euphon.net>

R: Philippe Mathieu-Daudé <philmd@redhat.com>

L: qemu-devel@nongnu.org

S: Maintained

F: .travis.yml

Makefile

+24 −170
Original line number Diff line number Diff line
@@ -88,82 +88,26 @@ endif 
include $(SRC_PATH)/rules.mak



GENERATED_FILES = qemu-version.h config-host.h qemu-options.def

GENERATED_FILES += qapi/qapi-builtin-types.h qapi/qapi-builtin-types.c

GENERATED_FILES += qapi/qapi-types.h qapi/qapi-types.c

GENERATED_FILES += qapi/qapi-types-block-core.h qapi/qapi-types-block-core.c

GENERATED_FILES += qapi/qapi-types-block.h qapi/qapi-types-block.c

GENERATED_FILES += qapi/qapi-types-char.h qapi/qapi-types-char.c

GENERATED_FILES += qapi/qapi-types-common.h qapi/qapi-types-common.c

GENERATED_FILES += qapi/qapi-types-crypto.h qapi/qapi-types-crypto.c

GENERATED_FILES += qapi/qapi-types-introspect.h qapi/qapi-types-introspect.c

GENERATED_FILES += qapi/qapi-types-job.h qapi/qapi-types-job.c

GENERATED_FILES += qapi/qapi-types-migration.h qapi/qapi-types-migration.c

GENERATED_FILES += qapi/qapi-types-misc.h qapi/qapi-types-misc.c

GENERATED_FILES += qapi/qapi-types-net.h qapi/qapi-types-net.c

GENERATED_FILES += qapi/qapi-types-rocker.h qapi/qapi-types-rocker.c

GENERATED_FILES += qapi/qapi-types-run-state.h qapi/qapi-types-run-state.c

GENERATED_FILES += qapi/qapi-types-sockets.h qapi/qapi-types-sockets.c

GENERATED_FILES += qapi/qapi-types-tpm.h qapi/qapi-types-tpm.c

GENERATED_FILES += qapi/qapi-types-trace.h qapi/qapi-types-trace.c

GENERATED_FILES += qapi/qapi-types-transaction.h qapi/qapi-types-transaction.c

GENERATED_FILES += qapi/qapi-types-ui.h qapi/qapi-types-ui.c

GENERATED_FILES += qapi/qapi-builtin-visit.h qapi/qapi-builtin-visit.c

GENERATED_FILES += qapi/qapi-visit.h qapi/qapi-visit.c

GENERATED_FILES += qapi/qapi-visit-block-core.h qapi/qapi-visit-block-core.c

GENERATED_FILES += qapi/qapi-visit-block.h qapi/qapi-visit-block.c

GENERATED_FILES += qapi/qapi-visit-char.h qapi/qapi-visit-char.c

GENERATED_FILES += qapi/qapi-visit-common.h qapi/qapi-visit-common.c

GENERATED_FILES += qapi/qapi-visit-crypto.h qapi/qapi-visit-crypto.c

GENERATED_FILES += qapi/qapi-visit-introspect.h qapi/qapi-visit-introspect.c

GENERATED_FILES += qapi/qapi-visit-job.h qapi/qapi-visit-job.c

GENERATED_FILES += qapi/qapi-visit-migration.h qapi/qapi-visit-migration.c

GENERATED_FILES += qapi/qapi-visit-misc.h qapi/qapi-visit-misc.c

GENERATED_FILES += qapi/qapi-visit-net.h qapi/qapi-visit-net.c

GENERATED_FILES += qapi/qapi-visit-rocker.h qapi/qapi-visit-rocker.c

GENERATED_FILES += qapi/qapi-visit-run-state.h qapi/qapi-visit-run-state.c

GENERATED_FILES += qapi/qapi-visit-sockets.h qapi/qapi-visit-sockets.c

GENERATED_FILES += qapi/qapi-visit-tpm.h qapi/qapi-visit-tpm.c

GENERATED_FILES += qapi/qapi-visit-trace.h qapi/qapi-visit-trace.c

GENERATED_FILES += qapi/qapi-visit-transaction.h qapi/qapi-visit-transaction.c

GENERATED_FILES += qapi/qapi-visit-ui.h qapi/qapi-visit-ui.c

GENERATED_FILES += qapi/qapi-commands.h qapi/qapi-commands.c

GENERATED_FILES += qapi/qapi-commands-block-core.h qapi/qapi-commands-block-core.c

GENERATED_FILES += qapi/qapi-commands-block.h qapi/qapi-commands-block.c

GENERATED_FILES += qapi/qapi-commands-char.h qapi/qapi-commands-char.c

GENERATED_FILES += qapi/qapi-commands-common.h qapi/qapi-commands-common.c

GENERATED_FILES += qapi/qapi-commands-crypto.h qapi/qapi-commands-crypto.c

GENERATED_FILES += qapi/qapi-commands-introspect.h qapi/qapi-commands-introspect.c

GENERATED_FILES += qapi/qapi-commands-job.h qapi/qapi-commands-job.c

GENERATED_FILES += qapi/qapi-commands-migration.h qapi/qapi-commands-migration.c

GENERATED_FILES += qapi/qapi-commands-misc.h qapi/qapi-commands-misc.c

GENERATED_FILES += qapi/qapi-commands-net.h qapi/qapi-commands-net.c

GENERATED_FILES += qapi/qapi-commands-rocker.h qapi/qapi-commands-rocker.c

GENERATED_FILES += qapi/qapi-commands-run-state.h qapi/qapi-commands-run-state.c

GENERATED_FILES += qapi/qapi-commands-sockets.h qapi/qapi-commands-sockets.c

GENERATED_FILES += qapi/qapi-commands-tpm.h qapi/qapi-commands-tpm.c

GENERATED_FILES += qapi/qapi-commands-trace.h qapi/qapi-commands-trace.c

GENERATED_FILES += qapi/qapi-commands-transaction.h qapi/qapi-commands-transaction.c

GENERATED_FILES += qapi/qapi-commands-ui.h qapi/qapi-commands-ui.c

GENERATED_FILES += qapi/qapi-events.h qapi/qapi-events.c

GENERATED_FILES += qapi/qapi-events-block-core.h qapi/qapi-events-block-core.c

GENERATED_FILES += qapi/qapi-events-block.h qapi/qapi-events-block.c

GENERATED_FILES += qapi/qapi-events-char.h qapi/qapi-events-char.c

GENERATED_FILES += qapi/qapi-events-common.h qapi/qapi-events-common.c

GENERATED_FILES += qapi/qapi-events-crypto.h qapi/qapi-events-crypto.c

GENERATED_FILES += qapi/qapi-events-introspect.h qapi/qapi-events-introspect.c

GENERATED_FILES += qapi/qapi-events-job.h qapi/qapi-events-job.c

GENERATED_FILES += qapi/qapi-events-migration.h qapi/qapi-events-migration.c

GENERATED_FILES += qapi/qapi-events-misc.h qapi/qapi-events-misc.c

GENERATED_FILES += qapi/qapi-events-net.h qapi/qapi-events-net.c

GENERATED_FILES += qapi/qapi-events-rocker.h qapi/qapi-events-rocker.c

GENERATED_FILES += qapi/qapi-events-run-state.h qapi/qapi-events-run-state.c

GENERATED_FILES += qapi/qapi-events-sockets.h qapi/qapi-events-sockets.c

GENERATED_FILES += qapi/qapi-events-tpm.h qapi/qapi-events-tpm.c

GENERATED_FILES += qapi/qapi-events-trace.h qapi/qapi-events-trace.c

GENERATED_FILES += qapi/qapi-events-transaction.h qapi/qapi-events-transaction.c

GENERATED_FILES += qapi/qapi-events-ui.h qapi/qapi-events-ui.c

GENERATED_FILES += qapi/qapi-introspect.c qapi/qapi-introspect.h

GENERATED_FILES += qapi/qapi-doc.texi



#see Makefile.objs for the definition of QAPI_MODULES

GENERATED_QAPI_FILES = qapi/qapi-builtin-types.h qapi/qapi-builtin-types.c

GENERATED_QAPI_FILES += qapi/qapi-types.h qapi/qapi-types.c

GENERATED_QAPI_FILES += $(QAPI_MODULES:%=qapi/qapi-types-%.h)

GENERATED_QAPI_FILES += $(QAPI_MODULES:%=qapi/qapi-types-%.c)

GENERATED_QAPI_FILES += qapi/qapi-builtin-visit.h qapi/qapi-builtin-visit.c

GENERATED_QAPI_FILES += qapi/qapi-visit.h qapi/qapi-visit.c

GENERATED_QAPI_FILES += $(QAPI_MODULES:%=qapi/qapi-visit-%.h)

GENERATED_QAPI_FILES += $(QAPI_MODULES:%=qapi/qapi-visit-%.c)

GENERATED_QAPI_FILES += qapi/qapi-commands.h qapi/qapi-commands.c

GENERATED_QAPI_FILES += $(QAPI_MODULES:%=qapi/qapi-commands-%.h)

GENERATED_QAPI_FILES += $(QAPI_MODULES:%=qapi/qapi-commands-%.c)

GENERATED_QAPI_FILES += qapi/qapi-events.h qapi/qapi-events.c

GENERATED_QAPI_FILES += $(QAPI_MODULES:%=qapi/qapi-events-%.h)

GENERATED_QAPI_FILES += $(QAPI_MODULES:%=qapi/qapi-events-%.c)

GENERATED_QAPI_FILES += qapi/qapi-introspect.c qapi/qapi-introspect.h

GENERATED_QAPI_FILES += qapi/qapi-doc.texi



GENERATED_FILES += $(GENERATED_QAPI_FILES)



GENERATED_FILES += trace/generated-tcg-tracers.h
@@ -583,100 +527,10 @@ qga/qapi-generated/qapi-gen-timestamp: $(SRC_PATH)/qga/qapi-schema.json $(qapi-p 
		"GEN","$(@:%-timestamp=%)")

	@>$@



qapi-modules = $(SRC_PATH)/qapi/qapi-schema.json $(SRC_PATH)/qapi/common.json \

               $(SRC_PATH)/qapi/block.json $(SRC_PATH)/qapi/block-core.json \

               $(SRC_PATH)/qapi/char.json \

               $(SRC_PATH)/qapi/crypto.json \

               $(SRC_PATH)/qapi/introspect.json \

               $(SRC_PATH)/qapi/job.json \

               $(SRC_PATH)/qapi/migration.json \

               $(SRC_PATH)/qapi/misc.json \

               $(SRC_PATH)/qapi/net.json \

               $(SRC_PATH)/qapi/rocker.json \

               $(SRC_PATH)/qapi/run-state.json \

               $(SRC_PATH)/qapi/sockets.json \

               $(SRC_PATH)/qapi/tpm.json \

               $(SRC_PATH)/qapi/trace.json \

               $(SRC_PATH)/qapi/transaction.json \

               $(SRC_PATH)/qapi/ui.json



qapi/qapi-builtin-types.c qapi/qapi-builtin-types.h \

qapi/qapi-types.c qapi/qapi-types.h \

qapi/qapi-types-block-core.c qapi/qapi-types-block-core.h \

qapi/qapi-types-block.c qapi/qapi-types-block.h \

qapi/qapi-types-char.c qapi/qapi-types-char.h \

qapi/qapi-types-common.c qapi/qapi-types-common.h \

qapi/qapi-types-crypto.c qapi/qapi-types-crypto.h \

qapi/qapi-types-introspect.c qapi/qapi-types-introspect.h \

qapi/qapi-types-job.c qapi/qapi-types-job.h \

qapi/qapi-types-migration.c qapi/qapi-types-migration.h \

qapi/qapi-types-misc.c qapi/qapi-types-misc.h \

qapi/qapi-types-net.c qapi/qapi-types-net.h \

qapi/qapi-types-rocker.c qapi/qapi-types-rocker.h \

qapi/qapi-types-run-state.c qapi/qapi-types-run-state.h \

qapi/qapi-types-sockets.c qapi/qapi-types-sockets.h \

qapi/qapi-types-tpm.c qapi/qapi-types-tpm.h \

qapi/qapi-types-trace.c qapi/qapi-types-trace.h \

qapi/qapi-types-transaction.c qapi/qapi-types-transaction.h \

qapi/qapi-types-ui.c qapi/qapi-types-ui.h \

qapi/qapi-builtin-visit.c qapi/qapi-builtin-visit.h \

qapi/qapi-visit.c qapi/qapi-visit.h \

qapi/qapi-visit-block-core.c qapi/qapi-visit-block-core.h \

qapi/qapi-visit-block.c qapi/qapi-visit-block.h \

qapi/qapi-visit-char.c qapi/qapi-visit-char.h \

qapi/qapi-visit-common.c qapi/qapi-visit-common.h \

qapi/qapi-visit-crypto.c qapi/qapi-visit-crypto.h \

qapi/qapi-visit-introspect.c qapi/qapi-visit-introspect.h \

qapi/qapi-visit-job.c qapi/qapi-visit-job.h \

qapi/qapi-visit-migration.c qapi/qapi-visit-migration.h \

qapi/qapi-visit-misc.c qapi/qapi-visit-misc.h \

qapi/qapi-visit-net.c qapi/qapi-visit-net.h \

qapi/qapi-visit-rocker.c qapi/qapi-visit-rocker.h \

qapi/qapi-visit-run-state.c qapi/qapi-visit-run-state.h \

qapi/qapi-visit-sockets.c qapi/qapi-visit-sockets.h \

qapi/qapi-visit-tpm.c qapi/qapi-visit-tpm.h \

qapi/qapi-visit-trace.c qapi/qapi-visit-trace.h \

qapi/qapi-visit-transaction.c qapi/qapi-visit-transaction.h \

qapi/qapi-visit-ui.c qapi/qapi-visit-ui.h \

qapi/qapi-commands.h qapi/qapi-commands.c \

qapi/qapi-commands-block-core.c qapi/qapi-commands-block-core.h \

qapi/qapi-commands-block.c qapi/qapi-commands-block.h \

qapi/qapi-commands-char.c qapi/qapi-commands-char.h \

qapi/qapi-commands-common.c qapi/qapi-commands-common.h \

qapi/qapi-commands-crypto.c qapi/qapi-commands-crypto.h \

qapi/qapi-commands-introspect.c qapi/qapi-commands-introspect.h \

qapi/qapi-commands-job.c qapi/qapi-commands-job.h \

qapi/qapi-commands-migration.c qapi/qapi-commands-migration.h \

qapi/qapi-commands-misc.c qapi/qapi-commands-misc.h \

qapi/qapi-commands-net.c qapi/qapi-commands-net.h \

qapi/qapi-commands-rocker.c qapi/qapi-commands-rocker.h \

qapi/qapi-commands-run-state.c qapi/qapi-commands-run-state.h \

qapi/qapi-commands-sockets.c qapi/qapi-commands-sockets.h \

qapi/qapi-commands-tpm.c qapi/qapi-commands-tpm.h \

qapi/qapi-commands-trace.c qapi/qapi-commands-trace.h \

qapi/qapi-commands-transaction.c qapi/qapi-commands-transaction.h \

qapi/qapi-commands-ui.c qapi/qapi-commands-ui.h \

qapi/qapi-events.c qapi/qapi-events.h \

qapi/qapi-events-block-core.c qapi/qapi-events-block-core.h \

qapi/qapi-events-block.c qapi/qapi-events-block.h \

qapi/qapi-events-char.c qapi/qapi-events-char.h \

qapi/qapi-events-common.c qapi/qapi-events-common.h \

qapi/qapi-events-crypto.c qapi/qapi-events-crypto.h \

qapi/qapi-events-introspect.c qapi/qapi-events-introspect.h \

qapi/qapi-events-job.c qapi/qapi-events-job.h \

qapi/qapi-events-migration.c qapi/qapi-events-migration.h \

qapi/qapi-events-misc.c qapi/qapi-events-misc.h \

qapi/qapi-events-net.c qapi/qapi-events-net.h \

qapi/qapi-events-rocker.c qapi/qapi-events-rocker.h \

qapi/qapi-events-run-state.c qapi/qapi-events-run-state.h \

qapi/qapi-events-sockets.c qapi/qapi-events-sockets.h \

qapi/qapi-events-tpm.c qapi/qapi-events-tpm.h \

qapi/qapi-events-trace.c qapi/qapi-events-trace.h \

qapi/qapi-events-transaction.c qapi/qapi-events-transaction.h \

qapi/qapi-events-ui.c qapi/qapi-events-ui.h \

qapi/qapi-introspect.h qapi/qapi-introspect.c \

qapi/qapi-doc.texi: \

qapi-gen-timestamp ;

qapi-modules = $(SRC_PATH)/qapi/qapi-schema.json \

               $(QAPI_MODULES:%=$(SRC_PATH)/qapi/%.json)



$(GENERATED_QAPI_FILES): qapi-gen-timestamp ;

qapi-gen-timestamp: $(qapi-modules) $(qapi-py)

	$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-gen.py \

		-o "qapi" -b $<, \

Makefile.objs

+7 −68
Original line number Diff line number Diff line 
QAPI_MODULES = block-core block char common crypto introspect job migration

QAPI_MODULES += misc net rocker run-state sockets tpm trace transaction ui



#######################################################################

# Common libraries for tools and emulators

stub-obj-y = stubs/ crypto/

util-obj-y = util/ qobject/ qapi/

util-obj-y += qapi/qapi-builtin-types.o

util-obj-y += qapi/qapi-types.o

util-obj-y += qapi/qapi-types-block-core.o

util-obj-y += qapi/qapi-types-block.o

util-obj-y += qapi/qapi-types-char.o

util-obj-y += qapi/qapi-types-common.o

util-obj-y += qapi/qapi-types-crypto.o

util-obj-y += qapi/qapi-types-introspect.o

util-obj-y += qapi/qapi-types-job.o

util-obj-y += qapi/qapi-types-migration.o

util-obj-y += qapi/qapi-types-misc.o

util-obj-y += qapi/qapi-types-net.o

util-obj-y += qapi/qapi-types-rocker.o

util-obj-y += qapi/qapi-types-run-state.o

util-obj-y += qapi/qapi-types-sockets.o

util-obj-y += qapi/qapi-types-tpm.o

util-obj-y += qapi/qapi-types-trace.o

util-obj-y += qapi/qapi-types-transaction.o

util-obj-y += qapi/qapi-types-ui.o

util-obj-y += $(QAPI_MODULES:%=qapi/qapi-types-%.o)

util-obj-y += qapi/qapi-builtin-visit.o

util-obj-y += qapi/qapi-visit.o

util-obj-y += qapi/qapi-visit-block-core.o

util-obj-y += qapi/qapi-visit-block.o

util-obj-y += qapi/qapi-visit-char.o

util-obj-y += qapi/qapi-visit-common.o

util-obj-y += qapi/qapi-visit-crypto.o

util-obj-y += qapi/qapi-visit-introspect.o

util-obj-y += qapi/qapi-visit-job.o

util-obj-y += qapi/qapi-visit-migration.o

util-obj-y += qapi/qapi-visit-misc.o

util-obj-y += qapi/qapi-visit-net.o

util-obj-y += qapi/qapi-visit-rocker.o

util-obj-y += qapi/qapi-visit-run-state.o

util-obj-y += qapi/qapi-visit-sockets.o

util-obj-y += qapi/qapi-visit-tpm.o

util-obj-y += qapi/qapi-visit-trace.o

util-obj-y += qapi/qapi-visit-transaction.o

util-obj-y += qapi/qapi-visit-ui.o

util-obj-y += $(QAPI_MODULES:%=qapi/qapi-visit-%.o)

util-obj-y += qapi/qapi-events.o

util-obj-y += qapi/qapi-events-block-core.o

util-obj-y += qapi/qapi-events-block.o

util-obj-y += qapi/qapi-events-char.o

util-obj-y += qapi/qapi-events-common.o

util-obj-y += qapi/qapi-events-crypto.o

util-obj-y += qapi/qapi-events-introspect.o

util-obj-y += qapi/qapi-events-job.o

util-obj-y += qapi/qapi-events-migration.o

util-obj-y += qapi/qapi-events-misc.o

util-obj-y += qapi/qapi-events-net.o

util-obj-y += qapi/qapi-events-rocker.o

util-obj-y += qapi/qapi-events-run-state.o

util-obj-y += qapi/qapi-events-sockets.o

util-obj-y += qapi/qapi-events-tpm.o

util-obj-y += qapi/qapi-events-trace.o

util-obj-y += qapi/qapi-events-transaction.o

util-obj-y += qapi/qapi-events-ui.o

util-obj-y += $(QAPI_MODULES:%=qapi/qapi-events-%.o)

util-obj-y += qapi/qapi-introspect.o



chardev-obj-y = chardev/
@@ -138,23 +93,7 @@ common-obj-$(CONFIG_FDT) += device_tree.o 
# qapi



common-obj-y += qapi/qapi-commands.o

common-obj-y += qapi/qapi-commands-block-core.o

common-obj-y += qapi/qapi-commands-block.o

common-obj-y += qapi/qapi-commands-char.o

common-obj-y += qapi/qapi-commands-common.o

common-obj-y += qapi/qapi-commands-crypto.o

common-obj-y += qapi/qapi-commands-introspect.o

common-obj-y += qapi/qapi-commands-job.o

common-obj-y += qapi/qapi-commands-migration.o

common-obj-y += qapi/qapi-commands-misc.o

common-obj-y += qapi/qapi-commands-net.o

common-obj-y += qapi/qapi-commands-rocker.o

common-obj-y += qapi/qapi-commands-run-state.o

common-obj-y += qapi/qapi-commands-sockets.o

common-obj-y += qapi/qapi-commands-tpm.o

common-obj-y += qapi/qapi-commands-trace.o

common-obj-y += qapi/qapi-commands-transaction.o

common-obj-y += qapi/qapi-commands-ui.o

common-obj-y += $(QAPI_MODULES:%=qapi/qapi-commands-%.o)

common-obj-y += qapi/qapi-introspect.o

common-obj-y += qmp.o hmp.o

endif