[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/8] iscsi: use bdrv_new() instead of stack structur
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH 2/8] iscsi: use bdrv_new() instead of stack structure |
Date: |
Thu, 25 Jul 2013 17:01:40 +0800 |
BlockDriverState structure needs bdrv_new() to initialize refcnt, don't
allocate a local structure variable and memset to 0, becasue with coming
refcnt implementation, bdrv_unref will crash if bs->refcnt not
initialized to 1.
Signed-off-by: Fam Zheng <address@hidden>
---
block/iscsi.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/block/iscsi.c b/block/iscsi.c
index 5f28c6a..db8a699 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -1247,11 +1247,11 @@ static int iscsi_create(const char *filename,
QEMUOptionParameter *options)
{
int ret = 0;
int64_t total_size = 0;
- BlockDriverState bs;
+ BlockDriverState *bs;
IscsiLun *iscsilun = NULL;
QDict *bs_options;
- memset(&bs, 0, sizeof(BlockDriverState));
+ bs = bdrv_new("");
/* Read out options */
while (options && options->name) {
@@ -1261,12 +1261,12 @@ static int iscsi_create(const char *filename,
QEMUOptionParameter *options)
options++;
}
- bs.opaque = g_malloc0(sizeof(struct IscsiLun));
- iscsilun = bs.opaque;
+ bs->opaque = g_malloc0(sizeof(struct IscsiLun));
+ iscsilun = bs->opaque;
bs_options = qdict_new();
qdict_put(bs_options, "filename", qstring_from_str(filename));
- ret = iscsi_open(&bs, bs_options, 0);
+ ret = iscsi_open(bs, bs_options, 0);
QDECREF(bs_options);
if (ret != 0) {
@@ -1280,7 +1280,7 @@ static int iscsi_create(const char *filename,
QEMUOptionParameter *options)
ret = -ENODEV;
goto out;
}
- if (bs.total_sectors < total_size) {
+ if (bs->total_sectors < total_size) {
ret = -ENOSPC;
goto out;
}
@@ -1290,7 +1290,7 @@ out:
if (iscsilun->iscsi != NULL) {
iscsi_destroy_context(iscsilun->iscsi);
}
- g_free(bs.opaque);
+ bdrv_delete(bs);
return ret;
}
--
1.8.3.2
[Qemu-devel] [PATCH 2/8] iscsi: use bdrv_new() instead of stack structure,
Fam Zheng <=
[Qemu-devel] [PATCH 4/8] block: make bdrv_delete() static, Fam Zheng, 2013/07/25
[Qemu-devel] [PATCH 5/8] block: use BlockDriverState refcnt for device attach/detach, Fam Zheng, 2013/07/25
[Qemu-devel] [PATCH 6/8] migration: omit drive ref as we have bdrv_ref now, Fam Zheng, 2013/07/25
[Qemu-devel] [PATCH 7/8] xen_disk: simplify blk_disconnect with refcnt, Fam Zheng, 2013/07/25
[Qemu-devel] [PATCH 8/8] nbd: use BlockDriverState refcnt, Fam Zheng, 2013/07/25