[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/4] QemuOpts: add find_list()
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 1/4] QemuOpts: add find_list() |
Date: |
Wed, 14 Oct 2009 10:39:25 +0200 |
Factor out the QemuOptsList search code for upcoming users.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
qemu-config.c | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/qemu-config.c b/qemu-config.c
index bafaea2..f02dd42 100644
--- a/qemu-config.c
+++ b/qemu-config.c
@@ -193,11 +193,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] != '=') {
@@ -205,19 +220,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;
}
--
1.6.2.5