From patchwork Sun Mar 15 23:57:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11439503 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5B7FE92A for ; Mon, 16 Mar 2020 00:14:47 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 314B2205ED for ; Mon, 16 Mar 2020 00:14:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="BMhBrk+2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 314B2205ED Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:60622 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDdP1-0000nm-3Y for patchwork-qemu-devel@patchwork.kernel.org; Sun, 15 Mar 2020 20:14:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43813) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDd8i-0003Ns-25 for qemu-devel@nongnu.org; Sun, 15 Mar 2020 19:57:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jDd8g-0000Ma-NJ for qemu-devel@nongnu.org; Sun, 15 Mar 2020 19:57:51 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:34484 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jDd8g-0000LB-Ju for qemu-devel@nongnu.org; Sun, 15 Mar 2020 19:57:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584316670; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=q2WbGUxRvcpHQ7gMdexAnGhsQEHFWTP/K6vD/RQgKno=; b=BMhBrk+2jX+sUTLSkb/EIzw8VHojFXrbXkm33xgd29nqbmpS3SsPQBrxjmNbBsj1XwR66E ulYIVGeR47endoits+2WYqQ3LeG9m9Iy8eYk+yY9mNhhK9KjVMwjyj6VVJ+YN400J5YKfu QqW3WYtXFfheBQ1lxLxS0AZ9LH/by68= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-272-bcfQ-LX-NwmXn3xohXuGAg-1; Sun, 15 Mar 2020 19:57:48 -0400 X-MC-Unique: bcfQ-LX-NwmXn3xohXuGAg-1 Received: by mail-wm1-f72.google.com with SMTP id f207so5013084wme.6 for ; Sun, 15 Mar 2020 16:57:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=w//Vgnp6ot9C/jYoheowrZSLqS+aLSpvExQpDN5q96c=; b=fAqRGnjzf+Kx6MpdLKLI9wOg3YzxV7RLVcYBAAvSabPNDOhYHlGg8EyAq77/Bjn5sC k8uZMFmbu3m4TGVDO7Y3V+wo93mDUMJZUGvdRQu3P24jsoCdHqjJrVLTQpS396DAoKVp 1Oj3syekTnhnb0htcxX62NsyKmbF/iyie8ryxgVcH9Zj1N9Y87AUOA4nWc2L/UR6mpW+ 0f8qWM5xtowRuVxoeZSbi7baDejdASjZbZ6rwkxXnOnvmYuVB7yfsDxvI/1ZrP//34Fl +w39B9QuPsQ5qebdjpyEU+0Hk+sLXQ1iH7nhsZEnxbUu2FU7UwCTObpdM+jC0dxEuqAZ 3NiQ== X-Gm-Message-State: ANhLgQ29LCsweQwmNQoViFWMWHQ4Ip0hPdyPoMMuJ0FKT2KCk+XQts2w Cp47Wt72rk9tgUN+RGE04RzN/RGrrfSGs0C7OOkZXFLvKnEP09GOxwOF+86N2OmlLTY8KDGEV4C 1PP7KhaLSHWW0pS4= X-Received: by 2002:adf:91c3:: with SMTP id 61mr18894554wri.384.1584316667104; Sun, 15 Mar 2020 16:57:47 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvozUgBYnYHdagK1VgGh48/vEWTckr80zH5kHcohGGDAgJWU35TijOqYgylyCPjp9jlDmji6g== X-Received: by 2002:adf:91c3:: with SMTP id 61mr18894524wri.384.1584316666855; Sun, 15 Mar 2020 16:57:46 -0700 (PDT) Received: from localhost.localdomain (191.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.191]) by smtp.gmail.com with ESMTPSA id p10sm26805399wru.4.2020.03.15.16.57.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Mar 2020 16:57:46 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 05/12] util/Makefile: Reduce the user-mode object list Date: Mon, 16 Mar 2020 00:57:09 +0100 Message-Id: <20200315235716.28448-6-philmd@redhat.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200315235716.28448-1-philmd@redhat.com> References: <20200315235716.28448-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , Cornelia Huck , Richard Henderson , Laurent Vivier , qemu-s390x@nongnu.org, Alistair Francis , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" These objects are not required when configured with --disable-system. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- util/Makefile.objs | 59 +++++++++++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 21 deletions(-) diff --git a/util/Makefile.objs b/util/Makefile.objs index 6718a38b61..24ae2e4dfa 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,12 +39,44 @@ 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) + +####################################################################### +# 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