From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PULL 14/59] Makefile: Restrict system emulation and tools objects
Date: Thu, 23 Jan 2020 14:50:04 +0100 [thread overview]
Message-ID: <1579787449-27599-15-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1579787449-27599-1-git-send-email-pbonzini@redhat.com>
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Restrict all the system emulation and tools objects with a
Makefile IF (CONFIG_SOFTMMU OR CONFIG_TOOLS) check.
Using the same description over and over is not very helpful.
Use it once, just before the if() block.
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20200118140619.26333-4-philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile.objs | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/Makefile.objs b/Makefile.objs
index 5aae561..395dd1e 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -4,15 +4,14 @@ stub-obj-y = stubs/
util-obj-y = crypto/ util/ qobject/ qapi/
qom-obj-y = qom/
-chardev-obj-y = chardev/
-
#######################################################################
-# authz-obj-y is code used by both qemu system emulation and qemu-img
+# code used by both qemu system emulation and qemu-img
-authz-obj-y = authz/
+ifeq ($(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS)),y)
-#######################################################################
-# block-obj-y is code used by both qemu system emulation and qemu-img
+chardev-obj-y = chardev/
+
+authz-obj-y = authz/
block-obj-y = nbd/
block-obj-y += block.o blockjob.o job.o
@@ -22,16 +21,12 @@ 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/
-#######################################################################
-# io-obj-y is code used by both qemu system emulation and qemu-img
-
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
--
1.8.3.1
next prev parent reply other threads:[~2020-01-23 17:03 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-23 13:49 [PULL v2 00/59] Misc (x86 and QOM) patches for 2020-01-23 Paolo Bonzini
2020-01-23 13:49 ` [PULL 01/59] cpu: Introduce cpu_class_set_parent_reset() Paolo Bonzini
2020-01-23 13:49 ` [PULL 02/59] cpu: Use cpu_class_set_parent_reset() Paolo Bonzini
2020-01-23 13:49 ` [PULL 03/59] pvpanic: introduce crashloaded for pvpanic Paolo Bonzini
2020-01-23 13:49 ` [PULL 04/59] pvpanic: implement crashloaded event handling Paolo Bonzini
2020-01-23 13:49 ` [PULL 05/59] qom/object: Display more helpful message when an interface is missing Paolo Bonzini
2020-01-23 13:49 ` [PULL 06/59] audio/audio: Add missing fall through comment Paolo Bonzini
2020-01-23 13:49 ` [PULL 07/59] hw/display/tcx: Add missing fall through comments Paolo Bonzini
2020-01-23 13:49 ` [PULL 08/59] hw/timer/aspeed_timer: Add a fall through comment Paolo Bonzini
2020-01-23 13:49 ` [PULL 09/59] hw/net/imx_fec: Rewrite fall through comments Paolo Bonzini
2020-01-23 13:50 ` [PULL 10/59] hw/net/imx_fec: Remove unuseful FALLTHROUGH comments Paolo Bonzini
2020-01-23 13:50 ` [PULL 11/59] hw/pci-host/designware: Remove unuseful FALLTHROUGH comment Paolo Bonzini
2020-01-23 13:50 ` [PULL 12/59] configure: Do not build libfdt if not required Paolo Bonzini
2020-01-23 13:50 ` [PULL 13/59] Makefile: Clarify all the codebase requires qom/ objects Paolo Bonzini
2020-01-23 13:50 ` Paolo Bonzini [this message]
2020-01-23 13:50 ` [PULL 15/59] Makefile: Remove unhelpful comment Paolo Bonzini
2020-01-23 13:50 ` [PULL 16/59] hw/core: Restrict reset handlers API to system-mode Paolo Bonzini
2020-01-23 13:50 ` [PULL 17/59] hw/core/Makefile: Group generic objects versus system-mode objects Paolo Bonzini
2020-01-23 13:50 ` [PULL 18/59] target/i386: kvm: initialize feature MSRs very early Paolo Bonzini
2020-01-23 13:50 ` [PULL 19/59] target/i386: add a ucode-rev property Paolo Bonzini
2020-01-23 13:50 ` [PULL 20/59] target/i386: kvm: initialize microcode revision from KVM Paolo Bonzini
2020-02-06 23:24 ` Alex Williamson
2020-02-06 23:40 ` Paolo Bonzini
2020-02-07 15:51 ` Alex Williamson
2020-02-10 22:05 ` Alex Williamson
2020-01-23 13:50 ` [PULL 21/59] virtio-scsi: delete vqs in unrealize to avoid memleaks Paolo Bonzini
2020-01-23 13:50 ` [PULL 22/59] virtio-scsi: convert to new virtio_delete_queue Paolo Bonzini
2020-01-23 13:50 ` [PULL 23/59] hw/ppc/spapr_rtas: Use local MachineState variable Paolo Bonzini
2020-01-23 13:50 ` [PULL 24/59] hw/ppc/spapr_rtas: Access MachineState via SpaprMachineState argument Paolo Bonzini
2020-01-23 13:50 ` [PULL 25/59] hw/ppc/spapr_rtas: Remove local variable Paolo Bonzini
2020-01-23 13:50 ` [PULL 26/59] target/arm/kvm: Use CPUState::kvm_state in kvm_arm_pmu_supported() Paolo Bonzini
2020-01-23 13:50 ` [PULL 27/59] qom/object: Display more helpful message when a parent is missing Paolo Bonzini
2020-01-23 13:50 ` [PULL 28/59] accel: Introduce the current_accel() wrapper Paolo Bonzini
2020-01-23 13:50 ` [PULL 29/59] accel: Replace current_machine->accelerator by " Paolo Bonzini
2020-01-23 13:50 ` [PULL 30/59] accel/tcg: Sanitize include path Paolo Bonzini
2020-01-23 13:50 ` [PULL 31/59] object: add extra sanity checks Paolo Bonzini
2020-01-23 13:50 ` [PULL 32/59] qdev: remove duplicated qdev_property_add_static() doc Paolo Bonzini
2020-01-23 13:50 ` [PULL 33/59] qdev: remove extraneous error Paolo Bonzini
2020-01-23 13:50 ` [PULL 34/59] qdev: move helper function to monitor/misc Paolo Bonzini
2020-01-23 13:50 ` [PULL 35/59] object: avoid extra class property key duplication Paolo Bonzini
2020-01-23 13:50 ` [PULL 36/59] object: add class property initializer Paolo Bonzini
2020-01-23 13:50 ` [PULL 37/59] object: make object_class_property_add* return property Paolo Bonzini
2020-01-23 13:50 ` [PULL 38/59] qstring: add qstring_free() Paolo Bonzini
2020-01-23 13:50 ` [PULL 39/59] object: add object_property_set_default Paolo Bonzini
2020-01-23 13:50 ` [PULL 40/59] object: do not free class properties Paolo Bonzini
2020-01-23 13:50 ` [PULL 41/59] object: check strong flag with & Paolo Bonzini
2020-01-23 13:50 ` [PULL 42/59] object: rename link "child" to "target" Paolo Bonzini
2020-01-23 13:50 ` [PULL 43/59] object: add direct link flag Paolo Bonzini
2020-01-23 13:50 ` [PULL 44/59] object: express const link with link property Paolo Bonzini
2020-01-23 13:50 ` [PULL 45/59] object: add object_class_property_add_link() Paolo Bonzini
2020-01-23 13:50 ` [PULL 46/59] object: release all props Paolo Bonzini
2020-01-23 13:50 ` [PULL 47/59] object: return self in object_ref() Paolo Bonzini
2020-01-23 13:50 ` [PULL 48/59] qdev: set properties with device_class_set_props() Paolo Bonzini
2020-01-23 13:50 ` [PULL 49/59] qdev: rename DeviceClass.props Paolo Bonzini
2020-01-23 13:50 ` [PULL 50/59] qdev: move instance properties to class properties Paolo Bonzini
2020-01-23 13:50 ` [PULL 51/59] qdev: register properties as " Paolo Bonzini
2020-01-23 13:50 ` [PULL 52/59] vl: print default value in object help Paolo Bonzini
2020-01-23 13:50 ` [PULL 53/59] qom: simplify qmp_device_list_properties() Paolo Bonzini
2020-01-23 13:50 ` [PULL 54/59] qom: introduce object_property_help() Paolo Bonzini
2020-01-23 13:50 ` [PULL 55/59] qapi/qmp: add ObjectPropertyInfo.default-value Paolo Bonzini
2020-01-23 13:50 ` [PULL 56/59] qdev: use object_property_help() Paolo Bonzini
2020-01-23 13:50 ` [PULL 57/59] target/i386: Add the 'model-id' for Skylake -v3 CPU models Paolo Bonzini
2020-01-23 13:50 ` [PULL 58/59] build-sys: clean up flags included in the linker command line Paolo Bonzini
2020-01-23 13:50 ` [PULL 59/59] tests: fix test-qga on macosx Paolo Bonzini
2020-01-23 18:43 ` [PULL v2 00/59] Misc (x86 and QOM) patches for 2020-01-23 Peter Maydell
2020-01-23 19:20 ` Paolo Bonzini
2020-01-23 23:31 ` Richard Henderson
2020-01-24 14:38 ` Paolo Bonzini
-- strict thread matches above, loose matches on Subject: below --
2020-01-23 13:48 [PULL 00/59] Misc " Paolo Bonzini
2020-01-23 13:48 ` [PULL 14/59] Makefile: Restrict system emulation and tools objects Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1579787449-27599-15-git-send-email-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).