mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gluster.c: replace QEMUOptionParameter with QemuOpts

Browse Source 
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
Signed-off-by: Chunyan Liu <cyliu@suse.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Chunyan Liu 2014-06-05 17:20:54 +08:00 committed by Stefan Hajnoczi
parent 25814e8987
commit 90c772de56
1 changed files with 42 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
block/gluster.c
View File

@ -478,13 +478,14 @@ static inline int qemu_gluster_zerofill(struct glfs_fd *fd, int64_t offset,
#endif #endif
static int qemu_gluster_create(const char *filename, static int qemu_gluster_create(const char *filename,
QEMUOptionParameter *options, Error **errp) QemuOpts *opts, Error **errp)
{ {
struct glfs *glfs; struct glfs *glfs;
struct glfs_fd *fd; struct glfs_fd *fd;
int ret = 0; int ret = 0;
int prealloc = 0; int prealloc = 0;
int64_t total_size = 0; int64_t total_size = 0;
char *tmp = NULL;
GlusterConf *gconf = g_malloc0(sizeof(GlusterConf)); GlusterConf *gconf = g_malloc0(sizeof(GlusterConf));
glfs = qemu_gluster_init(gconf, filename, errp); glfs = qemu_gluster_init(gconf, filename, errp);
@ -493,25 +494,22 @@ static int qemu_gluster_create(const char *filename,
goto out; goto out;
} }
while (options && options->name) { total_size =
if (!strcmp(options->name, BLOCK_OPT_SIZE)) { qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0) / BDRV_SECTOR_SIZE;
total_size = options->value.n / BDRV_SECTOR_SIZE;
} else if (!strcmp(options->name, BLOCK_OPT_PREALLOC)) { tmp = qemu_opt_get_del(opts, BLOCK_OPT_PREALLOC);
if (!options->value.s || !strcmp(options->value.s, "off")) { if (!tmp || !strcmp(tmp, "off")) {
prealloc = 0; prealloc = 0;
} else if (!strcmp(options->value.s, "full") && } else if (!strcmp(tmp, "full") &&
gluster_supports_zerofill()) { gluster_supports_zerofill()) {
prealloc = 1; prealloc = 1;
} else { } else {
error_setg(errp, "Invalid preallocation mode: '%s'" error_setg(errp, "Invalid preallocation mode: '%s'"
" or GlusterFS doesn't support zerofill API", " or GlusterFS doesn't support zerofill API",
options->value.s); tmp);
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
} }
}
options++;
}
fd = glfs_creat(glfs, gconf->image, fd = glfs_creat(glfs, gconf->image,
O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, S_IRUSR | S_IWUSR); O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, S_IRUSR | S_IWUSR);
@ -532,6 +530,7 @@ static int qemu_gluster_create(const char *filename,
} }
} }
out: out:
g_free(tmp);
qemu_gluster_gconf_free(gconf); qemu_gluster_gconf_free(gconf);
if (glfs) { if (glfs) {
glfs_fini(glfs); glfs_fini(glfs);
@ -698,18 +697,22 @@ static int qemu_gluster_has_zero_init(BlockDriverState *bs)
return 0; return 0;
} }
static QEMUOptionParameter qemu_gluster_create_options[] = { static QemuOptsList qemu_gluster_create_opts = {
.name = "qemu-gluster-create-opts",
.head = QTAILQ_HEAD_INITIALIZER(qemu_gluster_create_opts.head),
.desc = {
{ {
.name = BLOCK_OPT_SIZE, .name = BLOCK_OPT_SIZE,
.type = OPT_SIZE, .type = QEMU_OPT_SIZE,
.help = "Virtual disk size" .help = "Virtual disk size"
}, },
{ {
.name = BLOCK_OPT_PREALLOC, .name = BLOCK_OPT_PREALLOC,
.type = OPT_STRING, .type = QEMU_OPT_STRING,
.help = "Preallocation mode (allowed values: off, full)" .help = "Preallocation mode (allowed values: off, full)"
}, },
{ NULL } { /* end of list */ }
}
}; };
static BlockDriver bdrv_gluster = { static BlockDriver bdrv_gluster = {
@ -722,7 +725,7 @@ static BlockDriver bdrv_gluster = {
.bdrv_reopen_commit = qemu_gluster_reopen_commit, .bdrv_reopen_commit = qemu_gluster_reopen_commit,
.bdrv_reopen_abort = qemu_gluster_reopen_abort, .bdrv_reopen_abort = qemu_gluster_reopen_abort,
.bdrv_close = qemu_gluster_close, .bdrv_close = qemu_gluster_close,
.bdrv_create = qemu_gluster_create, .bdrv_create2 = qemu_gluster_create,
.bdrv_getlength = qemu_gluster_getlength, .bdrv_getlength = qemu_gluster_getlength,
.bdrv_get_allocated_file_size = qemu_gluster_allocated_file_size, .bdrv_get_allocated_file_size = qemu_gluster_allocated_file_size,
.bdrv_truncate = qemu_gluster_truncate, .bdrv_truncate = qemu_gluster_truncate,
@ -736,7 +739,7 @@ static BlockDriver bdrv_gluster = {
#ifdef CONFIG_GLUSTERFS_ZEROFILL #ifdef CONFIG_GLUSTERFS_ZEROFILL
.bdrv_co_write_zeroes = qemu_gluster_co_write_zeroes, .bdrv_co_write_zeroes = qemu_gluster_co_write_zeroes,
#endif #endif
.create_options = qemu_gluster_create_options, .create_opts = &qemu_gluster_create_opts,
}; };
static BlockDriver bdrv_gluster_tcp = { static BlockDriver bdrv_gluster_tcp = {
@ -749,7 +752,7 @@ static BlockDriver bdrv_gluster_tcp = {
.bdrv_reopen_commit = qemu_gluster_reopen_commit, .bdrv_reopen_commit = qemu_gluster_reopen_commit,
.bdrv_reopen_abort = qemu_gluster_reopen_abort, .bdrv_reopen_abort = qemu_gluster_reopen_abort,
.bdrv_close = qemu_gluster_close, .bdrv_close = qemu_gluster_close,
.bdrv_create = qemu_gluster_create, .bdrv_create2 = qemu_gluster_create,
.bdrv_getlength = qemu_gluster_getlength, .bdrv_getlength = qemu_gluster_getlength,
.bdrv_get_allocated_file_size = qemu_gluster_allocated_file_size, .bdrv_get_allocated_file_size = qemu_gluster_allocated_file_size,
.bdrv_truncate = qemu_gluster_truncate, .bdrv_truncate = qemu_gluster_truncate,
@ -763,7 +766,7 @@ static BlockDriver bdrv_gluster_tcp = {
#ifdef CONFIG_GLUSTERFS_ZEROFILL #ifdef CONFIG_GLUSTERFS_ZEROFILL
.bdrv_co_write_zeroes = qemu_gluster_co_write_zeroes, .bdrv_co_write_zeroes = qemu_gluster_co_write_zeroes,
#endif #endif
.create_options = qemu_gluster_create_options, .create_opts = &qemu_gluster_create_opts,
}; };
static BlockDriver bdrv_gluster_unix = { static BlockDriver bdrv_gluster_unix = {
@ -776,7 +779,7 @@ static BlockDriver bdrv_gluster_unix = {
.bdrv_reopen_commit = qemu_gluster_reopen_commit, .bdrv_reopen_commit = qemu_gluster_reopen_commit,
.bdrv_reopen_abort = qemu_gluster_reopen_abort, .bdrv_reopen_abort = qemu_gluster_reopen_abort,
.bdrv_close = qemu_gluster_close, .bdrv_close = qemu_gluster_close,
.bdrv_create = qemu_gluster_create, .bdrv_create2 = qemu_gluster_create,
.bdrv_getlength = qemu_gluster_getlength, .bdrv_getlength = qemu_gluster_getlength,
.bdrv_get_allocated_file_size = qemu_gluster_allocated_file_size, .bdrv_get_allocated_file_size = qemu_gluster_allocated_file_size,
.bdrv_truncate = qemu_gluster_truncate, .bdrv_truncate = qemu_gluster_truncate,
@ -790,7 +793,7 @@ static BlockDriver bdrv_gluster_unix = {
#ifdef CONFIG_GLUSTERFS_ZEROFILL #ifdef CONFIG_GLUSTERFS_ZEROFILL
.bdrv_co_write_zeroes = qemu_gluster_co_write_zeroes, .bdrv_co_write_zeroes = qemu_gluster_co_write_zeroes,
#endif #endif
.create_options = qemu_gluster_create_options, .create_opts = &qemu_gluster_create_opts,
}; };
static BlockDriver bdrv_gluster_rdma = { static BlockDriver bdrv_gluster_rdma = {
@ -803,7 +806,7 @@ static BlockDriver bdrv_gluster_rdma = {
.bdrv_reopen_commit = qemu_gluster_reopen_commit, .bdrv_reopen_commit = qemu_gluster_reopen_commit,
.bdrv_reopen_abort = qemu_gluster_reopen_abort, .bdrv_reopen_abort = qemu_gluster_reopen_abort,
.bdrv_close = qemu_gluster_close, .bdrv_close = qemu_gluster_close,
.bdrv_create = qemu_gluster_create, .bdrv_create2 = qemu_gluster_create,
.bdrv_getlength = qemu_gluster_getlength, .bdrv_getlength = qemu_gluster_getlength,
.bdrv_get_allocated_file_size = qemu_gluster_allocated_file_size, .bdrv_get_allocated_file_size = qemu_gluster_allocated_file_size,
.bdrv_truncate = qemu_gluster_truncate, .bdrv_truncate = qemu_gluster_truncate,
@ -817,7 +820,7 @@ static BlockDriver bdrv_gluster_rdma = {
#ifdef CONFIG_GLUSTERFS_ZEROFILL #ifdef CONFIG_GLUSTERFS_ZEROFILL
.bdrv_co_write_zeroes = qemu_gluster_co_write_zeroes, .bdrv_co_write_zeroes = qemu_gluster_co_write_zeroes,
#endif #endif
.create_options = qemu_gluster_create_options, .create_opts = &qemu_gluster_create_opts,
}; };
static void bdrv_gluster_init(void) static void bdrv_gluster_init(void)