From: Fam Zheng <famz@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, famz@redhat.com, jcody@redhat.com,
stefanha@redhat.com, pbonzini@redhat.com,
xiawenc@linux.vnet.ibm.com
Subject: [Qemu-devel] [PATCH v6 3/8] block: implement reference count for BlockDriverState
Date: Fri, 23 Aug 2013 09:14:46 +0800 [thread overview]
Message-ID: <1377220491-19954-4-git-send-email-famz@redhat.com> (raw)
In-Reply-To: <1377220491-19954-1-git-send-email-famz@redhat.com>
Introduce bdrv_ref/bdrv_unref to manage the lifecycle of
BlockDriverState. They are unused for now but will used to replace
bdrv_delete() later.
Signed-off-by: Fam Zheng <famz@redhat.com>
---
block.c | 21 +++++++++++++++++++++
include/block/block.h | 2 ++
include/block/block_int.h | 1 +
3 files changed, 24 insertions(+)
diff --git a/block.c b/block.c
index 01b66d8..fea6904 100644
--- a/block.c
+++ b/block.c
@@ -306,6 +306,7 @@ BlockDriverState *bdrv_new(const char *device_name)
bdrv_iostatus_disable(bs);
notifier_list_init(&bs->close_notifiers);
notifier_with_return_list_init(&bs->before_write_notifiers);
+ bs->refcnt = 1;
return bs;
}
@@ -1517,6 +1518,9 @@ static void bdrv_move_feature_fields(BlockDriverState *bs_dest,
/* dirty bitmap */
bs_dest->dirty_bitmap = bs_src->dirty_bitmap;
+ /* reference count */
+ bs_dest->refcnt = bs_src->refcnt;
+
/* job */
bs_dest->in_use = bs_src->in_use;
bs_dest->job = bs_src->job;
@@ -4391,6 +4395,23 @@ int64_t bdrv_get_dirty_count(BlockDriverState *bs)
}
}
+/* Get a reference to bs */
+void bdrv_ref(BlockDriverState *bs)
+{
+ bs->refcnt++;
+}
+
+/* Release a previously grabbed reference to bs.
+ * If after releasing, reference count is zero, the BlockDriverState is
+ * deleted. */
+void bdrv_unref(BlockDriverState *bs)
+{
+ assert(bs->refcnt > 0);
+ if (--bs->refcnt == 0) {
+ bdrv_delete(bs);
+ }
+}
+
void bdrv_set_in_use(BlockDriverState *bs, int in_use)
{
assert(bs->in_use != in_use);
diff --git a/include/block/block.h b/include/block/block.h
index 742fce5..b33ef62 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -356,6 +356,8 @@ int64_t bdrv_get_dirty_count(BlockDriverState *bs);
void bdrv_enable_copy_on_read(BlockDriverState *bs);
void bdrv_disable_copy_on_read(BlockDriverState *bs);
+void bdrv_ref(BlockDriverState *bs);
+void bdrv_unref(BlockDriverState *bs);
void bdrv_set_in_use(BlockDriverState *bs, int in_use);
int bdrv_in_use(BlockDriverState *bs);
diff --git a/include/block/block_int.h b/include/block/block_int.h
index e45f2a0..1f85cfb 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -294,6 +294,7 @@ struct BlockDriverState {
BlockDeviceIoStatus iostatus;
char device_name[32];
HBitmap *dirty_bitmap;
+ int refcnt;
int in_use; /* users other than guest access, eg. block migration */
QTAILQ_ENTRY(BlockDriverState) list;
--
1.8.3.1
next prev parent reply other threads:[~2013-08-23 1:15 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-23 1:14 [Qemu-devel] [PATCH v6 0/8] Implement reference count for BlockDriverState Fam Zheng
2013-08-23 1:14 ` [Qemu-devel] [PATCH v6 1/8] vvfat: use bdrv_new() to allocate BlockDriverState Fam Zheng
2013-08-23 1:14 ` [Qemu-devel] [PATCH v6 2/8] iscsi: use bdrv_new() instead of stack structure Fam Zheng
2013-08-23 1:14 ` Fam Zheng [this message]
2013-08-23 16:12 ` [Qemu-devel] [PATCH v6 3/8] block: implement reference count for BlockDriverState Jeff Cody
2013-08-26 1:15 ` Fam Zheng
2013-08-23 1:14 ` [Qemu-devel] [PATCH v6 4/8] block: make bdrv_delete() static Fam Zheng
2013-08-23 1:14 ` [Qemu-devel] [PATCH v6 5/8] migration: omit drive ref as we have bdrv_ref now Fam Zheng
2013-08-23 1:14 ` [Qemu-devel] [PATCH v6 6/8] xen_disk: simplify blk_disconnect with refcnt Fam Zheng
2013-08-23 1:14 ` [Qemu-devel] [PATCH v6 7/8] nbd: use BlockDriverState refcnt Fam Zheng
2013-08-23 1:14 ` [Qemu-devel] [PATCH v6 8/8] block: use BDS ref for block jobs Fam Zheng
2013-09-04 13:52 ` [Qemu-devel] [PATCH v6 0/8] Implement reference count for BlockDriverState Stefan Hajnoczi
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=1377220491-19954-4-git-send-email-famz@redhat.com \
--to=famz@redhat.com \
--cc=jcody@redhat.com \
--cc=kwolf@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=xiawenc@linux.vnet.ibm.com \
/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).