From patchwork Thu Sep 10 10:06:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= X-Patchwork-Id: 249583 Delivered-To: patch@linaro.org Received: by 2002:a17:906:6011:0:0:0:0 with SMTP id o17csp1239097ejj; Thu, 10 Sep 2020 03:08:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx0lckGh2hbFn3xMFlLJPJcXYrj9LfIkc9N9M0a7LloNZDSZFExnJWFfuFN1763KD2a5qI2 X-Received: by 2002:a25:e80f:: with SMTP id k15mr11863731ybd.359.1599732490359; Thu, 10 Sep 2020 03:08:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599732490; cv=none; d=google.com; s=arc-20160816; b=oDAjlXFyOL/yyzG/JOeSnyDOma7zwYxeR4PgOUrkwtIZgo5S3Ggh0kfCNv/7t5IhiU B+xKENpXfnyDXykC1WrCEuzZULS7w4BykmIgsCQ0j+30OD2vhXBEcmffr5k9Z7t4ULQU /TXScflaas57UAPstqbiuSVnAb/ALoPadZvGhkgZRvffiSBDKDBdWTxuEjkFRP9uMbDl mmc0Bb6RMJ2C++HsPpWefJIsCQr2Gerh6gThIXeENnTtzPaxBBx06wgc2ecW1VSbPGOr eiVZL0V+5KkYRqE01qh2plPRTRR3l3dDkosMHXY2vWv8CdZ6Cc3WD/RdHQ/mLpmTvLvp dwvQ== 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=ePjSYCtsoDm6neGSzzJ1Nkocp6K3wm3BNYSOcxSHwwc=; b=Vbw1jRQOi73NsAFhBOkbWHlXcLJSDxpZEzcQNa0fH1wVW3Sv92Qifn/Z5iV7YgxSJB j1n9adfCdI/UHnTOTwoN5kdlQgmokARwA066jR2RQ5C3C92J4tkgOfLJnQK5OBnoFaJp 2GhG/1Yz4Eh+Jy3hAdvkyj27VqK/4/CU2/3mPvSO0fxcT/jUEbpOiYg5wizuKrv7gf8F wy/hpkn5ikeTDK20VoYWWmDXQ4pVAhHf5xiZkcjk0HolWil5eOa81CzfRmsKVERNRPvR 6F6gAoFIzXxzm4czM5zr+IXJTCLWyZjwIE3JDcCwAhIFpOloRmOobttIDnviPFucJNyg DndA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=IomuB4En; 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=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 67si5100444ybo.449.2020.09.10.03.08.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 10 Sep 2020 03:08:10 -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=@redhat.com header.s=mimecast20190719 header.b=IomuB4En; 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=redhat.com Received: from localhost ([::1]:49924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kGJUv-0003Jy-OG for patch@linaro.org; Thu, 10 Sep 2020 06:08:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43598) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kGJTR-0000Bl-KC for qemu-devel@nongnu.org; Thu, 10 Sep 2020 06:06:37 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:31322 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kGJTP-0007gp-Qq for qemu-devel@nongnu.org; Thu, 10 Sep 2020 06:06:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599732394; 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=ePjSYCtsoDm6neGSzzJ1Nkocp6K3wm3BNYSOcxSHwwc=; b=IomuB4EnNHNhgV/DA4VSQmv3ixlbmQGZ3TnSVP7f8aLUl8bwJGNDnlMEaPXzV/sxYXDe/9 kcB3TC2ruFP+1bIiJTUixBU9ZcHJ3SYX2tvlMGypVdsMspCLMfWbbrkzYtH9yNUuFvzU0S zR3FOiq11menHb0hBsVniJxj89XEbrM= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-414-vhXRUKP4PyWLGZ9VPL-5qw-1; Thu, 10 Sep 2020 06:06:32 -0400 X-MC-Unique: vhXRUKP4PyWLGZ9VPL-5qw-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6E91E107464B; Thu, 10 Sep 2020 10:06:31 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-4.ams2.redhat.com [10.36.112.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id 30AA91002D41; Thu, 10 Sep 2020 10:06:29 +0000 (UTC) From: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 04/17] crypto: Remove redundant includes Date: Thu, 10 Sep 2020 11:06:10 +0100 Message-Id: <20200910100623.1088965-5-berrange@redhat.com> In-Reply-To: <20200910100623.1088965-1-berrange@redhat.com> References: <20200910100623.1088965-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=205.139.110.61; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/10 01:44:54 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: Richard Henderson , =?utf-8?q?Daniel_P?= =?utf-8?b?LiBCZXJyYW5nw6k=?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Both qemu/osdep.h and cipherpriv.h have already been included by the parent cipher.c. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson Signed-off-by: Daniel P. Berrangé --- crypto/cipher-builtin.c.inc | 2 -- crypto/cipher-gcrypt.c.inc | 2 -- crypto/cipher-nettle.c.inc | 2 -- 3 files changed, 6 deletions(-) -- 2.26.2 diff --git a/crypto/cipher-builtin.c.inc b/crypto/cipher-builtin.c.inc index 6eafd39da0..56d45b0227 100644 --- a/crypto/cipher-builtin.c.inc +++ b/crypto/cipher-builtin.c.inc @@ -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.c.inc b/crypto/cipher-gcrypt.c.inc index 81e4745bff..a62839914b 100644 --- a/crypto/cipher-gcrypt.c.inc +++ b/crypto/cipher-gcrypt.c.inc @@ -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.c.inc b/crypto/cipher-nettle.c.inc index 0677fdfd33..256931a823 100644 --- a/crypto/cipher-nettle.c.inc +++ b/crypto/cipher-nettle.c.inc @@ -18,11 +18,9 @@ * */ -#include "qemu/osdep.h" #ifdef CONFIG_QEMU_PRIVATE_XTS #include "crypto/xts.h" #endif -#include "cipherpriv.h" #include #include