From: "Philippe Mathieu-Daudé" <philmd@redhat.com> To: qemu-devel@nongnu.org Cc: "Alistair Francis" <Alistair.Francis@wdc.com>, qemu-riscv@nongnu.org, "Eduardo Habkost" <ehabkost@redhat.com>, "Sagar Karandikar" <sagark@eecs.berkeley.edu>, "David Hildenbrand" <david@redhat.com>, "Bastian Koppelmann" <kbastian@mail.uni-paderborn.de>, "Cornelia Huck" <cohuck@redhat.com>, "Richard Henderson" <richard.henderson@linaro.org>, qemu-s390x@nongnu.org, "Palmer Dabbelt" <palmer@dabbelt.com>, "Paolo Bonzini" <pbonzini@redhat.com>, "Philippe Mathieu-Daudé" <philmd@redhat.com>, "Richard Henderson" <rth@twiddle.net> Subject: [PATCH v3 05/12] util/Makefile: Reduce the user-mode object list Date: Mon, 4 May 2020 17:29:15 +0200 [thread overview] Message-ID: <20200504152922.21365-6-philmd@redhat.com> (raw) In-Reply-To: <20200504152922.21365-1-philmd@redhat.com> These objects are not required when configured with --disable-system. Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- util/Makefile.objs | 59 +++++++++++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 21 deletions(-) diff --git a/util/Makefile.objs b/util/Makefile.objs index fe339c2636..cc5e37177a 100644 --- a/util/Makefile.objs +++ b/util/Makefile.objs @@ -1,8 +1,4 @@ util-obj-y = osdep.o cutils.o unicode.o qemu-timer-common.o -util-obj-y += bufferiszero.o -util-obj-y += lockcnt.o -util-obj-y += aiocb.o async.o aio-wait.o thread-pool.o qemu-timer.o -util-obj-y += main-loop.o util-obj-$(call lnot,$(CONFIG_ATOMIC64)) += atomic64.o util-obj-$(CONFIG_POSIX) += aio-posix.o util-obj-$(CONFIG_POSIX) += fdmon-poll.o @@ -21,31 +17,20 @@ util-obj-$(CONFIG_WIN32) += oslib-win32.o util-obj-$(CONFIG_WIN32) += qemu-thread-win32.o util-obj-y += envlist.o path.o module.o util-obj-y += host-utils.o -util-obj-y += bitmap.o bitops.o hbitmap.o +util-obj-y += bitmap.o bitops.o util-obj-y += fifo8.o -util-obj-y += nvdimm-utils.o util-obj-y += cacheinfo.o util-obj-y += error.o qemu-error.o util-obj-y += qemu-print.o util-obj-y += id.o -util-obj-y += iov.o qemu-config.o qemu-sockets.o uri.o notify.o +util-obj-y += qemu-config.o notify.o util-obj-y += qemu-option.o qemu-progress.o util-obj-y += keyval.o -util-obj-y += hexdump.o util-obj-y += crc32c.o util-obj-y += uuid.o -util-obj-y += throttle.o util-obj-y += getauxval.o -util-obj-y += readline.o util-obj-y += rcu.o util-obj-$(CONFIG_MEMBARRIER) += sys_membarrier.o -util-obj-y += qemu-coroutine.o qemu-coroutine-lock.o qemu-coroutine-io.o -util-obj-y += qemu-coroutine-sleep.o -util-obj-y += qemu-co-shared-resource.o -util-obj-y += coroutine-$(CONFIG_COROUTINE_BACKEND).o -util-obj-y += buffer.o -util-obj-y += timed-average.o -util-obj-y += base64.o util-obj-y += log.o util-obj-y += pagesize.o util-obj-y += qdist.o @@ -54,13 +39,45 @@ util-obj-y += qsp.o util-obj-y += range.o 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 util-obj-$(CONFIG_GIO) += dbus.o dbus.o-cflags = $(GIO_CFLAGS) dbus.o-libs = $(GIO_LIBS) util-obj-$(CONFIG_USER_ONLY) += selfmap.o + +####################################################################### +# code used by both qemu system emulation and qemu-img + +ifeq ($(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS)),y) + +util-obj-y += aio-wait.o +util-obj-y += aiocb.o +util-obj-y += async.o +util-obj-y += base64.o +util-obj-y += buffer.o +util-obj-y += bufferiszero.o +util-obj-y += coroutine-$(CONFIG_COROUTINE_BACKEND).o +util-obj-y += hexdump.o +util-obj-y += lockcnt.o +util-obj-y += iov.o +util-obj-y += iova-tree.o +util-obj-y += hbitmap.o +util-obj-y += main-loop.o +util-obj-y += nvdimm-utils.o +util-obj-y += qemu-coroutine.o qemu-coroutine-lock.o qemu-coroutine-io.o +util-obj-y += qemu-coroutine-sleep.o +util-obj-y += qemu-co-shared-resource.o +util-obj-y += qemu-sockets.o +util-obj-y += qemu-timer.o +util-obj-y += thread-pool.o +util-obj-y += throttle.o +util-obj-y += timed-average.o +util-obj-y += uri.o + +util-obj-$(CONFIG_LINUX) += vfio-helpers.o +util-obj-$(CONFIG_INOTIFY1) += filemonitor-inotify.o +util-obj-$(call lnot,$(CONFIG_INOTIFY1)) += filemonitor-stub.o +util-obj-$(CONFIG_BLOCK) += readline.o + +endif # CONFIG_SOFTMMU || CONFIG_TOOLS -- 2.21.3
WARNING: multiple messages have this Message-ID (diff)
From: "Philippe Mathieu-Daudé" <philmd@redhat.com> To: qemu-devel@nongnu.org Cc: "Palmer Dabbelt" <palmer@dabbelt.com>, "Cornelia Huck" <cohuck@redhat.com>, "Bastian Koppelmann" <kbastian@mail.uni-paderborn.de>, qemu-riscv@nongnu.org, qemu-s390x@nongnu.org, "Richard Henderson" <rth@twiddle.net>, "Paolo Bonzini" <pbonzini@redhat.com>, "Alistair Francis" <Alistair.Francis@wdc.com>, "Sagar Karandikar" <sagark@eecs.berkeley.edu>, "Eduardo Habkost" <ehabkost@redhat.com>, "Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>, "David Hildenbrand" <david@redhat.com>, "Philippe Mathieu-Daudé" <philmd@redhat.com>, "Richard Henderson" <richard.henderson@linaro.org> Subject: [PATCH v3 05/12] util/Makefile: Reduce the user-mode object list Date: Mon, 4 May 2020 17:29:15 +0200 [thread overview] Message-ID: <20200504152922.21365-6-philmd@redhat.com> (raw) In-Reply-To: <20200504152922.21365-1-philmd@redhat.com> These objects are not required when configured with --disable-system. Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- util/Makefile.objs | 59 +++++++++++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 21 deletions(-) diff --git a/util/Makefile.objs b/util/Makefile.objs index fe339c2636..cc5e37177a 100644 --- a/util/Makefile.objs +++ b/util/Makefile.objs @@ -1,8 +1,4 @@ util-obj-y = osdep.o cutils.o unicode.o qemu-timer-common.o -util-obj-y += bufferiszero.o -util-obj-y += lockcnt.o -util-obj-y += aiocb.o async.o aio-wait.o thread-pool.o qemu-timer.o -util-obj-y += main-loop.o util-obj-$(call lnot,$(CONFIG_ATOMIC64)) += atomic64.o util-obj-$(CONFIG_POSIX) += aio-posix.o util-obj-$(CONFIG_POSIX) += fdmon-poll.o @@ -21,31 +17,20 @@ util-obj-$(CONFIG_WIN32) += oslib-win32.o util-obj-$(CONFIG_WIN32) += qemu-thread-win32.o util-obj-y += envlist.o path.o module.o util-obj-y += host-utils.o -util-obj-y += bitmap.o bitops.o hbitmap.o +util-obj-y += bitmap.o bitops.o util-obj-y += fifo8.o -util-obj-y += nvdimm-utils.o util-obj-y += cacheinfo.o util-obj-y += error.o qemu-error.o util-obj-y += qemu-print.o util-obj-y += id.o -util-obj-y += iov.o qemu-config.o qemu-sockets.o uri.o notify.o +util-obj-y += qemu-config.o notify.o util-obj-y += qemu-option.o qemu-progress.o util-obj-y += keyval.o -util-obj-y += hexdump.o util-obj-y += crc32c.o util-obj-y += uuid.o -util-obj-y += throttle.o util-obj-y += getauxval.o -util-obj-y += readline.o util-obj-y += rcu.o util-obj-$(CONFIG_MEMBARRIER) += sys_membarrier.o -util-obj-y += qemu-coroutine.o qemu-coroutine-lock.o qemu-coroutine-io.o -util-obj-y += qemu-coroutine-sleep.o -util-obj-y += qemu-co-shared-resource.o -util-obj-y += coroutine-$(CONFIG_COROUTINE_BACKEND).o -util-obj-y += buffer.o -util-obj-y += timed-average.o -util-obj-y += base64.o util-obj-y += log.o util-obj-y += pagesize.o util-obj-y += qdist.o @@ -54,13 +39,45 @@ util-obj-y += qsp.o util-obj-y += range.o 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 util-obj-$(CONFIG_GIO) += dbus.o dbus.o-cflags = $(GIO_CFLAGS) dbus.o-libs = $(GIO_LIBS) util-obj-$(CONFIG_USER_ONLY) += selfmap.o + +####################################################################### +# code used by both qemu system emulation and qemu-img + +ifeq ($(call lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS)),y) + +util-obj-y += aio-wait.o +util-obj-y += aiocb.o +util-obj-y += async.o +util-obj-y += base64.o +util-obj-y += buffer.o +util-obj-y += bufferiszero.o +util-obj-y += coroutine-$(CONFIG_COROUTINE_BACKEND).o +util-obj-y += hexdump.o +util-obj-y += lockcnt.o +util-obj-y += iov.o +util-obj-y += iova-tree.o +util-obj-y += hbitmap.o +util-obj-y += main-loop.o +util-obj-y += nvdimm-utils.o +util-obj-y += qemu-coroutine.o qemu-coroutine-lock.o qemu-coroutine-io.o +util-obj-y += qemu-coroutine-sleep.o +util-obj-y += qemu-co-shared-resource.o +util-obj-y += qemu-sockets.o +util-obj-y += qemu-timer.o +util-obj-y += thread-pool.o +util-obj-y += throttle.o +util-obj-y += timed-average.o +util-obj-y += uri.o + +util-obj-$(CONFIG_LINUX) += vfio-helpers.o +util-obj-$(CONFIG_INOTIFY1) += filemonitor-inotify.o +util-obj-$(call lnot,$(CONFIG_INOTIFY1)) += filemonitor-stub.o +util-obj-$(CONFIG_BLOCK) += readline.o + +endif # CONFIG_SOFTMMU || CONFIG_TOOLS -- 2.21.3
next prev parent reply other threads:[~2020-05-04 15:38 UTC|newest] Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-05-04 15:29 [PATCH v3 00/12] user-mode: Prune build dependencies (part 1) Philippe Mathieu-Daudé 2020-05-04 15:29 ` Philippe Mathieu-Daudé 2020-05-04 15:29 ` [PATCH v3 01/12] Makefile: Only build virtiofsd if system-mode is enabled Philippe Mathieu-Daudé 2020-05-04 15:29 ` Philippe Mathieu-Daudé 2020-05-18 12:14 ` Dr. David Alan Gilbert 2020-05-18 12:14 ` Dr. David Alan Gilbert 2020-05-04 15:29 ` [PATCH v3 02/12] configure: Avoid building TCG when not needed Philippe Mathieu-Daudé 2020-05-04 15:29 ` Philippe Mathieu-Daudé 2020-05-04 15:40 ` Alistair Francis 2020-05-04 15:40 ` Alistair Francis 2020-05-04 15:29 ` [PATCH v3 03/12] tests/Makefile: Only display TCG-related tests when TCG is available Philippe Mathieu-Daudé 2020-05-04 15:29 ` Philippe Mathieu-Daudé 2020-05-04 15:29 ` [PATCH v3 04/12] tests/Makefile: Restrict some softmmu-only tests Philippe Mathieu-Daudé 2020-05-04 15:29 ` Philippe Mathieu-Daudé 2020-05-04 15:29 ` Philippe Mathieu-Daudé [this message] 2020-05-04 15:29 ` [PATCH v3 05/12] util/Makefile: Reduce the user-mode object list Philippe Mathieu-Daudé 2020-05-04 15:29 ` [PATCH v3 06/12] stubs/Makefile: " Philippe Mathieu-Daudé 2020-05-04 15:29 ` Philippe Mathieu-Daudé 2020-05-04 15:29 ` [PATCH v3 07/12] target/riscv/cpu: Restrict CPU migration to system-mode Philippe Mathieu-Daudé 2020-05-04 15:29 ` Philippe Mathieu-Daudé 2020-05-04 15:29 ` [PATCH v3 08/12] exec: Assert CPU migration is not used on user-only build Philippe Mathieu-Daudé 2020-05-04 15:29 ` Philippe Mathieu-Daudé 2020-05-04 15:41 ` Alistair Francis 2020-05-04 15:41 ` Alistair Francis 2020-05-04 15:29 ` [PATCH v3 09/12] arch_init: Remove unused 'qapi-commands-misc.h' include Philippe Mathieu-Daudé 2020-05-04 15:29 ` Philippe Mathieu-Daudé 2020-05-04 15:29 ` [PATCH v3 10/12] target/i386: Restrict CpuClass::get_crash_info() to system-mode Philippe Mathieu-Daudé 2020-05-04 15:29 ` Philippe Mathieu-Daudé 2020-05-04 15:29 ` [PATCH v3 11/12] target/s390x: " Philippe Mathieu-Daudé 2020-05-04 15:29 ` Philippe Mathieu-Daudé 2020-05-05 12:05 ` Cornelia Huck 2020-05-05 12:05 ` Cornelia Huck 2020-05-04 15:29 ` [PATCH v3 12/12] hw/core: " Philippe Mathieu-Daudé 2020-05-04 15:29 ` Philippe Mathieu-Daudé 2020-05-05 8:32 ` [PATCH v3 00/12] user-mode: Prune build dependencies (part 1) no-reply 2020-05-05 8:32 ` no-reply 2020-05-05 8:33 ` Laurent Vivier 2020-05-05 8:33 ` Laurent Vivier 2020-05-08 16:24 ` Philippe Mathieu-Daudé 2020-05-08 16:24 ` Philippe Mathieu-Daudé
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=20200504152922.21365-6-philmd@redhat.com \ --to=philmd@redhat.com \ --cc=Alistair.Francis@wdc.com \ --cc=cohuck@redhat.com \ --cc=david@redhat.com \ --cc=ehabkost@redhat.com \ --cc=kbastian@mail.uni-paderborn.de \ --cc=palmer@dabbelt.com \ --cc=pbonzini@redhat.com \ --cc=qemu-devel@nongnu.org \ --cc=qemu-riscv@nongnu.org \ --cc=qemu-s390x@nongnu.org \ --cc=richard.henderson@linaro.org \ --cc=rth@twiddle.net \ --cc=sagark@eecs.berkeley.edu \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.