[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 31/39] rbd.c: replace QEMUOptionParameter with QemuOp
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 31/39] rbd.c: replace QEMUOptionParameter with QemuOpts |
Date: |
Mon, 16 Jun 2014 19:23:55 +0800 |
From: Chunyan Liu <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Dong Xu Wang <address@hidden>
Signed-off-by: Chunyan Liu <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block/rbd.c | 63 +++++++++++++++++++++++++++++--------------------------------
1 file changed, 30 insertions(+), 33 deletions(-)
diff --git a/block/rbd.c b/block/rbd.c
index 93639f7..e15d312 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -289,8 +289,7 @@ static int qemu_rbd_set_conf(rados_t cluster, const char
*conf, Error **errp)
return ret;
}
-static int qemu_rbd_create(const char *filename, QEMUOptionParameter *options,
- Error **errp)
+static int qemu_rbd_create(const char *filename, QemuOpts *opts, Error **errp)
{
Error *local_err = NULL;
int64_t bytes = 0;
@@ -315,24 +314,18 @@ static int qemu_rbd_create(const char *filename,
QEMUOptionParameter *options,
}
/* Read out options */
- while (options && options->name) {
- if (!strcmp(options->name, BLOCK_OPT_SIZE)) {
- bytes = options->value.n;
- } else if (!strcmp(options->name, BLOCK_OPT_CLUSTER_SIZE)) {
- if (options->value.n) {
- objsize = options->value.n;
- if ((objsize - 1) & objsize) { /* not a power of 2? */
- error_setg(errp, "obj size needs to be power of 2");
- return -EINVAL;
- }
- if (objsize < 4096) {
- error_setg(errp, "obj size too small");
- return -EINVAL;
- }
- obj_order = ffs(objsize) - 1;
- }
+ bytes = qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0);
+ objsize = qemu_opt_get_size_del(opts, BLOCK_OPT_CLUSTER_SIZE, 0);
+ if (objsize) {
+ if ((objsize - 1) & objsize) { /* not a power of 2? */
+ error_setg(errp, "obj size needs to be power of 2");
+ return -EINVAL;
+ }
+ if (objsize < 4096) {
+ error_setg(errp, "obj size too small");
+ return -EINVAL;
}
- options++;
+ obj_order = ffs(objsize) - 1;
}
clientname = qemu_rbd_parse_clientname(conf, clientname_buf);
@@ -911,18 +904,22 @@ static BlockDriverAIOCB*
qemu_rbd_aio_discard(BlockDriverState *bs,
}
#endif
-static QEMUOptionParameter qemu_rbd_create_options[] = {
- {
- .name = BLOCK_OPT_SIZE,
- .type = OPT_SIZE,
- .help = "Virtual disk size"
- },
- {
- .name = BLOCK_OPT_CLUSTER_SIZE,
- .type = OPT_SIZE,
- .help = "RBD object size"
- },
- {NULL}
+static QemuOptsList qemu_rbd_create_opts = {
+ .name = "rbd-create-opts",
+ .head = QTAILQ_HEAD_INITIALIZER(qemu_rbd_create_opts.head),
+ .desc = {
+ {
+ .name = BLOCK_OPT_SIZE,
+ .type = QEMU_OPT_SIZE,
+ .help = "Virtual disk size"
+ },
+ {
+ .name = BLOCK_OPT_CLUSTER_SIZE,
+ .type = QEMU_OPT_SIZE,
+ .help = "RBD object size"
+ },
+ { /* end of list */ }
+ }
};
static BlockDriver bdrv_rbd = {
@@ -931,10 +928,10 @@ static BlockDriver bdrv_rbd = {
.bdrv_needs_filename = true,
.bdrv_file_open = qemu_rbd_open,
.bdrv_close = qemu_rbd_close,
- .bdrv_create = qemu_rbd_create,
+ .bdrv_create2 = qemu_rbd_create,
.bdrv_has_zero_init = bdrv_has_zero_init_1,
.bdrv_get_info = qemu_rbd_getinfo,
- .create_options = qemu_rbd_create_options,
+ .create_opts = &qemu_rbd_create_opts,
.bdrv_getlength = qemu_rbd_getlength,
.bdrv_truncate = qemu_rbd_truncate,
.protocol_name = "rbd",
--
1.9.3
- [Qemu-devel] [PULL 21/39] gluster.c: replace QEMUOptionParameter with QemuOpts, (continued)
- [Qemu-devel] [PULL 21/39] gluster.c: replace QEMUOptionParameter with QemuOpts, Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 22/39] iscsi.c: replace QEMUOptionParameter with QemuOpts, Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 23/39] nfs.c: replace QEMUOptionParameter with QemuOpts, Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 24/39] qcow.c: replace QEMUOptionParameter with QemuOpts, Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 25/39] QemuOpts: export qemu_opt_find, Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 26/39] qcow2.c: replace QEMUOptionParameter with QemuOpts, Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 27/39] qed.c: replace QEMUOptionParameter with QemuOpts, Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 28/39] raw-posix.c: replace QEMUOptionParameter with QemuOpts, Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 29/39] raw-win32.c: replace QEMUOptionParameter with QemuOpts, Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 30/39] raw_bsd.c: replace QEMUOptionParameter with QemuOpts, Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 31/39] rbd.c: replace QEMUOptionParameter with QemuOpts,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 32/39] sheepdog.c: replace QEMUOptionParameter with QemuOpts, Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 33/39] ssh.c: replace QEMUOptionParameter with QemuOpts, Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 34/39] vdi.c: replace QEMUOptionParameter with QemuOpts, Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 35/39] vhdx.c: replace QEMUOptionParameter with QemuOpts, Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 37/39] vpc.c: replace QEMUOptionParameter with QemuOpts, Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 38/39] cleanup QEMUOptionParameter, Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 39/39] QemuOpts: cleanup tmp 'allocated' member from QemuOptsList, Stefan Hajnoczi, 2014/06/16
- [Qemu-devel] [PULL 36/39] vmdk.c: replace QEMUOptionParameter with QemuOpts, Stefan Hajnoczi, 2014/06/16
- Re: [Qemu-devel] [PULL 00/39] Block patches, Peter Maydell, 2014/06/16