From patchwork Thu Aug 13 03:25:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 247658 Delivered-To: patch@linaro.org Received: by 2002:a92:cc90:0:0:0:0:0 with SMTP id x16csp927328ilo; Wed, 12 Aug 2020 20:31:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzeSinka5mkzFw3NXomnxge8upEceyl4tjbdu+qxSc4aMZvZu+wr6J8fYI0QtQPrO5ViP0x X-Received: by 2002:a25:df92:: with SMTP id w140mr3545295ybg.455.1597289466352; Wed, 12 Aug 2020 20:31:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597289466; cv=none; d=google.com; s=arc-20160816; b=L1z1saetRI9WYeKrT1b34/sCz+MY2ckiA55oK1xTprOkXEoSUKRDFmaYPbiMwTbqra LvXjDP2shj3St7ScS804Oldb3xYM4aYClIvwXLaBKdQmgyulBEqlugc94cRgzMBnmh+a L62tb69vcXP8YbVL+gUFlhs+vBOnrgffzg1zUEE+ge2Ag+OzRYqTEz1MMPINuDV5nSUe 7weUB7ujpFUnx6pY46n5cWkKdIaG95Sfolt7AVD9eBEK/OpyB2fwHE6DEIrtFTZKOqG0 ZbptU3mKshnD53cbVn7IeAP3dEv+5SUWhKuQXRq8ft2/fJfH+MWQXBf/gGrbIyBg2eLD b1vQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=+PHy/gloogLnc28zgcQGUBXNqWvFE+M2jDPSBgeFXVw=; b=qdfh3oYfSWCTJg/MCLEQKLRvd0hVqIkwEBarQR0yRIt8xQoJA7u02eyAshuYbGH7Us Za1IL8vtp1J3BNUaZrTqmbmqy22NoSpC3zQUXdS8rdYIJwwy/FjQNmyu5A8NDZ/GTtha G84SbXcjwYOblmCuzYBVH2Hh1ODZc1L7ks3S4JL1fikfvrO2LfxMa+OsMW3pYRtEAP3L s7ENBm3g7g38pjS5OI5ZIf1cCV6cs95aRZHZuRGwlWQxekkiGpwYTAvXDVsKXvSkMRMF C50pdJoQn4YM9ElAQeSRy2TCVa5Z2wNU0vP+gmwf2/HMw018L46ehua8zrXlXjTlvzkR vx9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Cg4ac55V; 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=pass (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 w68si4182082ybc.122.2020.08.12.20.31.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 12 Aug 2020 20:31:06 -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=pass header.i=@linaro.org header.s=google header.b=Cg4ac55V; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:36916 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k63xJ-0004vz-Oc for patch@linaro.org; Wed, 12 Aug 2020 23:31:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58518) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k63sD-0004qR-VW for qemu-devel@nongnu.org; Wed, 12 Aug 2020 23:25:49 -0400 Received: from mail-pj1-x1042.google.com ([2607:f8b0:4864:20::1042]:54847) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k63sC-0008WP-Ax for qemu-devel@nongnu.org; Wed, 12 Aug 2020 23:25:49 -0400 Received: by mail-pj1-x1042.google.com with SMTP id mt12so2106369pjb.4 for ; Wed, 12 Aug 2020 20:25:47 -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=+PHy/gloogLnc28zgcQGUBXNqWvFE+M2jDPSBgeFXVw=; b=Cg4ac55VOl6kLG6fic3H9HB5l4VzY9rGl54+Rl1RorwJzACXlKGm4NP3KvN2dDNh4A 9rQvKJCrJB5hrE027HCLq5249+uPxEzAfTymhyb8AYEomVCEvY/BLL3vcf67IL6Rtsil zaK/pD50x2ZfJT8kH/ku8F0B1gNXPvbe8jEjDsua4YifndQcMFR4F/UHJCXBQM4Y04nZ 0i/QX0D1IlUuQCJgrHkgSTbOWe/PVAsqNg6wy8mNcSxWTc3cKiR1Ptr+sEJvDqcj58dU BUYnOyo9D23zCHXKMFkHedlQ6S/KTnUrlqWA0P/AEELtbU7BkGL8J735eFWPvzp/AhCW ODnA== 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=+PHy/gloogLnc28zgcQGUBXNqWvFE+M2jDPSBgeFXVw=; b=IMNdVmtlSv0SzyEXk1cmacmelUAbX8Eiqttr/qlVfX3TqwJf+spMIyYBhkdzUmehDD TU4GR8se/u3Rc6+YK8s5tP3ojPyS//aJL+UobrPY6CboDoW4NlYJmFAxN6UZs4hOjcg3 Gl7PMXzc4YgoK2BFuY8PYT84j1iBgkT+yBUk6MS9kefJGaw1oafpTyk4cKF1Le6dwYUP UGpuxSAz6M1elRpkQIpQb2PWOxbyH/84yPXouDqmfugf0zsVYtPsE0qczIQliKapTIOQ k8gALNzwIUet7K83vfCtDjhQTOZfLeU02zPdldxpf1dckvWu8rYuPb009UhGTKACpR1L K19A== X-Gm-Message-State: AOAM531HzZ6GMIP8Q8AwvV5ib3VSVZwm4lkJxKAF6fwqF6WnEMaOYu6C rFIOfgSIyZWkt2eU5T/FEHoGp9GAaTE= X-Received: by 2002:a17:90a:e687:: with SMTP id s7mr3075521pjy.48.1597289146628; Wed, 12 Aug 2020 20:25:46 -0700 (PDT) Received: from localhost.localdomain ([71.212.141.89]) by smtp.gmail.com with ESMTPSA id m19sm3633164pgd.21.2020.08.12.20.25.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Aug 2020 20:25:46 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 05/17] crypto: Remove redundant includes Date: Wed, 12 Aug 2020 20:25:25 -0700 Message-Id: <20200813032537.2888593-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200813032537.2888593-1-richard.henderson@linaro.org> References: <20200813032537.2888593-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1042; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1042.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Both qemu/osdep.h and cipherpriv.h have already been included by the parent cipher.c. Signed-off-by: Richard Henderson --- crypto/cipher-builtin.inc.c | 2 -- crypto/cipher-gcrypt.inc.c | 2 -- crypto/cipher-nettle.inc.c | 2 -- 3 files changed, 6 deletions(-) -- 2.25.1 Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé diff --git a/crypto/cipher-builtin.inc.c b/crypto/cipher-builtin.inc.c index 6eafd39da0..56d45b0227 100644 --- a/crypto/cipher-builtin.inc.c +++ b/crypto/cipher-builtin.inc.c @@ -18,11 +18,9 @@ * */ -#include "qemu/osdep.h" #include "crypto/aes.h" #include "crypto/desrfb.h" #include "crypto/xts.h" -#include "cipherpriv.h" typedef struct QCryptoCipherBuiltinAESContext QCryptoCipherBuiltinAESContext; struct QCryptoCipherBuiltinAESContext { diff --git a/crypto/cipher-gcrypt.inc.c b/crypto/cipher-gcrypt.inc.c index 81e4745bff..a62839914b 100644 --- a/crypto/cipher-gcrypt.inc.c +++ b/crypto/cipher-gcrypt.inc.c @@ -18,11 +18,9 @@ * */ -#include "qemu/osdep.h" #ifdef CONFIG_QEMU_PRIVATE_XTS #include "crypto/xts.h" #endif -#include "cipherpriv.h" #include diff --git a/crypto/cipher-nettle.inc.c b/crypto/cipher-nettle.inc.c index 0677fdfd33..256931a823 100644 --- a/crypto/cipher-nettle.inc.c +++ b/crypto/cipher-nettle.inc.c @@ -18,11 +18,9 @@ * */ -#include "qemu/osdep.h" #ifdef CONFIG_QEMU_PRIVATE_XTS #include "crypto/xts.h" #endif -#include "cipherpriv.h" #include #include