mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-07-08 20:17:27 +00:00
760df0d121
* Cleanups (Philippe) * virtio-scsi fix (Pan Nengyuan) * Tweak Skylake-v3 model id (Kashyap) * x86 UCODE_REV support and nested live migration fix (myself) * Advisory mode for pvpanic (Zhenwei) -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQEcBAABAgAGBQJeK1CXAAoJEL/70l94x66DXtkIAI6W5wEY0Yme4M9Q5mGc0RV8 uscPLg0wsg88u6xne8ucCiGymvDREym2ii/aVI0Hi5ish84ZMdCrdck9cd+llpMf +a3slL26AKlOW8WtYSuyAE1RdLFXngeXdwal5KtWPEExJorkDUPTbwhBzQduQK1a myoHHcbwdd/96v7FvKnfG8jM6KZtHPQQ0i6+6fX4PN44jaULQNjze8GIrRBEwqw5 uCKJFQPBXiVcxKjH5/kzI1vl2hLJbF2ZGVEzX/U8OPZwyGPHIkWquURo8lvUTPfb ySlNTUTV2CyrN65TBRXQp/mJi44WvME5Jxlf5rNLBaYXPpL0zhmILKn5X5ya4U0= =TD0Y -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging * Register qdev properties as class properties (Marc-André) * Cleanups (Philippe) * virtio-scsi fix (Pan Nengyuan) * Tweak Skylake-v3 model id (Kashyap) * x86 UCODE_REV support and nested live migration fix (myself) * Advisory mode for pvpanic (Zhenwei) # gpg: Signature made Fri 24 Jan 2020 20:16:23 GMT # gpg: using RSA key BFFBD25F78C7AE83 # gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full] # gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" [full] # Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1 # Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83 * remotes/bonzini/tags/for-upstream: (58 commits) build-sys: clean up flags included in the linker command line target/i386: Add the 'model-id' for Skylake -v3 CPU models qdev: use object_property_help() qapi/qmp: add ObjectPropertyInfo.default-value qom: introduce object_property_help() qom: simplify qmp_device_list_properties() vl: print default value in object help qdev: register properties as class properties qdev: move instance properties to class properties qdev: rename DeviceClass.props qdev: set properties with device_class_set_props() object: return self in object_ref() object: release all props object: add object_class_property_add_link() object: express const link with link property object: add direct link flag object: rename link "child" to "target" object: check strong flag with & object: do not free class properties object: add object_property_set_default ... Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
205 lines
6.2 KiB
Makefile
205 lines
6.2 KiB
Makefile
#######################################################################
|
|
# Common libraries for tools and emulators
|
|
stub-obj-y = stubs/
|
|
util-obj-y = crypto/ util/ qobject/ qapi/
|
|
qom-obj-y = qom/
|
|
|
|
#######################################################################
|
|
# code used by both qemu system emulation and qemu-img
|
|
|
|
ifeq ($(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS)),y)
|
|
|
|
chardev-obj-y = chardev/
|
|
|
|
authz-obj-y = authz/
|
|
|
|
block-obj-y = nbd/
|
|
block-obj-y += block.o blockjob.o job.o
|
|
block-obj-y += block/ scsi/
|
|
block-obj-y += qemu-io-cmds.o
|
|
block-obj-$(CONFIG_REPLICATION) += replication.o
|
|
|
|
block-obj-m = block/
|
|
|
|
crypto-obj-y = crypto/
|
|
|
|
io-obj-y = io/
|
|
|
|
endif # CONFIG_SOFTMMU or CONFIG_TOOLS
|
|
|
|
######################################################################
|
|
# Target independent part of system emulation. The long term path is to
|
|
# suppress *all* target specific code in case of system emulation, i.e. a
|
|
# single QEMU executable should support all CPUs and machines.
|
|
|
|
ifeq ($(CONFIG_SOFTMMU),y)
|
|
common-obj-y = blockdev.o blockdev-nbd.o block/
|
|
common-obj-y += bootdevice.o iothread.o
|
|
common-obj-y += dump/
|
|
common-obj-y += job-qmp.o
|
|
common-obj-y += monitor/
|
|
common-obj-y += net/
|
|
common-obj-y += qdev-monitor.o device-hotplug.o
|
|
common-obj-$(CONFIG_WIN32) += os-win32.o
|
|
common-obj-$(CONFIG_POSIX) += os-posix.o
|
|
|
|
common-obj-$(CONFIG_LINUX) += fsdev/
|
|
|
|
common-obj-y += accel/
|
|
common-obj-y += migration/
|
|
|
|
common-obj-y += audio/
|
|
common-obj-m += audio/
|
|
common-obj-y += hw/
|
|
|
|
common-obj-y += replay/
|
|
|
|
common-obj-y += ui/
|
|
common-obj-m += ui/
|
|
|
|
common-obj-y += dma-helpers.o
|
|
common-obj-y += vl.o
|
|
vl.o-cflags := $(GPROF_CFLAGS) $(SDL_CFLAGS)
|
|
common-obj-$(CONFIG_TPM) += tpm.o
|
|
|
|
common-obj-y += backends/
|
|
common-obj-y += chardev/
|
|
|
|
common-obj-$(CONFIG_SECCOMP) += qemu-seccomp.o
|
|
qemu-seccomp.o-cflags := $(SECCOMP_CFLAGS)
|
|
qemu-seccomp.o-libs := $(SECCOMP_LIBS)
|
|
|
|
common-obj-$(CONFIG_FDT) += device_tree.o
|
|
|
|
common-obj-y += qapi/
|
|
|
|
endif # CONFIG_SOFTMMU
|
|
|
|
#######################################################################
|
|
# Target-independent parts used in system and user emulation
|
|
common-obj-y += cpus-common.o
|
|
common-obj-y += hw/
|
|
common-obj-y += qom/
|
|
common-obj-y += disas/
|
|
|
|
######################################################################
|
|
# Resource file for Windows executables
|
|
version-obj-$(CONFIG_WIN32) += $(BUILD_DIR)/version.o
|
|
|
|
######################################################################
|
|
# tracing
|
|
util-obj-y += trace/
|
|
|
|
######################################################################
|
|
# guest agent
|
|
|
|
# FIXME: a few definitions from qapi/qapi-types.o and
|
|
# qapi/qapi-visit.o are needed by libqemuutil.a. These should be
|
|
# extracted into a QAPI schema module, or perhaps a separate schema.
|
|
qga-obj-y = qga/
|
|
qga-vss-dll-obj-y = qga/
|
|
|
|
######################################################################
|
|
# contrib
|
|
elf2dmp-obj-y = contrib/elf2dmp/
|
|
ivshmem-client-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-client/
|
|
ivshmem-server-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-server/
|
|
libvhost-user-obj-y = contrib/libvhost-user/
|
|
vhost-user-scsi.o-cflags := $(LIBISCSI_CFLAGS)
|
|
vhost-user-scsi.o-libs := $(LIBISCSI_LIBS)
|
|
vhost-user-scsi-obj-y = contrib/vhost-user-scsi/
|
|
vhost-user-blk-obj-y = contrib/vhost-user-blk/
|
|
rdmacm-mux-obj-y = contrib/rdmacm-mux/
|
|
vhost-user-input-obj-y = contrib/vhost-user-input/
|
|
vhost-user-gpu-obj-y = contrib/vhost-user-gpu/
|
|
virtiofsd-obj-y = tools/virtiofsd/
|
|
|
|
######################################################################
|
|
trace-events-subdirs =
|
|
trace-events-subdirs += accel/kvm
|
|
trace-events-subdirs += accel/tcg
|
|
trace-events-subdirs += backends
|
|
trace-events-subdirs += crypto
|
|
trace-events-subdirs += monitor
|
|
ifeq ($(CONFIG_USER_ONLY),y)
|
|
trace-events-subdirs += linux-user
|
|
endif
|
|
ifeq ($(CONFIG_BLOCK),y)
|
|
trace-events-subdirs += authz
|
|
trace-events-subdirs += block
|
|
trace-events-subdirs += io
|
|
trace-events-subdirs += nbd
|
|
trace-events-subdirs += scsi
|
|
endif
|
|
ifeq ($(CONFIG_SOFTMMU),y)
|
|
trace-events-subdirs += chardev
|
|
trace-events-subdirs += audio
|
|
trace-events-subdirs += hw/9pfs
|
|
trace-events-subdirs += hw/acpi
|
|
trace-events-subdirs += hw/alpha
|
|
trace-events-subdirs += hw/arm
|
|
trace-events-subdirs += hw/audio
|
|
trace-events-subdirs += hw/block
|
|
trace-events-subdirs += hw/block/dataplane
|
|
trace-events-subdirs += hw/char
|
|
trace-events-subdirs += hw/dma
|
|
trace-events-subdirs += hw/hppa
|
|
trace-events-subdirs += hw/i2c
|
|
trace-events-subdirs += hw/i386
|
|
trace-events-subdirs += hw/i386/xen
|
|
trace-events-subdirs += hw/ide
|
|
trace-events-subdirs += hw/input
|
|
trace-events-subdirs += hw/intc
|
|
trace-events-subdirs += hw/isa
|
|
trace-events-subdirs += hw/mem
|
|
trace-events-subdirs += hw/mips
|
|
trace-events-subdirs += hw/misc
|
|
trace-events-subdirs += hw/misc/macio
|
|
trace-events-subdirs += hw/net
|
|
trace-events-subdirs += hw/nvram
|
|
trace-events-subdirs += hw/pci
|
|
trace-events-subdirs += hw/pci-host
|
|
trace-events-subdirs += hw/ppc
|
|
trace-events-subdirs += hw/rdma
|
|
trace-events-subdirs += hw/rdma/vmw
|
|
trace-events-subdirs += hw/rtc
|
|
trace-events-subdirs += hw/s390x
|
|
trace-events-subdirs += hw/scsi
|
|
trace-events-subdirs += hw/sd
|
|
trace-events-subdirs += hw/sparc
|
|
trace-events-subdirs += hw/sparc64
|
|
trace-events-subdirs += hw/timer
|
|
trace-events-subdirs += hw/tpm
|
|
trace-events-subdirs += hw/usb
|
|
trace-events-subdirs += hw/vfio
|
|
trace-events-subdirs += hw/virtio
|
|
trace-events-subdirs += hw/watchdog
|
|
trace-events-subdirs += hw/xen
|
|
trace-events-subdirs += hw/gpio
|
|
trace-events-subdirs += hw/riscv
|
|
trace-events-subdirs += migration
|
|
trace-events-subdirs += net
|
|
trace-events-subdirs += ui
|
|
endif
|
|
trace-events-subdirs += hw/display
|
|
trace-events-subdirs += qapi
|
|
trace-events-subdirs += qom
|
|
trace-events-subdirs += target/arm
|
|
trace-events-subdirs += target/hppa
|
|
trace-events-subdirs += target/i386
|
|
trace-events-subdirs += target/mips
|
|
trace-events-subdirs += target/ppc
|
|
trace-events-subdirs += target/riscv
|
|
trace-events-subdirs += target/s390x
|
|
trace-events-subdirs += target/sparc
|
|
trace-events-subdirs += util
|
|
trace-events-subdirs += hw/core
|
|
|
|
trace-events-files = $(SRC_PATH)/trace-events $(trace-events-subdirs:%=$(SRC_PATH)/%/trace-events)
|
|
|
|
trace-obj-y = trace-root.o
|
|
trace-obj-y += $(trace-events-subdirs:%=%/trace.o)
|
|
trace-obj-$(CONFIG_TRACE_UST) += trace-ust-all.o
|
|
trace-obj-$(CONFIG_TRACE_DTRACE) += trace-dtrace-root.o
|
|
trace-obj-$(CONFIG_TRACE_DTRACE) += $(trace-events-subdirs:%=%/trace-dtrace.o)
|