ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

crypto: use local path for local headers 

When pulling in headers that are in the same directory as the C file (as
opposed to one in include/), we should use its relative path, without a
directory.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Michael S. Tsirkin 2018-05-03 22:50:23 +03:00
parent 0d8c41dae5
commit 986bc8ded9
16 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/block-luks.c
View File

@ -22,7 +22,7 @@
#include "qapi/error.h"
#include "qemu/bswap.h"
#include "crypto/block-luks.h"
#include "block-luks.h"
#include "crypto/hash.h"
#include "crypto/afsplit.h"

2
crypto/block-luks.h
View File

@ -21,7 +21,7 @@
#ifndef QCRYPTO_BLOCK_LUKS_H
#define QCRYPTO_BLOCK_LUKS_H
#include "crypto/blockpriv.h"
#include "blockpriv.h"
extern const QCryptoBlockDriver qcrypto_block_driver_luks;

2
crypto/block-qcow.c
View File

@ -27,7 +27,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "crypto/block-qcow.h"
#include "block-qcow.h"
#include "crypto/secret.h"
#define QCRYPTO_BLOCK_QCOW_SECTOR_SIZE 512

2
crypto/block-qcow.h
View File

@ -21,7 +21,7 @@
#ifndef QCRYPTO_BLOCK_QCOW_H
#define QCRYPTO_BLOCK_QCOW_H
#include "crypto/blockpriv.h"
#include "blockpriv.h"
extern const QCryptoBlockDriver qcrypto_block_driver_qcow;

6
crypto/block.c
View File

@ -20,9 +20,9 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "crypto/blockpriv.h"
#include "crypto/block-qcow.h"
#include "crypto/block-luks.h"
#include "blockpriv.h"
#include "block-qcow.h"
#include "block-luks.h"
static const QCryptoBlockDriver *qcrypto_block_drivers[] = {
[Q_CRYPTO_BLOCK_FORMAT_QCOW] = &qcrypto_block_driver_qcow,

6
crypto/cipher.c
View File

@ -150,11 +150,11 @@ qcrypto_cipher_munge_des_rfb_key(const uint8_t *key,
#endif /* CONFIG_GCRYPT || CONFIG_NETTLE */
#ifdef CONFIG_GCRYPT
#include "crypto/cipher-gcrypt.c"
#include "cipher-gcrypt.c"
#elif defined CONFIG_NETTLE
#include "crypto/cipher-nettle.c"
#include "cipher-nettle.c"
#else
#include "crypto/cipher-builtin.c"
#include "cipher-builtin.c"
#endif
QCryptoCipher *qcrypto_cipher_new(QCryptoCipherAlgorithm alg,

2
crypto/ivgen-essiv.c
View File

@ -20,7 +20,7 @@
#include "qemu/osdep.h"
#include "qemu/bswap.h"
#include "crypto/ivgen-essiv.h"
#include "ivgen-essiv.h"
typedef struct QCryptoIVGenESSIV QCryptoIVGenESSIV;
struct QCryptoIVGenESSIV {

2
crypto/ivgen-essiv.h
View File

@ -18,7 +18,7 @@
*
*/
#include "crypto/ivgenpriv.h"
#include "ivgenpriv.h"
#ifndef QCRYPTO_IVGEN_ESSIV_H__
#define QCRYPTO_IVGEN_ESSIV_H__

2
crypto/ivgen-plain.c
View File

@ -20,7 +20,7 @@
#include "qemu/osdep.h"
#include "qemu/bswap.h"
#include "crypto/ivgen-plain.h"
#include "ivgen-plain.h"
static int qcrypto_ivgen_plain_init(QCryptoIVGen *ivgen,
const uint8_t *key, size_t nkey,

2
crypto/ivgen-plain.h
View File

@ -18,7 +18,7 @@
*
*/
#include "crypto/ivgenpriv.h"
#include "ivgenpriv.h"
#ifndef QCRYPTO_IVGEN_PLAIN_H__
#define QCRYPTO_IVGEN_PLAIN_H__

2
crypto/ivgen-plain64.c
View File

@ -20,7 +20,7 @@
#include "qemu/osdep.h"
#include "qemu/bswap.h"
#include "crypto/ivgen-plain.h"
#include "ivgen-plain.h"
static int qcrypto_ivgen_plain_init(QCryptoIVGen *ivgen,
const uint8_t *key, size_t nkey,

2
crypto/ivgen-plain64.h
View File

@ -18,7 +18,7 @@
*
*/
#include "crypto/ivgenpriv.h"
#include "ivgenpriv.h"
#ifndef QCRYPTO_IVGEN_PLAIN64_H__
#define QCRYPTO_IVGEN_PLAIN64_H__

8
crypto/ivgen.c
View File

@ -21,10 +21,10 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "crypto/ivgenpriv.h"
#include "crypto/ivgen-plain.h"
#include "crypto/ivgen-plain64.h"
#include "crypto/ivgen-essiv.h"
#include "ivgenpriv.h"
#include "ivgen-plain.h"
#include "ivgen-plain64.h"
#include "ivgen-essiv.h"
QCryptoIVGen *qcrypto_ivgen_new(QCryptoIVGenAlgorithm alg,

2
crypto/tlscreds.c
View File

@ -20,7 +20,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "crypto/tlscredspriv.h"
#include "tlscredspriv.h"
#include "trace.h"
#define DH_BITS 2048

2
crypto/tlscredsanon.c
View File

@ -20,7 +20,7 @@
#include "qemu/osdep.h"
#include "crypto/tlscredsanon.h"
#include "crypto/tlscredspriv.h"
#include "tlscredspriv.h"
#include "qapi/error.h"
#include "qom/object_interfaces.h"
#include "trace.h"

2
crypto/tlscredsx509.c
View File

@ -20,7 +20,7 @@
#include "qemu/osdep.h"
#include "crypto/tlscredsx509.h"
#include "crypto/tlscredspriv.h"
#include "tlscredspriv.h"
#include "crypto/secret.h"
#include "qapi/error.h"
#include "qom/object_interfaces.h"