From patchwork Thu Mar 14 04:55:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 160285 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp15073109jad; Wed, 13 Mar 2019 21:58:34 -0700 (PDT) X-Google-Smtp-Source: APXvYqyJzLOHFBWKLpPUmnjz3P12Apa2NHxKKpfEjD2Ry0QAdgDy/X0Bhxpf6N253B+O/h1bWKi9 X-Received: by 2002:a25:3746:: with SMTP id e67mr39719261yba.42.1552539514526; Wed, 13 Mar 2019 21:58:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552539514; cv=none; d=google.com; s=arc-20160816; b=0JYzVb/Cf9eFm9Xi7JXLjJXyLiyYc2dY3dh4kMMXkggfb0ed5KnWMySpOPZ2MiTaYL sY2YabJny7XFX6EbrNXNVj0u5R3GLPEt8Xec3jBLD2cTi/ELmzFpUNSkuGyRrkxZFgdz vckGSLp69hesafLS5JzcvEvQLhnzmD0feFurlveS8EaU5Djz9yllfgwlBF7H/+GVdzkA A9YNsK7+p81TGaNvvdMfUaMWhyqimV6mVwRAvN+vcg+Gw4Ly4uFZwD9VbYJabtxdDe6g eHYKtEKhpltQKb3ix385Vox6j9GAq3XW8bNdDJkuwvbjBbUsv/AeGRztxDNL5fr8J8CJ Um6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=tUK9oRvbFsnUe/XftR8H/1QGMXmsiHbTr53Gr78dYsM=; b=zFToQmO3bA/z51mtEwo610IVQaNGZeWPvYcefl/vM+XQ+u4j+c25cPoYl2nF3Oh9uw 95BaWY0T/30i05KpCTt3jrYRkHUS+m0WmHKOScaqw3XJAzy0qHU35USUk4A8jrFYyxur dGZ3kEnBM57V9DMfzMWuAmCRJz68B+QgCltnrutO1mj8N0QHzw3MJ/ytfNSyHcOG+BYj 75iacdwV7qppI+ihxiiKatKEvtk4Zr3H7WACPBBXgFpncYJqCepUptJypkeHiT5M5jqc 6jb2UCtjQYcyhPOpMXowjuckJlG3hZN5rLekEImYYEPeOPqLY2pRMBaALghijBbRoN4S EAug== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=CiLVoRHO; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id g11si7359320ybg.260.2019.03.13.21.58.34 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 13 Mar 2019 21:58:34 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=CiLVoRHO; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:56865 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4IRt-0006ke-Qt for patch@linaro.org; Thu, 14 Mar 2019 00:58:33 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56100) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4IOz-0004T8-SA for qemu-devel@nongnu.org; Thu, 14 Mar 2019 00:55:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h4IOy-0007LU-Gy for qemu-devel@nongnu.org; Thu, 14 Mar 2019 00:55:33 -0400 Received: from mail-pf1-x430.google.com ([2607:f8b0:4864:20::430]:32869) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h4IOy-0007Kz-59 for qemu-devel@nongnu.org; Thu, 14 Mar 2019 00:55:32 -0400 Received: by mail-pf1-x430.google.com with SMTP id i19so3023203pfd.0 for ; Wed, 13 Mar 2019 21:55:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tUK9oRvbFsnUe/XftR8H/1QGMXmsiHbTr53Gr78dYsM=; b=CiLVoRHOPwRZTMKjEt2LPqU3kpul2VCoQJ5J1bfYWdkY2q2r2gvUNe7BoHOC2sRukT ohtCoiFUtb3FMXDFxK8C3o6w513aMc7kQRnTnVACNOw/kTKipyFT7gIRnmhfHuwwZ6Zq lw++yqUwtvXWdbSNwJcKoCgqDD7auqIep6CkDgtuaeD12Lpqh8FcZegYBiipasLnxrZK ktDiyDiGUVmmWCw/+3LI6Um/pvMTkhzunezR6Rbs9xmIrpv5347MQ0DA6daBu64+P6UE 3QuH1zJxJ0XqoqFTS7QIqXNAQ9CTNqueWjWInDehVvyRn2LBhmR6njQmUuQjzge7esqH ykeQ== 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=tUK9oRvbFsnUe/XftR8H/1QGMXmsiHbTr53Gr78dYsM=; b=cT0CfP/rT6C56Ksen6cFBD5xj70ZtFzU1qdc8wmZnEAJ8Ux5KeSKTdk6s2QMogneTj T8AV2md7GihIjcLaIOWNnEPkxifHhAcAj7aQSB/flW3A31TgNa9yPpeUFf1nldeeNzw7 SlHpTX2w1Up8XO+XR0acJwtazfvB0x6nvwZvmIs3yM8UJ2D8h3H5kdZ4pU8pNks0hYPv rwe80CK23B7LDtw4MtkVBq72v2ws9Lvq+vSsd4iPTJE5j47464FI38IzKf/iU7AG8Dd5 5vgyuOyXRHBVVOYTyvFF3Sip2Vmyv3YXJyfZGB46XNKDDg68vvDo6ki1sdTFIb6Imh6I JhrQ== X-Gm-Message-State: APjAAAX79yDw7bsLmI+SqChrfowoVDnDddgevLTdLI64n9CByM6XO3he 9HW0rHmyiY14FlUf0D0/5I4wRzzmFSw= X-Received: by 2002:a17:902:b687:: with SMTP id c7mr2139563pls.270.1552539330604; Wed, 13 Mar 2019 21:55:30 -0700 (PDT) Received: from localhost.localdomain (97-113-188-82.tukw.qwest.net. [97.113.188.82]) by smtp.gmail.com with ESMTPSA id d9sm16185027pgq.6.2019.03.13.21.55.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Mar 2019 21:55:29 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 13 Mar 2019 21:55:13 -0700 Message-Id: <20190314045526.13342-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190314045526.13342-1-richard.henderson@linaro.org> References: <20190314045526.13342-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::430 Subject: [Qemu-devel] [PATCH v2 01/14] crypto: Merge crypto-obj-y into libqemuutil.a X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We will shortly need this in the user-only binaries, so drop the split into system and tools binaries. This also means that crypto-aes-obj-y can be merged back into crypto-obj-y. Cc: Daniel P. Berrangé Signed-off-by: Richard Henderson --- Makefile | 12 +++++------- Makefile.objs | 8 ++------ Makefile.target | 4 ---- configure | 9 +++------ crypto/Makefile.objs | 5 +---- 5 files changed, 11 insertions(+), 27 deletions(-) -- 2.17.1 diff --git a/Makefile b/Makefile index abd78a9826..a85f33f47e 100644 --- a/Makefile +++ b/Makefile @@ -405,7 +405,6 @@ dummy := $(call unnest-vars,, \ block-obj-y \ block-obj-m \ crypto-obj-y \ - crypto-aes-obj-y \ qom-obj-y \ io-obj-y \ common-obj-y \ @@ -441,7 +440,6 @@ SOFTMMU_SUBDIR_RULES=$(filter %-softmmu,$(SUBDIR_RULES)) $(SOFTMMU_SUBDIR_RULES): $(authz-obj-y) $(SOFTMMU_SUBDIR_RULES): $(block-obj-y) -$(SOFTMMU_SUBDIR_RULES): $(crypto-obj-y) $(SOFTMMU_SUBDIR_RULES): $(io-obj-y) $(SOFTMMU_SUBDIR_RULES): config-all-devices.mak @@ -496,7 +494,7 @@ Makefile: $(version-obj-y) ###################################################################### # Build libraries -libqemuutil.a: $(util-obj-y) $(trace-obj-y) $(stub-obj-y) +libqemuutil.a: $(util-obj-y) $(trace-obj-y) $(stub-obj-y) $(crypto-obj-y) libvhost-user.a: $(libvhost-user-obj-y) $(util-obj-y) $(stub-obj-y) ###################################################################### @@ -505,9 +503,9 @@ COMMON_LDADDS = libqemuutil.a qemu-img.o: qemu-img-cmds.h -qemu-img$(EXESUF): qemu-img.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS) -qemu-nbd$(EXESUF): qemu-nbd.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS) -qemu-io$(EXESUF): qemu-io.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS) +qemu-img$(EXESUF): qemu-img.o $(authz-obj-y) $(block-obj-y) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS) +qemu-nbd$(EXESUF): qemu-nbd.o $(authz-obj-y) $(block-obj-y) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS) +qemu-io$(EXESUF): qemu-io.o $(authz-obj-y) $(block-obj-y) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS) qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o $(COMMON_LDADDS) @@ -518,7 +516,7 @@ qemu-edid$(EXESUF): qemu-edid.o hw/display/edid-generate.o $(COMMON_LDADDS) fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o fsdev/9p-marshal.o fsdev/9p-iov-marshal.o $(COMMON_LDADDS) fsdev/virtfs-proxy-helper$(EXESUF): LIBS += -lcap -scsi/qemu-pr-helper$(EXESUF): scsi/qemu-pr-helper.o scsi/utils.o $(authz-obj-y) $(crypto-obj-y) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS) +scsi/qemu-pr-helper$(EXESUF): scsi/qemu-pr-helper.o scsi/utils.o $(authz-obj-y) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS) ifdef CONFIG_MPATH scsi/qemu-pr-helper$(EXESUF): LIBS += -ludev -lmultipath -lmpathpersist endif diff --git a/Makefile.objs b/Makefile.objs index 72debbf5c5..23950a37af 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -3,6 +3,8 @@ stub-obj-y = stubs/ util/ crypto/ util-obj-y = util/ qobject/ qapi/ +crypto-obj-y = crypto/ + chardev-obj-y = chardev/ ####################################################################### @@ -21,12 +23,6 @@ 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/ -crypto-aes-obj-y = crypto/ - ####################################################################### # qom-obj-y is code used by both qemu system emulation and qemu-img diff --git a/Makefile.target b/Makefile.target index d8048aab8f..8840d70b57 100644 --- a/Makefile.target +++ b/Makefile.target @@ -181,8 +181,6 @@ dummy := $(call unnest-vars,.., \ block-obj-y \ block-obj-m \ chardev-obj-y \ - crypto-obj-y \ - crypto-aes-obj-y \ qom-obj-y \ io-obj-y \ common-obj-y \ @@ -191,8 +189,6 @@ all-obj-y += $(common-obj-y) all-obj-y += $(qom-obj-y) all-obj-$(CONFIG_SOFTMMU) += $(authz-obj-y) all-obj-$(CONFIG_SOFTMMU) += $(block-obj-y) $(chardev-obj-y) -all-obj-$(CONFIG_USER_ONLY) += $(crypto-aes-obj-y) -all-obj-$(CONFIG_SOFTMMU) += $(crypto-obj-y) all-obj-$(CONFIG_SOFTMMU) += $(io-obj-y) ifdef CONFIG_SOFTMMU diff --git a/configure b/configure index abe453f8fd..8992b3aade 100755 --- a/configure +++ b/configure @@ -2771,8 +2771,7 @@ if test "$gnutls" != "no"; then if $pkg_config --exists "gnutls >= 3.1.18"; then gnutls_cflags=$($pkg_config --cflags gnutls) gnutls_libs=$($pkg_config --libs gnutls) - libs_softmmu="$gnutls_libs $libs_softmmu" - libs_tools="$gnutls_libs $libs_tools" + LIBS="$gnutls_libs $LIBS" QEMU_CFLAGS="$QEMU_CFLAGS $gnutls_cflags" gnutls="yes" elif test "$gnutls" = "yes"; then @@ -2837,8 +2836,7 @@ if test "$nettle" != "no"; then nettle_cflags=$($pkg_config --cflags nettle) nettle_libs=$($pkg_config --libs nettle) nettle_version=$($pkg_config --modversion nettle) - libs_softmmu="$nettle_libs $libs_softmmu" - libs_tools="$nettle_libs $libs_tools" + LIBS="$nettle_libs $LIBS" QEMU_CFLAGS="$QEMU_CFLAGS $nettle_cflags" nettle="yes" @@ -2865,8 +2863,7 @@ if test "$gcrypt" != "no"; then then gcrypt_libs="$gcrypt_libs -lgpg-error" fi - libs_softmmu="$gcrypt_libs $libs_softmmu" - libs_tools="$gcrypt_libs $libs_tools" + LIBS="$gcrypt_libs $LIBS" QEMU_CFLAGS="$QEMU_CFLAGS $gcrypt_cflags" gcrypt="yes" diff --git a/crypto/Makefile.objs b/crypto/Makefile.objs index 256c9aca1f..a291bc5b9a 100644 --- a/crypto/Makefile.objs +++ b/crypto/Makefile.objs @@ -34,8 +34,5 @@ crypto-obj-y += xts.o crypto-obj-y += block.o crypto-obj-y += block-qcow.o crypto-obj-y += block-luks.o - -# Let the userspace emulators avoid linking gnutls/etc -crypto-aes-obj-y = aes.o - +crypto-obj-y += aes.o stub-obj-y += pbkdf-stub.o