BlockdevOptionsRbd member auth-supported is a list of struct
RbdAuthMethod, whose only member is enum RbdAuthSupport. There is no
reason for wrapping the enum in a struct. Delete the wrapper, and
rename the enum.
Signed-off-by: Markus Armbruster <arm...@redhat.com>
---
block/rbd.c | 2 +-
qapi/block-core.json | 15 ++-------------
2 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/block/rbd.c b/block/rbd.c
index 8ba0f79..f460d71 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -566,7 +566,7 @@ static char *rbd_auth(QDict *options)
int i;
for (i = 0;; i++) {
- sprintf(keybuf, "auth-supported.%d.auth", i);
+ sprintf(keybuf, "auth-supported.%d", i);
val = qdict_get(options, keybuf);
if (!val) {
break;
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 0f132fc..fe1e40f 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -2601,25 +2601,14 @@
##
-# @RbdAuthSupport:
-#
-# An enumeration of RBD auth support
-#
-# Since: 2.9
-##
-{ 'enum': 'RbdAuthSupport',
- 'data': [ 'cephx', 'none' ] }
-
-
-##
# @RbdAuthMethod:
#
# An enumeration of rados auth_supported types
#
# Since: 2.9
##
-{ 'struct': 'RbdAuthMethod',
- 'data': { 'auth': 'RbdAuthSupport' } }
+{ 'enum': 'RbdAuthMethod',
+ 'data': [ 'cephx', 'none' ] }
##
# @BlockdevOptionsRbd:
--
2.7.4
