qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio

stubs: replace stubs with lnot if applicable

The stubs mechanism relies on static libraries and compilation order,
which is a bit brittle and should be avoided unless necessary.
Replace it with Boolean operations on CONFIG_* symbols.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

+3 -5
+1 -1
Makefile.objs
··· 1 1 ####################################################################### 2 2 # Common libraries for tools and emulators 3 - stub-obj-y = stubs/ util/ crypto/ 3 + stub-obj-y = stubs/ 4 4 util-obj-y = crypto/ util/ qobject/ qapi/ 5 5 6 6 chardev-obj-y = chardev/
+1 -2
crypto/Makefile.objs
··· 22 22 crypto-obj-y += pbkdf.o 23 23 crypto-obj-$(CONFIG_NETTLE) += pbkdf-nettle.o 24 24 crypto-obj-$(if $(CONFIG_NETTLE),n,$(CONFIG_GCRYPT)) += pbkdf-gcrypt.o 25 + crypto-obj-$(if $(CONFIG_NETTLE),n,$(if $(CONFIG_GCRYPT),n,y)) += pbkdf-stub.o 25 26 crypto-obj-y += ivgen.o 26 27 crypto-obj-y += ivgen-essiv.o 27 28 crypto-obj-y += ivgen-plain.o ··· 31 32 crypto-obj-y += block.o 32 33 crypto-obj-y += block-qcow.o 33 34 crypto-obj-y += block-luks.o 34 - 35 - stub-obj-y += pbkdf-stub.o 36 35 37 36 util-obj-$(CONFIG_GCRYPT) += random-gcrypt.o 38 37 util-obj-$(if $(CONFIG_GCRYPT),n,$(CONFIG_GNUTLS)) += random-gnutls.o
+1 -2
util/Makefile.objs
··· 52 52 util-obj-y += systemd.o 53 53 util-obj-y += iova-tree.o 54 54 util-obj-$(CONFIG_INOTIFY1) += filemonitor-inotify.o 55 + util-obj-$(call lnot,$(CONFIG_INOTIFY1)) += filemonitor-stub.o 55 56 util-obj-$(CONFIG_LINUX) += vfio-helpers.o 56 57 util-obj-$(CONFIG_POSIX) += drm.o 57 58 util-obj-y += guest-random.o 58 - 59 - stub-obj-y += filemonitor-stub.o