77424a452a
Here are some bugfixes that didn't make 2.8. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> -----BEGIN PGP SIGNATURE----- iQEcBAABAgAGBQJYVFkHAAoJECgfDbjSjVRpdc0H/1JMgQn0/J6vjKfeRY7720y8 /Bihf4gjKN2bPtu6pTGY1KQBvK76ShyvZZBFCa5bf8a4V9HP4BgSQ8mQ7ZUURzJJ OslYbSzK1R2LiWJ40e9xdFOoKWKB3lK1lBF/Xb8QPZPoJ0D50Fo2xpymt4hZFdkF oSnXxHmYoKMsMmmqJZd3aaqyffFLYGmcm1dbJOxninwu/nBzOBY2SQmmaaacSoGn 3D5988i6OcD1qbavfk4rNCQV4avJA+H7c/FmXH3WarPE8M9/jgnAaUDdknFicUA8 hGwMsLrO/7sMnMYtSQIxWg743LhrAm93HCr2u/TgLzhYbPydmLCpup5eAWj+jvo= =nN2D -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging virtio, vhost, pc: fixes Here are some bugfixes that didn't make 2.8. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> # gpg: Signature made Fri 16 Dec 2016 21:13:43 GMT # gpg: using RSA key 0x281F0DB8D28D5469 # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" # gpg: aka "Michael S. Tsirkin <mst@redhat.com>" # Primary key fingerprint: 0270 606B 6F3C DF3D 0B17 0970 C350 3912 AFBE 8E67 # Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA 8A0D 281F 0DB8 D28D 5469 * remotes/mst/tags/for_upstream: virtio: avoid using guest_notifier_mask in vhost-user mode pci: fix error message for express slots i386: amd_iommu: fix MMIO register count and access tests/vhost-user-bridge: use contrib/libvhost-user contrib: add libvhost-user tests/vhost-user-bridge: do not accept more than one connection tests/vhost-user-bridge: indicate peer disconnected tests/vhost-user-bridge: remove unnecessary dispatcher_remove tests/vhost-user-bridge: remove false comment Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
165 lines
5.3 KiB
Makefile
165 lines
5.3 KiB
Makefile
#######################################################################
|
|
# Common libraries for tools and emulators
|
|
stub-obj-y = stubs/ crypto/
|
|
util-obj-y = util/ qobject/ qapi/
|
|
util-obj-y += qmp-introspect.o qapi-types.o qapi-visit.o qapi-event.o
|
|
|
|
#######################################################################
|
|
# block-obj-y is code used by both qemu system emulation and qemu-img
|
|
|
|
block-obj-y = async.o thread-pool.o
|
|
block-obj-y += nbd/
|
|
block-obj-y += block.o blockjob.o
|
|
block-obj-y += main-loop.o iohandler.o qemu-timer.o
|
|
block-obj-$(CONFIG_POSIX) += aio-posix.o
|
|
block-obj-$(CONFIG_WIN32) += aio-win32.o
|
|
block-obj-y += block/
|
|
block-obj-y += qemu-io-cmds.o
|
|
block-obj-$(CONFIG_REPLICATION) += replication.o
|
|
|
|
block-obj-m = block/
|
|
|
|
#######################################################################
|
|
# crypto-obj-y is code used by both qemu system emulation and qemu-img
|
|
|
|
crypto-obj-y = crypto/
|
|
crypto-aes-obj-y = crypto/
|
|
|
|
#######################################################################
|
|
# qom-obj-y is code used by both qemu system emulation and qemu-img
|
|
|
|
qom-obj-y = qom/
|
|
|
|
#######################################################################
|
|
# io-obj-y is code used by both qemu system emulation and qemu-img
|
|
|
|
io-obj-y = io/
|
|
|
|
######################################################################
|
|
# 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 += iothread.o
|
|
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 += migration/
|
|
common-obj-y += qemu-char.o #aio.o
|
|
common-obj-y += page_cache.o
|
|
|
|
common-obj-$(CONFIG_SPICE) += spice-qemu-char.o
|
|
|
|
common-obj-y += audio/
|
|
common-obj-y += hw/
|
|
common-obj-y += accel.o
|
|
|
|
common-obj-y += replay/
|
|
|
|
common-obj-y += ui/
|
|
common-obj-y += bt-host.o bt-vhci.o
|
|
bt-host.o-cflags := $(BLUEZ_CFLAGS)
|
|
|
|
common-obj-y += dma-helpers.o
|
|
common-obj-y += vl.o
|
|
vl.o-cflags := $(GPROF_CFLAGS) $(SDL_CFLAGS)
|
|
common-obj-y += tpm.o
|
|
|
|
common-obj-$(CONFIG_SLIRP) += slirp/
|
|
|
|
common-obj-y += backends/
|
|
|
|
common-obj-$(CONFIG_SECCOMP) += qemu-seccomp.o
|
|
|
|
common-obj-$(CONFIG_FDT) += device_tree.o
|
|
|
|
######################################################################
|
|
# qapi
|
|
|
|
common-obj-y += qmp-marshal.o
|
|
common-obj-y += qmp-introspect.o
|
|
common-obj-y += qmp.o hmp.o
|
|
endif
|
|
|
|
#######################################################################
|
|
# 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/
|
|
target-obj-y += trace/
|
|
|
|
######################################################################
|
|
# guest agent
|
|
|
|
# FIXME: a few definitions from qapi-types.o/qapi-visit.o are needed
|
|
# by libqemuutil.a. These should be moved to a separate .json schema.
|
|
qga-obj-y = qga/
|
|
qga-vss-dll-obj-y = qga/
|
|
|
|
######################################################################
|
|
# contrib
|
|
ivshmem-client-obj-y = contrib/ivshmem-client/
|
|
ivshmem-server-obj-y = contrib/ivshmem-server/
|
|
libvhost-user-obj-y = contrib/libvhost-user/
|
|
|
|
######################################################################
|
|
trace-events-y = trace-events
|
|
trace-events-y += util/trace-events
|
|
trace-events-y += crypto/trace-events
|
|
trace-events-y += io/trace-events
|
|
trace-events-y += migration/trace-events
|
|
trace-events-y += block/trace-events
|
|
trace-events-y += hw/block/trace-events
|
|
trace-events-y += hw/char/trace-events
|
|
trace-events-y += hw/intc/trace-events
|
|
trace-events-y += hw/net/trace-events
|
|
trace-events-y += hw/virtio/trace-events
|
|
trace-events-y += hw/audio/trace-events
|
|
trace-events-y += hw/misc/trace-events
|
|
trace-events-y += hw/usb/trace-events
|
|
trace-events-y += hw/scsi/trace-events
|
|
trace-events-y += hw/nvram/trace-events
|
|
trace-events-y += hw/display/trace-events
|
|
trace-events-y += hw/input/trace-events
|
|
trace-events-y += hw/timer/trace-events
|
|
trace-events-y += hw/dma/trace-events
|
|
trace-events-y += hw/sparc/trace-events
|
|
trace-events-y += hw/sd/trace-events
|
|
trace-events-y += hw/isa/trace-events
|
|
trace-events-y += hw/mem/trace-events
|
|
trace-events-y += hw/i386/trace-events
|
|
trace-events-y += hw/9pfs/trace-events
|
|
trace-events-y += hw/ppc/trace-events
|
|
trace-events-y += hw/pci/trace-events
|
|
trace-events-y += hw/s390x/trace-events
|
|
trace-events-y += hw/vfio/trace-events
|
|
trace-events-y += hw/acpi/trace-events
|
|
trace-events-y += hw/arm/trace-events
|
|
trace-events-y += hw/alpha/trace-events
|
|
trace-events-y += ui/trace-events
|
|
trace-events-y += audio/trace-events
|
|
trace-events-y += net/trace-events
|
|
trace-events-y += target/arm/trace-events
|
|
trace-events-y += target/i386/trace-events
|
|
trace-events-y += target/sparc/trace-events
|
|
trace-events-y += target/s390x/trace-events
|
|
trace-events-y += target/ppc/trace-events
|
|
trace-events-y += qom/trace-events
|
|
trace-events-y += linux-user/trace-events
|
|
trace-events-y += qapi/trace-events
|