[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 41/87] stubs: replace stubs with lnot if applicable
From: |
Paolo Bonzini |
Subject: |
[PULL 41/87] stubs: replace stubs with lnot if applicable |
Date: |
Wed, 18 Dec 2019 13:02:07 +0100 |
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 <address@hidden>
---
Makefile.objs | 2 +-
crypto/Makefile.objs | 3 +--
util/Makefile.objs | 3 +--
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/Makefile.objs b/Makefile.objs
index 6807c8b..02bf5ce 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -1,6 +1,6 @@
#######################################################################
# Common libraries for tools and emulators
-stub-obj-y = stubs/ util/ crypto/
+stub-obj-y = stubs/
util-obj-y = crypto/ util/ qobject/ qapi/
chardev-obj-y = chardev/
diff --git a/crypto/Makefile.objs b/crypto/Makefile.objs
index 58014d1..c2a371b 100644
--- a/crypto/Makefile.objs
+++ b/crypto/Makefile.objs
@@ -22,6 +22,7 @@ crypto-obj-y += secret.o
crypto-obj-y += pbkdf.o
crypto-obj-$(CONFIG_NETTLE) += pbkdf-nettle.o
crypto-obj-$(if $(CONFIG_NETTLE),n,$(CONFIG_GCRYPT)) += pbkdf-gcrypt.o
+crypto-obj-$(if $(CONFIG_NETTLE),n,$(if $(CONFIG_GCRYPT),n,y)) += pbkdf-stub.o
crypto-obj-y += ivgen.o
crypto-obj-y += ivgen-essiv.o
crypto-obj-y += ivgen-plain.o
@@ -32,8 +33,6 @@ crypto-obj-y += block.o
crypto-obj-y += block-qcow.o
crypto-obj-y += block-luks.o
-stub-obj-y += pbkdf-stub.o
-
util-obj-$(CONFIG_GCRYPT) += random-gcrypt.o
util-obj-$(if $(CONFIG_GCRYPT),n,$(CONFIG_GNUTLS)) += random-gnutls.o
util-obj-$(if $(CONFIG_GCRYPT),n,$(if $(CONFIG_GNUTLS),n,y)) +=
random-platform.o
diff --git a/util/Makefile.objs b/util/Makefile.objs
index df124af..63599d6 100644
--- a/util/Makefile.objs
+++ b/util/Makefile.objs
@@ -52,8 +52,7 @@ util-obj-y += stats64.o
util-obj-y += systemd.o
util-obj-y += iova-tree.o
util-obj-$(CONFIG_INOTIFY1) += filemonitor-inotify.o
+util-obj-$(call lnot,$(CONFIG_INOTIFY1)) += filemonitor-stub.o
util-obj-$(CONFIG_LINUX) += vfio-helpers.o
util-obj-$(CONFIG_POSIX) += drm.o
util-obj-y += guest-random.o
-
-stub-obj-y += filemonitor-stub.o
--
1.8.3.1
- [PULL 33/87] build-sys: do not include Windows SLIRP dependencies in $LIBS, (continued)
- [PULL 33/87] build-sys: do not include Windows SLIRP dependencies in $LIBS, Paolo Bonzini, 2019/12/18
- [PULL 34/87] migration: fix maybe-uninitialized warning, Paolo Bonzini, 2019/12/18
- [PULL 21/87] qom: introduce object_register_sugar_prop, Paolo Bonzini, 2019/12/18
- [PULL 20/87] vl: warn for unavailable accelerators, clarify messages, Paolo Bonzini, 2019/12/18
- [PULL 24/87] tcg: convert "-accel threads" to a QOM property, Paolo Bonzini, 2019/12/18
- [PULL 30/87] Makefile: remove unused variables, Paolo Bonzini, 2019/12/18
- [PULL 27/87] kvm: convert "-machine kvm_shadow_mem" to an accelerator property, Paolo Bonzini, 2019/12/18
- [PULL 35/87] monitor: fix maybe-uninitialized, Paolo Bonzini, 2019/12/18
- [PULL 36/87] vhost-user-scsi: fix printf format warning, Paolo Bonzini, 2019/12/18
- [PULL 38/87] tests: skip block layer tests if !CONFIG_TOOLS, Paolo Bonzini, 2019/12/18
- [PULL 41/87] stubs: replace stubs with lnot if applicable,
Paolo Bonzini <=
- [PULL 43/87] configure: simplify vhost condition with Kconfig, Paolo Bonzini, 2019/12/18
- [PULL 37/87] os-posix: simplify os_find_datadir, Paolo Bonzini, 2019/12/18
- [PULL 39/87] libvixl: remove per-target compiler flags, Paolo Bonzini, 2019/12/18
- [PULL 29/87] kvm: convert "-machine kernel_irqchip" to an accelerator property, Paolo Bonzini, 2019/12/18
- [PULL 40/87] crypto: move common bits for all emulators to libqemuutil, Paolo Bonzini, 2019/12/18
- [PULL 44/87] i386: conditionally compile more files, Paolo Bonzini, 2019/12/18
- [PULL 42/87] configure: set $PYTHON to a full path, Paolo Bonzini, 2019/12/18
- [PULL 45/87] fw_cfg: allow building without other devices, Paolo Bonzini, 2019/12/18
- [PULL 47/87] pci-stub: add more MSI functions, Paolo Bonzini, 2019/12/18
- [PULL 48/87] x86: move SMM property to X86MachineState, Paolo Bonzini, 2019/12/18