From 7136fc1da2690a2a8a6444311484283de0190065 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 11 Mar 2016 09:20:17 +0100 Subject: include/crypto: Include qapi-types.h or qemu/bswap.h instead of qemu-common.h qemu-common.h should only be included by .c files. Its file comment explains why: "No header file should depend on qemu-common.h, as this would easily lead to circular header dependencies." Several include/crypto/ headers include qemu-common.h, but either need just qapi-types.h from it, or qemu/bswap.h, or nothing at all. Replace or drop the include accordingly. tests/test-crypto-secret.c now misses qemu/module.h, so include it there. Signed-off-by: Markus Armbruster Signed-off-by: Paolo Bonzini --- crypto/ivgen-essiv.c | 1 + crypto/ivgen-plain.c | 1 + crypto/ivgen-plain64.c | 1 + 3 files changed, 3 insertions(+) (limited to 'crypto') diff --git a/crypto/ivgen-essiv.c b/crypto/ivgen-essiv.c index 2fd89def0f..634de63338 100644 --- a/crypto/ivgen-essiv.c +++ b/crypto/ivgen-essiv.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/bswap.h" #include "crypto/ivgen-essiv.h" typedef struct QCryptoIVGenESSIV QCryptoIVGenESSIV; diff --git a/crypto/ivgen-plain.c b/crypto/ivgen-plain.c index a56675d592..9b9b4ad0bf 100644 --- a/crypto/ivgen-plain.c +++ b/crypto/ivgen-plain.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/bswap.h" #include "crypto/ivgen-plain.h" static int qcrypto_ivgen_plain_init(QCryptoIVGen *ivgen, diff --git a/crypto/ivgen-plain64.c b/crypto/ivgen-plain64.c index 94d86730fb..6c6b1b44c3 100644 --- a/crypto/ivgen-plain64.c +++ b/crypto/ivgen-plain64.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "qemu/bswap.h" #include "crypto/ivgen-plain.h" static int qcrypto_ivgen_plain_init(QCryptoIVGen *ivgen, -- cgit v1.2.3-55-g7522