aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2009-07-22 16:43:01 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-07-27 14:08:23 -0500
commit67b1355b74525fbe2bb38d80639148b1ee912acd (patch)
tree0c55c5d33fb5b9f17dfd1efa3d559f2ea1810ef1
parent62c5802efdabe2a24ca9680a1ab9dcbbfbaf43d2 (diff)
qemu-option: factor out parse_option_bool
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--qemu-option.c34
1 files changed, 22 insertions, 12 deletions
diff --git a/qemu-option.c b/qemu-option.c
index bb2a09e121..8aac6aeba0 100644
--- a/qemu-option.c
+++ b/qemu-option.c
@@ -165,6 +165,23 @@ QEMUOptionParameter *get_option_parameter(QEMUOptionParameter *list,
return NULL;
}
+static int parse_option_bool(const char *name, const char *value, int *ret)
+{
+ if (value != NULL) {
+ if (!strcmp(value, "on")) {
+ *ret = 1;
+ } else if (!strcmp(value, "off")) {
+ *ret = 0;
+ } else {
+ fprintf(stderr, "Option '%s': Use 'on' or 'off'\n", name);
+ return -1;
+ }
+ } else {
+ *ret = 1;
+ }
+ return 0;
+}
+
/*
* Sets the value of a parameter in a given option list. The parsing of the
* value depends on the type of option:
@@ -185,6 +202,8 @@ QEMUOptionParameter *get_option_parameter(QEMUOptionParameter *list,
int set_option_parameter(QEMUOptionParameter *list, const char *name,
const char *value)
{
+ int flag;
+
// Find a matching parameter
list = get_option_parameter(list, name);
if (list == NULL) {
@@ -195,18 +214,9 @@ int set_option_parameter(QEMUOptionParameter *list, const char *name,
// Process parameter
switch (list->type) {
case OPT_FLAG:
- if (value != NULL) {
- if (!strcmp(value, "on")) {
- list->value.n = 1;
- } else if (!strcmp(value, "off")) {
- list->value.n = 0;
- } else {
- fprintf(stderr, "Option '%s': Use 'on' or 'off'\n", name);
- return -1;
- }
- } else {
- list->value.n = 1;
- }
+ if (-1 == parse_option_bool(name, value, &flag))
+ return -1;
+ list->value.n = flag;
break;
case OPT_STRING: