From nobody Mon Apr 29 18:27:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1565075534; cv=none; d=zoho.com; s=zohoarc; b=fK5X4nRNRxT0Ph9ByIgYAVbkA+g/onLGfWgLc/bv11+RdK6Rm6+xjcm3GrxRHTEeFKnk3k2aJhiP3bn1/VpLEPmzQEwXT9dR9cQZxky5VdicQKlcqMItVltOZI8iUeyheRLWJMEzy9Mpq8UrDg1DroWjMx+xeY0t9Jp1817nmGc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565075534; h=Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=tno4fXYT35ehLgDjYVWzgn0Y8l88An91Jzi5a/0s+24=; b=m5TooPzunxOLpUHZOvW+VZFv5mrzkCJfYTsuggCLX+2kg+UodC1+FA3OSzA/0CRovqW/YkOdw4Gdyr4ZuTaXXYn4wAHTqLgDn2f1r7mY2fwlnQfNfoA63JWLOLjCXDzDpdXjljvloA00VZoYjrjKNFMBLl1VMLkgHqY0DUKeFDQ= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1565075534108645.9274801840193; Tue, 6 Aug 2019 00:12:14 -0700 (PDT) Received: from localhost ([::1]:59358 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hutdi-0007PW-WA for importer@patchew.org; Tue, 06 Aug 2019 03:12:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39707) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hutcu-00064U-NQ for qemu-devel@nongnu.org; Tue, 06 Aug 2019 03:11:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hutct-0002Mt-CZ for qemu-devel@nongnu.org; Tue, 06 Aug 2019 03:11:20 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:34907) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hutct-0002MY-6Y for qemu-devel@nongnu.org; Tue, 06 Aug 2019 03:11:19 -0400 Received: by mail-wm1-x341.google.com with SMTP id l2so75256180wmg.0 for ; Tue, 06 Aug 2019 00:11:19 -0700 (PDT) Received: from 640k.localdomain.com ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id s10sm112652132wmf.8.2019.08.06.00.11.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Aug 2019 00:11:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=tno4fXYT35ehLgDjYVWzgn0Y8l88An91Jzi5a/0s+24=; b=KJIQpgzjdFVKQNE6HQVnxDnukTDhY5M+78jTEOIkSp9s9l03J3xtvsBmxrV38FXKIl QoUYwd7xhcblvb6aAXAQwkVWqkrkYOAZ0/pXFpjzvUbwGhSOkuvXY5mH4Jcwo3hQc8Xo X/G5WSSxTIFPZSJJNsKWN2Qt4KxbsRH0fa0EhVXaltKn2dDoEqdxEg8NDpnibNd5bXm0 4numxwfDY26bIzvfemnjlrpRLJzVHqldnkSFgqB76UEQyFBtGd3+HnB9O8r+L2ybtc9T SLyBeAMcH2KAsWitmQ95H/kkymFAYIatGcmCa+DizgYdwEgrVbfQIBnRkMbXvV09DcQS l21g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=tno4fXYT35ehLgDjYVWzgn0Y8l88An91Jzi5a/0s+24=; b=AgEf2VIeBUZK2Yp3cAbhubRcPhPxajcfS+ONkRjs+HHrKOfnPCcjZFJ3dSxGJVlbyE 5wlumvXjgNApv/efn384tjIbxrKtDPLITeUUi2inO4TmrROXHrICtcPqIR8b7fHz6mhB WVewvL01Qu+jyB/UXOsoHB5YDVTgl20LWY2lWl3DFOFWDHJ9rnW09DdqJ5GBo+aygFvS 3NB+URuxGf0H0cUTbccy3mWLEZrZUuAF66ItfI0sMM/JWtmbRh6EMc+xq38B88vA6ZSQ Mr67CsXwF3nSrEsWP/uG9i9B0JoWjKOMaapXn4mAFkF1WkzqKBwfqGkDcAsKQe8TxmHJ ye/w== X-Gm-Message-State: APjAAAWTcIFN/39tk5TT+8FZpzZ5PxSFGsFrSZf5f1goGgotqA7YvpMs KhoDlUsjBZ33LmVhTlIBo69m5ubt X-Google-Smtp-Source: APXvYqyj9T755yenE1q+7pJvluJVHWs5StpnXW4sQWszhtKmh9x/j6Lzo8qUee2CzdlWzEtcqipNWw== X-Received: by 2002:a05:600c:2189:: with SMTP id e9mr2699916wme.56.1565075478004; Tue, 06 Aug 2019 00:11:18 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 6 Aug 2019 09:11:15 +0200 Message-Id: <1565075475-15313-1-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 Subject: [Qemu-devel] [PATCH] crypto: move common bits for all emulators to libqemuutil 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: berrange@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" qcrypto_random_*, AES and qcrypto_init do not need to be linked as a whole and are the only parts that are used by user-mode emulation. Place them in libqemuutil, so that whatever needs them will pick them up automatically. Signed-off-by: Paolo Bonzini --- MAINTAINERS | 3 +++ Makefile | 4 +--- Makefile.objs | 1 - Makefile.target | 2 -- crypto/Makefile.objs | 7 ------- util/Makefile.objs | 5 +++++ {crypto =3D> util}/aes.c | 0 crypto/init.c =3D> util/crypto-init.c | 0 {crypto =3D> util}/random-gcrypt.c | 0 {crypto =3D> util}/random-gnutls.c | 0 {crypto =3D> util}/random-platform.c | 0 11 files changed, 9 insertions(+), 13 deletions(-) rename {crypto =3D> util}/aes.c (100%) rename crypto/init.c =3D> util/crypto-init.c (100%) rename {crypto =3D> util}/random-gcrypt.c (100%) rename {crypto =3D> util}/random-gnutls.c (100%) rename {crypto =3D> util}/random-platform.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index cad58b9..c8feaeb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2141,6 +2141,9 @@ F: tests/test-crypto-* F: tests/benchmark-crypto-* F: tests/crypto-tls-* F: tests/pkix_asn1_tab.c +F: util/aes.c +F: util/crypto-init.c +F: util/random-*.c F: qemu.sasl =20 Coroutines diff --git a/Makefile b/Makefile index dfd158c..73fbba0 100644 --- a/Makefile +++ b/Makefile @@ -425,7 +425,6 @@ dummy :=3D $(call unnest-vars,, \ block-obj-y \ block-obj-m \ crypto-obj-y \ - crypto-user-obj-y \ qom-obj-y \ io-obj-y \ common-obj-y \ @@ -498,8 +497,7 @@ subdir-capstone: .git-submodule-status subdir-slirp: .git-submodule-status $(call quiet-command,$(MAKE) -C $(SRC_PATH)/slirp BUILD_DIR=3D"$(BUILD_DI= R)/slirp" CC=3D"$(CC)" AR=3D"$(AR)" LD=3D"$(LD)" RANLIB=3D"$(RANLIB)" CFLAG= S=3D"$(QEMU_CFLAGS) $(CFLAGS)" LDFLAGS=3D"$(LDFLAGS)") =20 -$(SUBDIR_RULES): libqemuutil.a $(common-obj-y) \ - $(qom-obj-y) $(crypto-user-obj-$(CONFIG_USER_ONLY)) +$(SUBDIR_RULES): libqemuutil.a $(common-obj-y) $(qom-obj-y) =20 ROMSUBDIR_RULES=3D$(patsubst %,romsubdir-%, $(ROMS)) # Only keep -O and -g cflags diff --git a/Makefile.objs b/Makefile.objs index 658cfc9..4d7e49e 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -25,7 +25,6 @@ block-obj-m =3D block/ # crypto-obj-y is code used by both qemu system emulation and qemu-img =20 crypto-obj-y =3D crypto/ -crypto-user-obj-y =3D crypto/ =20 ####################################################################### # qom-obj-y is code used by both qemu system emulation and qemu-img diff --git a/Makefile.target b/Makefile.target index 72c267f..6737fea 100644 --- a/Makefile.target +++ b/Makefile.target @@ -181,7 +181,6 @@ dummy :=3D $(call unnest-vars,.., \ block-obj-m \ chardev-obj-y \ crypto-obj-y \ - crypto-user-obj-y \ qom-obj-y \ io-obj-y \ common-obj-y \ @@ -190,7 +189,6 @@ all-obj-y +=3D $(common-obj-y) all-obj-y +=3D $(qom-obj-y) all-obj-$(CONFIG_SOFTMMU) +=3D $(authz-obj-y) all-obj-$(CONFIG_SOFTMMU) +=3D $(block-obj-y) $(chardev-obj-y) -all-obj-$(CONFIG_USER_ONLY) +=3D $(crypto-user-obj-y) all-obj-$(CONFIG_SOFTMMU) +=3D $(crypto-obj-y) all-obj-$(CONFIG_SOFTMMU) +=3D $(io-obj-y) =20 diff --git a/crypto/Makefile.objs b/crypto/Makefile.objs index 7fe2fa9..e17f3fb 100644 --- a/crypto/Makefile.objs +++ b/crypto/Makefile.objs @@ -19,10 +19,6 @@ crypto-obj-y +=3D tlscredspsk.o crypto-obj-y +=3D tlscredsx509.o crypto-obj-y +=3D tlssession.o crypto-obj-y +=3D secret.o -crypto-rng-obj-$(CONFIG_GCRYPT) +=3D random-gcrypt.o -crypto-rng-obj-$(if $(CONFIG_GCRYPT),n,$(CONFIG_GNUTLS)) +=3D random-gnutl= s.o -crypto-rng-obj-$(if $(CONFIG_GCRYPT),n,$(if $(CONFIG_GNUTLS),n,y)) +=3D ra= ndom-platform.o -crypto-obj-y +=3D $(crypto-rng-obj-y) crypto-obj-y +=3D pbkdf.o crypto-obj-$(CONFIG_NETTLE) +=3D pbkdf-nettle.o crypto-obj-$(if $(CONFIG_NETTLE),n,$(CONFIG_GCRYPT)) +=3D pbkdf-gcrypt.o @@ -36,7 +32,4 @@ crypto-obj-y +=3D block.o crypto-obj-y +=3D block-qcow.o crypto-obj-y +=3D block-luks.o =20 -# Let the userspace emulators avoid linking stuff they won't use. -crypto-user-obj-y =3D aes.o $(crypto-rng-obj-y) init.o - stub-obj-y +=3D pbkdf-stub.o diff --git a/util/Makefile.objs b/util/Makefile.objs index a817ced..5e80fd9 100644 --- a/util/Makefile.objs +++ b/util/Makefile.objs @@ -57,3 +57,8 @@ util-obj-$(CONFIG_POSIX) +=3D drm.o util-obj-y +=3D guest-random.o =20 stub-obj-y +=3D filemonitor-stub.o + +util-obj-$(CONFIG_GCRYPT) +=3D random-gcrypt.o +util-obj-$(if $(CONFIG_GCRYPT),n,$(CONFIG_GNUTLS)) +=3D random-gnutls.o +util-obj-$(if $(CONFIG_GCRYPT),n,$(if $(CONFIG_GNUTLS),n,y)) +=3D random-p= latform.o +util-obj-y +=3D aes.o crypto-init.o diff --git a/crypto/aes.c b/util/aes.c similarity index 100% rename from crypto/aes.c rename to util/aes.c diff --git a/crypto/init.c b/util/crypto-init.c similarity index 100% rename from crypto/init.c rename to util/crypto-init.c diff --git a/crypto/random-gcrypt.c b/util/random-gcrypt.c similarity index 100% rename from crypto/random-gcrypt.c rename to util/random-gcrypt.c diff --git a/crypto/random-gnutls.c b/util/random-gnutls.c similarity index 100% rename from crypto/random-gnutls.c rename to util/random-gnutls.c diff --git a/crypto/random-platform.c b/util/random-platform.c similarity index 100% rename from crypto/random-platform.c rename to util/random-platform.c --=20 1.8.3.1