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

qemu-option: parse_option_size(): use error_set()

Browse Source 
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Reviewed-By: Laszlo Ersek <lersek@redhat.com>
This commit is contained in:
Luiz Capitulino 2012-03-21 15:03:45 -03:00
parent cf62adfabf
commit ec7b2ccb4a
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
qemu-option.c
View File

@ -203,7 +203,8 @@ static void parse_option_number(const char *name, const char *value,
} }
} }
static int parse_option_size(const char *name, const char *value, uint64_t *ret) static void parse_option_size(const char *name, const char *value,
uint64_t *ret, Error **errp)
{ {
char *postfix; char *postfix;
double sizef; double sizef;
@ -229,16 +230,14 @@ static int parse_option_size(const char *name, const char *value, uint64_t *ret)
*ret = (uint64_t) sizef; *ret = (uint64_t) sizef;
break; break;
default: default:
qerror_report(QERR_INVALID_PARAMETER_VALUE, name, "a size"); error_set(errp, QERR_INVALID_PARAMETER_VALUE, name, "a size");
error_printf_unless_qmp("You may use k, M, G or T suffixes for " error_printf_unless_qmp("You may use k, M, G or T suffixes for "
"kilobytes, megabytes, gigabytes and terabytes.\n"); "kilobytes, megabytes, gigabytes and terabytes.\n");
return -1; return;
} }
} else { } else {
qerror_report(QERR_INVALID_PARAMETER_VALUE, name, "a size"); error_set(errp, QERR_INVALID_PARAMETER_VALUE, name, "a size");
return -1;
} }
return 0;
} }
/* /*
@ -290,8 +289,7 @@ int set_option_parameter(QEMUOptionParameter *list, const char *name,
break; break;
case OPT_SIZE: case OPT_SIZE:
if (parse_option_size(name, value, &list->value.n) == -1) parse_option_size(name, value, &list->value.n, &local_err);
return -1;
break; break;
default: default:
@ -602,7 +600,8 @@ static int qemu_opt_parse(QemuOpt *opt)
&local_err); &local_err);
break; break;
case QEMU_OPT_SIZE: case QEMU_OPT_SIZE:
return parse_option_size(opt->name, opt->str, &opt->value.uint); parse_option_size(opt->name, opt->str, &opt->value.uint, &local_err);
break;
default: default:
abort(); abort();
} }