block: 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>

diff --git a/block/crypto.c b/block/crypto.c
index 7e7ad2d2a698317a802a91a747266b9933927020..bc322b50f59beefafa8f05a455404552b9c3939a 100644 (file)
--- a/block/crypto.c
+++ b/block/crypto.c
@@ -29,7 +29,7 @@
 #include "qapi/qobject-input-visitor.h"
 #include "qapi/error.h"
 #include "qemu/option.h"
-#include "block/crypto.h"
+#include "crypto.h"
 
 typedef struct BlockCrypto BlockCrypto;
 

diff --git a/block/nbd.c b/block/nbd.c
index 3e1693cc55fadf68c3162d0d7debf3f42d119033..ff8333e3c1fea94c4c17f49f94e6d612d6d301a2 100644 (file)
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -27,7 +27,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "block/nbd-client.h"
+#include "nbd-client.h"
 #include "qapi/error.h"
 #include "qemu/uri.h"
 #include "block/block_int.h"

diff --git a/block/qcow.c b/block/qcow.c
index 3ba2ca25ea5bffb7eb0154f56ff97930c5632cdf..1f866af0d31efbaebd2d49b69aa984190475f044 100644 (file)
--- a/block/qcow.c
+++ b/block/qcow.c
@@ -37,7 +37,7 @@
 #include "qapi/qapi-visit-block-core.h"
 #include "crypto/block.h"
 #include "migration/blocker.h"
-#include "block/crypto.h"
+#include "crypto.h"
 
 /**************************************************************/
 /* QEMU COW block driver with compression and encryption support */

diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c
index 6e93ec43e117e661c067f4a97df5a9f39c119624..60d5290f103d2f5fb3dfb59a8149ee6e40355ed0 100644 (file)
--- a/block/qcow2-bitmap.c
+++ b/block/qcow2-bitmap.c
@@ -30,7 +30,7 @@
 #include "qemu/cutils.h"
 
 #include "block/block_int.h"
-#include "block/qcow2.h"
+#include "qcow2.h"
 
 /* NOTICE: BME here means Bitmaps Extension and used as a namespace for
  * _internal_ constants. Please do not use this _internal_ abbreviation for

diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index 1aee726c6a465940deacd2fb04cc0939e083b8e7..0d74584c9b4bbc31daa2ed5f8acbc00e6ae5fb25 100644 (file)
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -28,7 +28,7 @@
 #include "qapi/error.h"
 #include "qemu-common.h"
 #include "block/block_int.h"
-#include "block/qcow2.h"
+#include "qcow2.h"
 #include "qemu/bswap.h"
 #include "trace.h"
 

diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index 2dc23005b7c627ca27363c4c6cb9e391895ff249..403236256bd85d2fe6104c20e2d13af40d8b4ac1 100644 (file)
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -26,7 +26,7 @@
 #include "qapi/error.h"
 #include "qemu-common.h"
 #include "block/block_int.h"
-#include "block/qcow2.h"
+#include "qcow2.h"
 #include "qemu/range.h"
 #include "qemu/bswap.h"
 #include "qemu/cutils.h"

diff --git a/block/qcow2-snapshot.c b/block/qcow2-snapshot.c
index 74293be470a46550bfde3d59bfce18ba6600921a..bb6a5b7516e30d4d90fb9c4aab7f2f31299a1b4e 100644 (file)
--- a/block/qcow2-snapshot.c
+++ b/block/qcow2-snapshot.c
@@ -25,7 +25,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "block/block_int.h"
-#include "block/qcow2.h"
+#include "qcow2.h"
 #include "qemu/bswap.h"
 #include "qemu/error-report.h"
 #include "qemu/cutils.h"

diff --git a/block/qcow2.c b/block/qcow2.c
index 6d532470a8e80de13ef7df4a36393f88dc490158..db13109744791d645f4e3fe76dfa8e2289de54d2 100644 (file)
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -27,7 +27,7 @@
 #include "sysemu/block-backend.h"
 #include "qemu/module.h"
 #include <zlib.h>
-#include "block/qcow2.h"
+#include "qcow2.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
 #include "qapi/qapi-events-block-core.h"
@@ -39,7 +39,7 @@
 #include "qemu/bswap.h"
 #include "qapi/qobject-input-visitor.h"
 #include "qapi/qapi-visit-block-core.h"
-#include "block/crypto.h"
+#include "crypto.h"
 
 /*
   Differences with QCOW:

diff --git a/block/vhdx-endian.c b/block/vhdx-endian.c
index 429d7556bdfa8532c9e83d809e2466455615786c..41fbdd2b8f0b3ead758c203d5773812195e91bb5 100644 (file)
--- a/block/vhdx-endian.c
+++ b/block/vhdx-endian.c
@@ -19,7 +19,7 @@
 #include "qemu-common.h"
 #include "block/block_int.h"
 #include "qemu/bswap.h"
-#include "block/vhdx.h"
+#include "vhdx.h"
 
 /*
  * All the VHDX formats on disk are little endian - the following

diff --git a/block/vhdx-log.c b/block/vhdx-log.c
index 0ac4863b25d404483707cf04b8fc8a225bdc9ed0..d2f1b98199c8b7d65d6b960bc2d96ecf848d33b0 100644 (file)
--- a/block/vhdx-log.c
+++ b/block/vhdx-log.c
@@ -24,7 +24,7 @@
 #include "qemu/error-report.h"
 #include "qemu/module.h"
 #include "qemu/bswap.h"
-#include "block/vhdx.h"
+#include "vhdx.h"
 
 
 typedef struct VHDXLogSequence {

diff --git a/block/vhdx.c b/block/vhdx.c
index 0b1e21c7501bae09597b496ee506b029556ed94f..79c68a20617ea23d78c4dbf94f1831694ac978b6 100644 (file)
--- a/block/vhdx.c
+++ b/block/vhdx.c
@@ -23,7 +23,7 @@
 #include "qemu/option.h"
 #include "qemu/crc32c.h"
 #include "qemu/bswap.h"
-#include "block/vhdx.h"
+#include "vhdx.h"
 #include "migration/blocker.h"
 #include "qemu/uuid.h"
 #include "qapi/qmp/qdict.h"