[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/31] crypto: use local path for local headers
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 10/31] crypto: use local path for local headers |
Date: |
Fri, 1 Jun 2018 19:26:56 +0300 |
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 <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
Acked-by: Daniel P. Berrangé <address@hidden>
---
crypto/block-luks.h | 2 +-
crypto/block-qcow.h | 2 +-
crypto/ivgen-essiv.h | 2 +-
crypto/ivgen-plain.h | 2 +-
crypto/ivgen-plain64.h | 2 +-
crypto/block-luks.c | 2 +-
crypto/block-qcow.c | 2 +-
crypto/block.c | 6 +++---
crypto/cipher.c | 6 +++---
crypto/ivgen-essiv.c | 2 +-
crypto/ivgen-plain.c | 2 +-
crypto/ivgen-plain64.c | 2 +-
crypto/ivgen.c | 8 ++++----
crypto/tlscreds.c | 2 +-
crypto/tlscredsanon.c | 2 +-
crypto/tlscredsx509.c | 2 +-
16 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/crypto/block-luks.h b/crypto/block-luks.h
index b2d8a35c1b..befd8b2c56 100644
--- a/crypto/block-luks.h
+++ b/crypto/block-luks.h
@@ -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;
diff --git a/crypto/block-qcow.h b/crypto/block-qcow.h
index 3e2c0a851a..6988fb210b 100644
--- a/crypto/block-qcow.h
+++ b/crypto/block-qcow.h
@@ -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;
diff --git a/crypto/ivgen-essiv.h b/crypto/ivgen-essiv.h
index 4a00af849a..f34dbab57b 100644
--- a/crypto/ivgen-essiv.h
+++ b/crypto/ivgen-essiv.h
@@ -18,7 +18,7 @@
*
*/
-#include "crypto/ivgenpriv.h"
+#include "ivgenpriv.h"
#ifndef QCRYPTO_IVGEN_ESSIV_H__
#define QCRYPTO_IVGEN_ESSIV_H__
diff --git a/crypto/ivgen-plain.h b/crypto/ivgen-plain.h
index 0fe8835c3e..16e1ae5b27 100644
--- a/crypto/ivgen-plain.h
+++ b/crypto/ivgen-plain.h
@@ -18,7 +18,7 @@
*
*/
-#include "crypto/ivgenpriv.h"
+#include "ivgenpriv.h"
#ifndef QCRYPTO_IVGEN_PLAIN_H__
#define QCRYPTO_IVGEN_PLAIN_H__
diff --git a/crypto/ivgen-plain64.h b/crypto/ivgen-plain64.h
index c4104459b5..f8611bd705 100644
--- a/crypto/ivgen-plain64.h
+++ b/crypto/ivgen-plain64.h
@@ -18,7 +18,7 @@
*
*/
-#include "crypto/ivgenpriv.h"
+#include "ivgenpriv.h"
#ifndef QCRYPTO_IVGEN_PLAIN64_H__
#define QCRYPTO_IVGEN_PLAIN64_H__
diff --git a/crypto/block-luks.c b/crypto/block-luks.c
index d418ac30b8..5738124773 100644
--- a/crypto/block-luks.c
+++ b/crypto/block-luks.c
@@ -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"
diff --git a/crypto/block-qcow.c b/crypto/block-qcow.c
index 8817d6aaa7..4284e05167 100644
--- a/crypto/block-qcow.c
+++ b/crypto/block-qcow.c
@@ -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
diff --git a/crypto/block.c b/crypto/block.c
index f206d5eea8..e59d1140fe 100644
--- a/crypto/block.c
+++ b/crypto/block.c
@@ -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,
diff --git a/crypto/cipher.c b/crypto/cipher.c
index bcbfb3d5b8..b3af57961b 100644
--- a/crypto/cipher.c
+++ b/crypto/cipher.c
@@ -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,
diff --git a/crypto/ivgen-essiv.c b/crypto/ivgen-essiv.c
index aeaa8fcd5b..43e258c6f7 100644
--- a/crypto/ivgen-essiv.c
+++ b/crypto/ivgen-essiv.c
@@ -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 {
diff --git a/crypto/ivgen-plain.c b/crypto/ivgen-plain.c
index bf2fb7aac4..06f4145fe5 100644
--- a/crypto/ivgen-plain.c
+++ b/crypto/ivgen-plain.c
@@ -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,
diff --git a/crypto/ivgen-plain64.c b/crypto/ivgen-plain64.c
index e4679a1e6e..fbb7724b20 100644
--- a/crypto/ivgen-plain64.c
+++ b/crypto/ivgen-plain64.c
@@ -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,
diff --git a/crypto/ivgen.c b/crypto/ivgen.c
index f66435112b..6a2b3ad01e 100644
--- a/crypto/ivgen.c
+++ b/crypto/ivgen.c
@@ -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,
diff --git a/crypto/tlscreds.c b/crypto/tlscreds.c
index 3cd41035bb..02255a6f3c 100644
--- a/crypto/tlscreds.c
+++ b/crypto/tlscreds.c
@@ -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
diff --git a/crypto/tlscredsanon.c b/crypto/tlscredsanon.c
index 1464220080..7ad66d1e7d 100644
--- a/crypto/tlscredsanon.c
+++ b/crypto/tlscredsanon.c
@@ -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"
diff --git a/crypto/tlscredsx509.c b/crypto/tlscredsx509.c
index 50eb54f6bb..98ee0424e5 100644
--- a/crypto/tlscredsx509.c
+++ b/crypto/tlscredsx509.c
@@ -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"
--
MST
- [Qemu-devel] [PULL 00/31] acpi, vhost, misc: fixes, features, Michael S. Tsirkin, 2018/06/01
- [Qemu-devel] [PULL 01/31] vhost: allow backends to filter memory sections, Michael S. Tsirkin, 2018/06/01
- [Qemu-devel] [PULL 02/31] vhost-user: allow slave to send fds via slave channel, Michael S. Tsirkin, 2018/06/01
- [Qemu-devel] [PULL 04/31] vhost-user: support registering external host notifiers, Michael S. Tsirkin, 2018/06/01
- [Qemu-devel] [PULL 03/31] vhost-user: introduce shared vhost-user state, Michael S. Tsirkin, 2018/06/01
- [Qemu-devel] [PULL 05/31] libvhost-user: support host notifier, Michael S. Tsirkin, 2018/06/01
- [Qemu-devel] [PULL 10/31] crypto: use local path for local headers,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 07/31] osdep: add wait.h compat macros, Michael S. Tsirkin, 2018/06/01
- [Qemu-devel] [PULL 08/31] libqtest: fail if child coredumps, Michael S. Tsirkin, 2018/06/01
- [Qemu-devel] [PULL 06/31] vhost-user-bridge: support host notifier, Michael S. Tsirkin, 2018/06/01
- [Qemu-devel] [PULL 11/31] hppa: use local path for local headers, Michael S. Tsirkin, 2018/06/01
- [Qemu-devel] [PULL 12/31] migration: drop an unused include, Michael S. Tsirkin, 2018/06/01
- [Qemu-devel] [PULL 09/31] block: use local path for local headers, Michael S. Tsirkin, 2018/06/01
- [Qemu-devel] [PULL 13/31] trace: use local path for local headers, Michael S. Tsirkin, 2018/06/01
- [Qemu-devel] [PULL 14/31] display: use local path for local headers, Michael S. Tsirkin, 2018/06/01
- [Qemu-devel] [PULL 17/31] e1000e: use local path for local headers, Michael S. Tsirkin, 2018/06/01
- [Qemu-devel] [PULL 20/31] vhost-scsi: drop an unused include, Michael S. Tsirkin, 2018/06/01