Commit 7136fc1d authored by Markus Armbruster's avatar Markus Armbruster Committed by Paolo Bonzini
Browse files

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: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent bd36a618

crypto/ivgen-essiv.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

crypto/ivgen-plain.c

+1 −0
Original line number Diff line number Diff line
@@ -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,

crypto/ivgen-plain64.c

+1 −0
Original line number Diff line number Diff line
@@ -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,

include/crypto/cipher.h

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#ifndef QCRYPTO_CIPHER_H__

#define QCRYPTO_CIPHER_H__



#include "qemu-common.h"

#include "qapi-types.h"



typedef struct QCryptoCipher QCryptoCipher;

include/crypto/hash.h

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#ifndef QCRYPTO_HASH_H__

#define QCRYPTO_HASH_H__



#include "qemu-common.h"

#include "qapi-types.h"



/* See also "QCryptoHashAlgorithm" defined in qapi/crypto.json */