From ddc978550db144aa44098cd00c87d1436a78dd1b Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Wed, 14 Oct 2009 10:39:25 +0200 Subject: QemuOpts: add find_list() Factor out the QemuOptsList search code for upcoming users. Signed-off-by: Gerd Hoffmann Signed-off-by: Anthony Liguori --- qemu-config.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) (limited to 'qemu-config.c') diff --git a/qemu-config.c b/qemu-config.c index d83d2a6..cb2c213 100644 --- a/qemu-config.c +++ b/qemu-config.c @@ -212,11 +212,26 @@ static QemuOptsList *lists[] = { NULL, }; +static QemuOptsList *find_list(const char *group) +{ + int i; + + for (i = 0; lists[i] != NULL; i++) { + if (strcmp(lists[i]->name, group) == 0) + break; + } + if (lists[i] == NULL) { + qemu_error("there is no option group \"%s\"\n", group); + } + return lists[i]; +} + int qemu_set_option(const char *str) { char group[64], id[64], arg[64]; + QemuOptsList *list; QemuOpts *opts; - int i, rc, offset; + int rc, offset; rc = sscanf(str, "%63[^.].%63[^.].%63[^=]%n", group, id, arg, &offset); if (rc < 3 || str[offset] != '=') { @@ -224,19 +239,15 @@ int qemu_set_option(const char *str) return -1; } - for (i = 0; lists[i] != NULL; i++) { - if (strcmp(lists[i]->name, group) == 0) - break; - } - if (lists[i] == NULL) { - qemu_error("there is no option group \"%s\"\n", group); + list = find_list(group); + if (list == NULL) { return -1; } - opts = qemu_opts_find(lists[i], id); + opts = qemu_opts_find(list, id); if (!opts) { qemu_error("there is no %s \"%s\" defined\n", - lists[i]->name, id); + list->name, id); return -1; } -- cgit v1.1