qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
	Peter Maydell <peter.maydell@linaro.org>,
	qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>
Subject: [Qemu-devel] [PULL 01/21] qcow2.h: add missing include
Date: Tue, 28 May 2019 21:28:27 +0200	[thread overview]
Message-ID: <20190528192847.2730-2-mreitz@redhat.com> (raw)
In-Reply-To: <20190528192847.2730-1-mreitz@redhat.com>

From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

qcow2.h depends on block_int.h. Compilation isn't broken currently only
due to block_int.h always included before qcow2.h. Though, it seems
better to directly include block_int.h in qcow2.h.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-id: 20190506142741.41731-2-vsementsov@virtuozzo.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/qcow2.h          | 1 +
 block/qcow2-bitmap.c   | 1 -
 block/qcow2-cache.c    | 1 -
 block/qcow2-cluster.c  | 1 -
 block/qcow2-refcount.c | 1 -
 block/qcow2-snapshot.c | 1 -
 block/qcow2.c          | 1 -
 7 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/block/qcow2.h b/block/qcow2.h
index 8d92ef1fee..c2b0e955eb 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -28,6 +28,7 @@
 #include "crypto/block.h"
 #include "qemu/coroutine.h"
 #include "qemu/units.h"
+#include "block/block_int.h"
 
 //#define DEBUG_ALLOC
 //#define DEBUG_ALLOC2
diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c
index 8a75366c92..640da68ce1 100644
--- a/block/qcow2-bitmap.c
+++ b/block/qcow2-bitmap.c
@@ -29,7 +29,6 @@
 #include "qapi/error.h"
 #include "qemu/cutils.h"
 
-#include "block/block_int.h"
 #include "qcow2.h"
 
 /* NOTICE: BME here means Bitmaps Extension and used as a namespace for
diff --git a/block/qcow2-cache.c b/block/qcow2-cache.c
index df02e7b20a..b33bcbc984 100644
--- a/block/qcow2-cache.c
+++ b/block/qcow2-cache.c
@@ -23,7 +23,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "block/block_int.h"
 #include "qemu-common.h"
 #include "qcow2.h"
 #include "trace.h"
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index b36f4aa84a..a4c878398e 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -27,7 +27,6 @@
 
 #include "qapi/error.h"
 #include "qemu-common.h"
-#include "block/block_int.h"
 #include "qcow2.h"
 #include "qemu/bswap.h"
 #include "trace.h"
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index 0b09d6838b..4c1794f9af 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -25,7 +25,6 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu-common.h"
-#include "block/block_int.h"
 #include "qcow2.h"
 #include "qemu/range.h"
 #include "qemu/bswap.h"
diff --git a/block/qcow2-snapshot.c b/block/qcow2-snapshot.c
index a6ffae89a6..d0e7fa9311 100644
--- a/block/qcow2-snapshot.c
+++ b/block/qcow2-snapshot.c
@@ -24,7 +24,6 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "block/block_int.h"
 #include "qcow2.h"
 #include "qemu/bswap.h"
 #include "qemu/error-report.h"
diff --git a/block/qcow2.c b/block/qcow2.c
index d39882785d..38bf729a1e 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -27,7 +27,6 @@
 #define ZLIB_CONST
 #include <zlib.h>
 
-#include "block/block_int.h"
 #include "block/qdict.h"
 #include "sysemu/block-backend.h"
 #include "qemu/module.h"
-- 
2.21.0



  reply	other threads:[~2019-05-28 19:31 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-28 19:28 [Qemu-devel] [PULL 00/21] Block patches Max Reitz
2019-05-28 19:28 ` Max Reitz [this message]
2019-05-28 19:28 ` [Qemu-devel] [PULL 02/21] qcow2: add separate file for threaded data processing functions Max Reitz
2019-05-28 19:28 ` [Qemu-devel] [PULL 03/21] qcow2-threads: use thread_pool_submit_co Max Reitz
2019-05-28 19:28 ` [Qemu-devel] [PULL 04/21] qcow2-threads: qcow2_co_do_compress: protect queuing by mutex Max Reitz
2019-05-28 19:28 ` [Qemu-devel] [PULL 05/21] qcow2-threads: split out generic path Max Reitz
2019-05-28 19:28 ` [Qemu-devel] [PULL 06/21] qcow2: qcow2_co_preadv: improve locking Max Reitz
2019-05-28 19:28 ` [Qemu-devel] [PULL 07/21] qcow2: bdrv_co_pwritev: move encryption code out of the lock Max Reitz
2019-05-28 19:28 ` [Qemu-devel] [PULL 08/21] qcow2: do encryption in threads Max Reitz
2019-05-28 19:28 ` [Qemu-devel] [PULL 09/21] block/backup: simplify backup_incremental_init_copy_bitmap Max Reitz
2019-05-28 19:28 ` [Qemu-devel] [PULL 10/21] block/backup: move to copy_bitmap with granularity Max Reitz
2019-05-28 19:28 ` [Qemu-devel] [PULL 11/21] block/backup: refactor and tolerate unallocated cluster skipping Max Reitz
2019-05-28 19:28 ` [Qemu-devel] [PULL 12/21] block/backup: unify different modes code path Max Reitz
2019-05-28 19:28 ` [Qemu-devel] [PULL 13/21] block/backup: refactor: split out backup_calculate_cluster_size Max Reitz
2019-05-28 19:28 ` [Qemu-devel] [PULL 14/21] block: Use bdrv_unref_child() for all children in bdrv_close() Max Reitz
2019-05-28 19:28 ` [Qemu-devel] [PULL 15/21] block: Make bdrv_root_attach_child() unref child_bs on failure Max Reitz
2019-05-28 19:28 ` [Qemu-devel] [PULL 16/21] qemu-img: rebase: Reuse parent BlockDriverState Max Reitz
2019-05-28 19:28 ` [Qemu-devel] [PULL 17/21] qemu-img: rebase: Reduce reads on in-chain rebase Max Reitz
2019-05-28 19:28 ` [Qemu-devel] [PULL 18/21] qemu-img: rebase: Reuse in-chain BlockDriverState Max Reitz
2019-05-28 19:28 ` [Qemu-devel] [PULL 19/21] qcow2: skip writing zero buffers to empty COW areas Max Reitz
2019-05-28 19:28 ` [Qemu-devel] [PULL 20/21] qcow2-bitmap: initialize bitmap directory alignment Max Reitz
2019-05-28 19:28 ` [Qemu-devel] [PULL 21/21] blockdev: loosen restrictions on drive-backup source node Max Reitz
2019-05-30 11:09 ` [Qemu-devel] [PULL 00/21] Block patches Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190528192847.2730-2-mreitz@redhat.com \
    --to=mreitz@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).