Re: [Qemu-devel] [PATCH 13/15] include/crypto: Include qapi-types.h instead of qemu-common.h

[Markus Armbruster]

"Daniel P. Berrange" <address@hidden> writes:

> On Tue, Mar 15, 2016 at 04:03:39PM +0100, Markus Armbruster wrote:
>> 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 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 <address@hidden>
>> ---
>>  include/crypto/cipher.h    | 2 +-
>>  include/crypto/hash.h      | 2 +-
>>  include/crypto/init.h      | 2 --
>>  include/crypto/secret.h    | 1 -
>>  include/crypto/tlscreds.h  | 1 -
>>  tests/test-crypto-secret.c | 1 +
>>  6 files changed, 3 insertions(+), 6 deletions(-)
>> 
>> diff --git a/include/crypto/cipher.h b/include/crypto/cipher.h
>> index c04c3ac..d770c48 100644
>> --- a/include/crypto/cipher.h
>> +++ b/include/crypto/cipher.h
>> @@ -21,7 +21,7 @@
>>  #ifndef QCRYPTO_CIPHER_H__
>>  #define QCRYPTO_CIPHER_H__
>>  
>> -#include "qemu-common.h"
>> +#include "qapi-types.h"
>>  
>>  typedef struct QCryptoCipher QCryptoCipher;
>>  
>> diff --git a/include/crypto/hash.h b/include/crypto/hash.h
>> index aebccd1..f38caed 100644
>> --- a/include/crypto/hash.h
>> +++ b/include/crypto/hash.h
>> @@ -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 */
>>  
>> diff --git a/include/crypto/init.h b/include/crypto/init.h
>> index 4836a37..2513ed0 100644
>> --- a/include/crypto/init.h
>> +++ b/include/crypto/init.h
>> @@ -21,8 +21,6 @@
>>  #ifndef QCRYPTO_INIT_H__
>>  #define QCRYPTO_INIT_H__
>>  
>> -#include "qemu-common.h"
>> -
>>  int qcrypto_init(Error **errp);
>
> Nothing provides the definition of the 'Error' type now.
> Needs to add in
>
>    #include "qapi/error.h"

qemu/typedefs.h does, since PATCH 01.  Standard technique to disentangle
includes.