OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

quorum: Simplify quorum_open() 

Although it may not look like it, this patch simplifies quorum_open().
qdict_array_split() is now able to return QLists with different objects
than only QDicts, therefore it will now do all the work and
quorum_open() does not have to handle reference strings by itself.

This allows mixing full option dicts and reference strings for
specifying the child block devices of quorum; furthermore, it improves
handling of malformed specifications.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Benoit Canet <benoit@irqsave.net>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Max Reitz 2014-02-21 22:30:37 +01:00 committed by Kevin Wolf
parent c7fc5bc2a4
commit 8a87f3d722
1 changed files with 39 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
block/quorum.c
View File

@ -720,7 +720,6 @@ static int quorum_open(BlockDriverState *bs, QDict *options, int flags,
QDict *sub = NULL; QDict *sub = NULL;
QList *list = NULL; QList *list = NULL;
const QListEntry *lentry; const QListEntry *lentry;
const QDictEntry *dentry;
int i; int i;
int ret = 0; int ret = 0;
@ -728,10 +727,15 @@ static int quorum_open(BlockDriverState *bs, QDict *options, int flags,
qdict_extract_subqdict(options, &sub, "children."); qdict_extract_subqdict(options, &sub, "children.");
qdict_array_split(sub, &list); qdict_array_split(sub, &list);
/* count how many different children are present and validate if (qdict_size(sub)) {
* qdict_size(sub) address the open by reference case error_setg(&local_err, "Invalid option children.%s",
*/ qdict_first(sub)->key);
s->num_children = !qlist_size(list) ? qdict_size(sub) : qlist_size(list); ret = -EINVAL;
goto exit;
}
/* count how many different children are present */
s->num_children = qlist_size(list);
if (s->num_children < 2) { if (s->num_children < 2) {
error_setg(&local_err, error_setg(&local_err,
"Number of provided children must be greater than 1"); "Number of provided children must be greater than 1");
@ -767,30 +771,38 @@ static int quorum_open(BlockDriverState *bs, QDict *options, int flags,
s->bs = g_new0(BlockDriverState *, s->num_children); s->bs = g_new0(BlockDriverState *, s->num_children);
opened = g_new0(bool, s->num_children); opened = g_new0(bool, s->num_children);
/* Open by file name or options dict (command line or QMP) */ for (i = 0, lentry = qlist_first(list); lentry;
if (s->num_children == qlist_size(list)) { lentry = qlist_next(lentry), i++) {
for (i = 0, lentry = qlist_first(list); lentry; QDict *d;
lentry = qlist_next(lentry), i++) { QString *string;
QDict *d = qobject_to_qdict(lentry->value);
QINCREF(d); switch (qobject_type(lentry->value))
ret = bdrv_open(&s->bs[i], NULL, NULL, d, flags, NULL, &local_err); {
if (ret < 0) { /* List of options */
goto close_exit; case QTYPE_QDICT:
} d = qobject_to_qdict(lentry->value);
opened[i] = true; QINCREF(d);
ret = bdrv_open(&s->bs[i], NULL, NULL, d, flags, NULL,
&local_err);
break;
/* QMP reference */
case QTYPE_QSTRING:
string = qobject_to_qstring(lentry->value);
ret = bdrv_open(&s->bs[i], NULL, qstring_get_str(string), NULL,
flags, NULL, &local_err);
break;
default:
error_setg(&local_err, "Specification of child block device %i "
"is invalid", i);
ret = -EINVAL;
} }
/* Open by QMP references */
} else { if (ret < 0) {
for (i = 0, dentry = qdict_first(sub); dentry; goto close_exit;
dentry = qdict_next(sub, dentry), i++) {
QString *string = qobject_to_qstring(dentry->value);
ret = bdrv_open(&s->bs[i], NULL, qstring_get_str(string), NULL,
flags, NULL, &local_err);
if (ret < 0) {
goto close_exit;
}
opened[i] = true;
} }
opened[i] = true;
} }
g_free(opened); g_free(opened);