diff options
| -rw-r--r-- | block/rbd.c | 38 |
1 files changed, 24 insertions, 14 deletions
diff --git a/block/rbd.c b/block/rbd.c index 2632533a06..b2afe0732f 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -294,14 +294,14 @@ static QemuOptsList runtime_opts = { .head = QTAILQ_HEAD_INITIALIZER(runtime_opts.head), .desc = { { - .name = "filename", + .name = "pool", .type = QEMU_OPT_STRING, - .help = "Specification of the rbd image", + .help = "Rados pool name", }, { - .name = "password-secret", + .name = "image", .type = QEMU_OPT_STRING, - .help = "ID of secret providing the password", + .help = "Image name in the pool", }, { .name = "conf", @@ -309,16 +309,6 @@ static QemuOptsList runtime_opts = { .help = "Rados config file location", }, { - .name = "pool", - .type = QEMU_OPT_STRING, - .help = "Rados pool name", - }, - { - .name = "image", - .type = QEMU_OPT_STRING, - .help = "Image name in the pool", - }, - { .name = "snapshot", .type = QEMU_OPT_STRING, .help = "Ceph snapshot name", @@ -329,6 +319,19 @@ static QemuOptsList runtime_opts = { .type = QEMU_OPT_STRING, .help = "Rados id name", }, + /* + * server.* and auth-supported.* extracted manually, see + * qemu_rbd_array_opts() + */ + { + .name = "password-secret", + .type = QEMU_OPT_STRING, + .help = "ID of secret providing the password", + }, + + /* + * Keys for qemu_rbd_parse_filename(), not in the QAPI schema + */ { /* * HACK: name starts with '=' so that qemu_opts_parse() @@ -338,6 +341,13 @@ static QemuOptsList runtime_opts = { .type = QEMU_OPT_STRING, .help = "Legacy rados key/value option parameters", }, + + /* + * The remainder aren't option keys, but option sub-sub-keys, + * so that qemu_rbd_array_opts() can abuse runtime_opts for + * its own purposes + * TODO clean this up + */ { .name = "host", .type = QEMU_OPT_STRING, |