Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-08-09 01:50:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

iscsi: use bdrv_new() instead of stack structure

Browse Source 
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 <famz@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Fam Zheng 2013-08-23 09:14:45 +08:00 committed by Stefan Hajnoczi
parent 3d34c6cd99
commit 13c91cb7e2
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
block/iscsi.c
View File

@ -1241,11 +1241,11 @@ static int iscsi_create(const char *filename, QEMUOptionParameter *options)
{ {
int ret = 0; int ret = 0;
int64_t total_size = 0; int64_t total_size = 0;
BlockDriverState bs; BlockDriverState *bs;
IscsiLun *iscsilun = NULL; IscsiLun *iscsilun = NULL;
QDict *bs_options; QDict *bs_options;
memset(&bs, 0, sizeof(BlockDriverState)); bs = bdrv_new("");
/* Read out options */ /* Read out options */
while (options && options->name) { while (options && options->name) {
@ -1255,12 +1255,12 @@ static int iscsi_create(const char *filename, QEMUOptionParameter *options)
options++; options++;
} }
bs.opaque = g_malloc0(sizeof(struct IscsiLun)); bs->opaque = g_malloc0(sizeof(struct IscsiLun));
iscsilun = bs.opaque; iscsilun = bs->opaque;
bs_options = qdict_new(); bs_options = qdict_new();
qdict_put(bs_options, "filename", qstring_from_str(filename)); 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); QDECREF(bs_options);
if (ret != 0) { if (ret != 0) {
@ -1274,7 +1274,7 @@ static int iscsi_create(const char *filename, QEMUOptionParameter *options)
ret = -ENODEV; ret = -ENODEV;
goto out; goto out;
} }
if (bs.total_sectors < total_size) { if (bs->total_sectors < total_size) {
ret = -ENOSPC; ret = -ENOSPC;
goto out; goto out;
} }
@ -1284,7 +1284,9 @@ out:
if (iscsilun->iscsi != NULL) { if (iscsilun->iscsi != NULL) {
iscsi_destroy_context(iscsilun->iscsi); iscsi_destroy_context(iscsilun->iscsi);
} }
g_free(bs.opaque); g_free(bs->opaque);
bs->opaque = NULL;
bdrv_delete(bs);
return ret; return ret;
} }