mirror of https://github.com/xemu-project/xemu.git
Add support for 'o' octet (bytes) format as monitor parameter.
Octet format relies on strtosz which supports K/k, M/m, G/g, T/t suffixes and unit support for humans, like 1.3G Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
9f9b17a4f0
commit
dbc0c67faf
29
monitor.c
29
monitor.c
|
@ -78,6 +78,11 @@
|
|||
* 'l' target long (32 or 64 bit)
|
||||
* 'M' just like 'l', except in user mode the value is
|
||||
* multiplied by 2^20 (think Mebibyte)
|
||||
* 'o' octets (aka bytes)
|
||||
* user mode accepts an optional T, t, G, g, M, m, K, k
|
||||
* suffix, which multiplies the value by 2^40 for
|
||||
* suffixes T and t, 2^30 for suffixes G and g, 2^20 for
|
||||
* M and m, 2^10 for K and k
|
||||
* 'f' double
|
||||
* user mode accepts an optional G, g, M, m, K, k suffix,
|
||||
* which multiplies the value by 2^30 for suffixes G and
|
||||
|
@ -3703,6 +3708,29 @@ static const mon_cmd_t *monitor_parse_command(Monitor *mon,
|
|||
qdict_put(qdict, key, qint_from_int(val));
|
||||
}
|
||||
break;
|
||||
case 'o':
|
||||
{
|
||||
ssize_t val;
|
||||
char *end;
|
||||
|
||||
while (qemu_isspace(*p)) {
|
||||
p++;
|
||||
}
|
||||
if (*typestr == '?') {
|
||||
typestr++;
|
||||
if (*p == '\0') {
|
||||
break;
|
||||
}
|
||||
}
|
||||
val = strtosz(p, &end);
|
||||
if (val < 0) {
|
||||
monitor_printf(mon, "invalid size\n");
|
||||
goto fail;
|
||||
}
|
||||
qdict_put(qdict, key, qint_from_int(val));
|
||||
p = end;
|
||||
}
|
||||
break;
|
||||
case 'f':
|
||||
case 'T':
|
||||
{
|
||||
|
@ -4205,6 +4233,7 @@ static int check_client_args_type(const QDict *client_args,
|
|||
case 'i':
|
||||
case 'l':
|
||||
case 'M':
|
||||
case 'o':
|
||||
if (qobject_type(client_arg) != QTYPE_QINT) {
|
||||
qerror_report(QERR_INVALID_PARAMETER_TYPE, client_arg_name,
|
||||
"int");
|
||||
|
|
Loading…
Reference in New Issue