3d7cad3c23
-----BEGIN PGP SIGNATURE----- iQJGBAABCAAwFiEEzS913cjjpNwuT1Fz8ww4vT8vvjwFAl8EU9YSHGxhdXJlbnRA dml2aWVyLmV1AAoJEPMMOL0/L748mUkP/1eArJv6I7L/DFng1vR2F+30CzBxragZ shQwbKjmsijsbaqjmolVVC7Jdhg6raEgkvXK9sc+cUvQl5DVBthD35EG71J1Wxi/ s3WsaU+GwSS15fdydUGjG9eB2s3JaKBIzEupVkWDWWPxDJiogjAbBnVCjqlet7Z6 eyMT4nJcJ4keEPAOxOprPxw36QNfTNRIh8EhVTXjPoHuBS/O7Diqi7if7DCiCltZ F69AwkpStzERNYUdM0+z2qdscQekFIj7lpwGDbuIlXNdM/Wkm7jxCkwoTL/vIAdQ IYbfu9s1riG6YnD75t8ZjooMnlt5EYBbhbumlCV2PSUzUSkBr+2ErNYhPePKRGTn IHNYJPdB5vBpHrYjqnL0yQZFIn/2vBNh3vi5Rs7451VZFLmwvWKpOoUgrPvVFOY/ 7THZvMzBzzeI5z1A+eI3cCcY/iS4vD+JXTQW80F+xgndFfHeH+qxeVNPkULsSv+a aEYOQgnzwIqFU252VyNObKWTFXY4TzVQ9vQgaeZbuubvDYdipF5nBztxXzbUN8kA OaAPJO6T8yZ2p3jTWSBOBEb96T8k1WzXv2nkAH73DVWov64CP/ao4xN5qgR06At7 W5WLQcb3ux8grWV/T4UckDJrem3Rdf21STo6d/5UjJqIrhaV0PsPGXcbSxZEPrZC 30IT5vbLb8yj =lUOA -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-5.1-pull-request' into staging trivial branch patches 20200707 # gpg: Signature made Tue 07 Jul 2020 11:52:06 BST # gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C # gpg: issuer "laurent@vivier.eu" # gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full] # gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full] # gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full] # Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C * remotes/vivier2/tags/trivial-branch-for-5.1-pull-request: net/tap-solaris.c: Include qemu-common.h for TFR macro intel_iommu: "aw-bits" error message still refers to "x-aw-bits" util/qemu-option: Document the get_opt_value() function MAINTAINERS: Update Radoslaw Biernacki email address .mailmap: Update Alexander Graf email address trivial: Respect alphabetical order of .o files in Makefile.objs fix the prototype of muls64/mulu64 Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
57 lines
1.6 KiB
Makefile
57 lines
1.6 KiB
Makefile
stub-obj-y += blk-commit-all.o
|
|
stub-obj-y += cmos.o
|
|
stub-obj-y += cpu-get-clock.o
|
|
stub-obj-y += cpu-get-icount.o
|
|
stub-obj-y += dump.o
|
|
stub-obj-y += error-printf.o
|
|
stub-obj-y += fdset.o
|
|
stub-obj-y += gdbstub.o
|
|
stub-obj-y += iothread-lock.o
|
|
stub-obj-y += is-daemonized.o
|
|
stub-obj-y += isa-bus.o
|
|
stub-obj-$(CONFIG_LINUX_AIO) += linux-aio.o
|
|
stub-obj-$(CONFIG_LINUX_IO_URING) += io_uring.o
|
|
stub-obj-y += monitor-core.o
|
|
stub-obj-y += notify-event.o
|
|
stub-obj-y += pci-bus.o
|
|
stub-obj-y += qmp_memory_device.o
|
|
stub-obj-y += qtest.o
|
|
stub-obj-y += ramfb.o
|
|
stub-obj-y += replay.o
|
|
stub-obj-y += runstate-check.o
|
|
stub-obj-$(CONFIG_SOFTMMU) += semihost.o
|
|
stub-obj-y += set-fd-handler.o
|
|
stub-obj-y += sysbus.o
|
|
stub-obj-y += tpm.o
|
|
stub-obj-y += trace-control.o
|
|
stub-obj-y += vmgenid.o
|
|
stub-obj-y += vmstate.o
|
|
stub-obj-$(CONFIG_SOFTMMU) += win32-kbd-hook.o
|
|
|
|
#######################################################################
|
|
# code used by both qemu system emulation and qemu-img
|
|
|
|
ifeq ($(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS)),y)
|
|
|
|
stub-obj-y += arch_type.o
|
|
stub-obj-y += bdrv-next-monitor-owned.o
|
|
stub-obj-y += blockdev-close-all-bdrv-states.o
|
|
stub-obj-y += change-state-handler.o
|
|
stub-obj-y += clock-warp.o
|
|
stub-obj-y += fd-register.o
|
|
stub-obj-y += fw_cfg.o
|
|
stub-obj-y += get-vm-name.o
|
|
stub-obj-y += iothread.o
|
|
stub-obj-y += machine-init-done.o
|
|
stub-obj-y += migr-blocker.o
|
|
stub-obj-y += monitor.o
|
|
stub-obj-y += pci-host-piix.o
|
|
stub-obj-y += ram-block.o
|
|
stub-obj-y += replay-user.o
|
|
stub-obj-y += target-get-monitor-def.o
|
|
stub-obj-y += target-monitor-defs.o
|
|
stub-obj-y += uuid.o
|
|
stub-obj-y += vm-stop.o
|
|
|
|
endif # CONFIG_SOFTMMU || CONFIG_TOOLS
|