diff mbox series

[05/17] crypto: Remove redundant includes

Message ID 20200813032537.2888593-6-richard.henderson@linaro.org
State Superseded
Headers show
Series crypto/cipher: Class hierarchy cleanups | expand

Commit Message

Richard Henderson Aug. 13, 2020, 3:25 a.m. UTC
Both qemu/osdep.h and cipherpriv.h have already been
included by the parent cipher.c.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

---
 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

Comments

Philippe Mathieu-Daudé Aug. 13, 2020, 8:01 a.m. UTC | #1
On 8/13/20 5:25 AM, Richard Henderson wrote:
> Both qemu/osdep.h and cipherpriv.h have already been

> included by the parent cipher.c.

> 

> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

> ---

>  crypto/cipher-builtin.inc.c | 2 --

>  crypto/cipher-gcrypt.inc.c  | 2 --

>  crypto/cipher-nettle.inc.c  | 2 --

>  3 files changed, 6 deletions(-)


Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Daniel P. Berrangé Aug. 17, 2020, 4:50 p.m. UTC | #2
On Wed, Aug 12, 2020 at 08:25:25PM -0700, Richard Henderson wrote:
> Both qemu/osdep.h and cipherpriv.h have already been

> included by the parent cipher.c.

> 

> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

> ---

>  crypto/cipher-builtin.inc.c | 2 --

>  crypto/cipher-gcrypt.inc.c  | 2 --

>  crypto/cipher-nettle.inc.c  | 2 --

>  3 files changed, 6 deletions(-)


Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>



Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
diff mbox series

Patch

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 <gcrypt.h>
 
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 <nettle/nettle-types.h>
 #include <nettle/aes.h>