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

Switch migrate_set_speed() to take an 'o' argument rather than a float.

Browse Source 
Clarify default value of MB in migration speed argument in monitor, if
no suffix is specified. This differ from previous default of bytes,
but is consistent with the rest of the places where we accept a size
argument.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Jes Sorensen 2010-10-21 17:15:48 +02:00 committed by Anthony Liguori
parent dbc0c67faf
commit ed3d4a8075
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hmp-commands.hx
View File

@ -754,9 +754,10 @@ ETEXI
{ {
.name = "migrate_set_speed", .name = "migrate_set_speed",
.args_type = "value:f", .args_type = "value:o",
.params = "value", .params = "value",
.help = "set maximum speed (in bytes) for migrations", .help = "set maximum speed (in bytes) for migrations. "
"Defaults to MB if no size suffix is specified, ie. B/K/M/G/T",
.user_print = monitor_user_noop, .user_print = monitor_user_noop,
.mhandler.cmd_new = do_migrate_set_speed, .mhandler.cmd_new = do_migrate_set_speed,
}, },

4
migration.c
View File

@ -132,10 +132,10 @@ int do_migrate_cancel(Monitor *mon, const QDict *qdict, QObject **ret_data)
int do_migrate_set_speed(Monitor *mon, const QDict *qdict, QObject **ret_data) int do_migrate_set_speed(Monitor *mon, const QDict *qdict, QObject **ret_data)
{ {
double d; int64_t d;
FdMigrationState *s; FdMigrationState *s;
d = qdict_get_double(qdict, "value"); d = qdict_get_int(qdict, "value");
d = MAX(0, MIN(UINT32_MAX, d)); d = MAX(0, MIN(UINT32_MAX, d));
max_throttle = d; max_throttle = d;