[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/16] quorum: Use qapi_enum_parse() in quorum_open(
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 08/16] quorum: Use qapi_enum_parse() in quorum_open() |
Date: |
Thu, 24 Aug 2017 10:46:03 +0200 |
From: Marc-André Lureau <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
[Rebased, qemu_opt_get() factored out, commit message tweaked]
Cc: Alberto Garcia <address@hidden>
Reviewed-by: Alberto Garcia <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
block/quorum.c | 28 +++++++++-------------------
1 file changed, 9 insertions(+), 19 deletions(-)
diff --git a/block/quorum.c b/block/quorum.c
index d04da4f..cb66177 100644
--- a/block/quorum.c
+++ b/block/quorum.c
@@ -22,6 +22,7 @@
#include "qapi/qmp/qjson.h"
#include "qapi/qmp/qlist.h"
#include "qapi/qmp/qstring.h"
+#include "qapi/util.h"
#include "qapi-event.h"
#include "crypto/hash.h"
@@ -867,30 +868,13 @@ static QemuOptsList quorum_runtime_opts = {
},
};
-static int parse_read_pattern(const char *opt)
-{
- int i;
-
- if (!opt) {
- /* Set quorum as default */
- return QUORUM_READ_PATTERN_QUORUM;
- }
-
- for (i = 0; i < QUORUM_READ_PATTERN__MAX; i++) {
- if (!strcmp(opt, QuorumReadPattern_lookup[i])) {
- return i;
- }
- }
-
- return -EINVAL;
-}
-
static int quorum_open(BlockDriverState *bs, QDict *options, int flags,
Error **errp)
{
BDRVQuorumState *s = bs->opaque;
Error *local_err = NULL;
QemuOpts *opts = NULL;
+ const char *pattern_str;
bool *opened;
int i;
int ret = 0;
@@ -925,7 +909,13 @@ static int quorum_open(BlockDriverState *bs, QDict
*options, int flags,
goto exit;
}
- ret = parse_read_pattern(qemu_opt_get(opts, QUORUM_OPT_READ_PATTERN));
+ pattern_str = qemu_opt_get(opts, QUORUM_OPT_READ_PATTERN);
+ if (!pattern_str) {
+ ret = QUORUM_READ_PATTERN_QUORUM;
+ } else {
+ ret = qapi_enum_parse(QuorumReadPattern_lookup, pattern_str,
+ -EINVAL, NULL);
+ }
if (ret < 0) {
error_setg(&local_err, "Please set read-pattern as fifo or quorum");
goto exit;
--
2.7.5
- [Qemu-devel] [PATCH 00/16] qapi: Rework mapping of enum value to string, Markus Armbruster, 2017/08/24
- [Qemu-devel] [PATCH 10/16] qapi: Use qapi_enum_parse() in input_type_enum(), Markus Armbruster, 2017/08/24
- [Qemu-devel] [PATCH 14/16] qapi: Convert indirect uses of FOO_lookup[...] to qapi_enum_lookup(), Markus Armbruster, 2017/08/24
- [Qemu-devel] [PATCH 12/16] qapi: Generate FOO_str() macro for QAPI enum FOO, Markus Armbruster, 2017/08/24
- [Qemu-devel] [PATCH 08/16] quorum: Use qapi_enum_parse() in quorum_open(),
Markus Armbruster <=
- [Qemu-devel] [PATCH 16/16] qapi: drop the sentinel in enum array, Markus Armbruster, 2017/08/24
- [Qemu-devel] [PATCH 11/16] qapi: Avoid unnecessary use of enum lookup table's sentinel, Markus Armbruster, 2017/08/24
- [Qemu-devel] [PATCH 04/16] tpm: Clean up model registration & lookup, Markus Armbruster, 2017/08/24
- [Qemu-devel] [PATCH 01/16] qapi: Update qapi-code-gen.txt examples to match current code, Markus Armbruster, 2017/08/24