aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--migration.c18
-rw-r--r--qemu-monitor.hx2
2 files changed, 4 insertions, 16 deletions
diff --git a/migration.c b/migration.c
index 598f8df5c4..6abdc65149 100644
--- a/migration.c
+++ b/migration.c
@@ -109,23 +109,11 @@ void do_migrate_cancel(Monitor *mon, const QDict *qdict, QObject **ret_data)
void do_migrate_set_speed(Monitor *mon, const QDict *qdict)
{
double d;
- char *ptr;
FdMigrationState *s;
- const char *value = qdict_get_str(qdict, "value");
-
- d = strtod(value, &ptr);
- switch (*ptr) {
- case 'G': case 'g':
- d *= 1024;
- case 'M': case 'm':
- d *= 1024;
- case 'K': case 'k':
- d *= 1024;
- default:
- break;
- }
- max_throttle = (uint32_t)d;
+ d = qdict_get_double(qdict, "value");
+ d = MAX(0, MIN(UINT32_MAX, d));
+ max_throttle = d;
s = migrate_to_fms(current_migration);
if (s && s->file) {
diff --git a/qemu-monitor.hx b/qemu-monitor.hx
index b51bb47f25..b30301e7d5 100644
--- a/qemu-monitor.hx
+++ b/qemu-monitor.hx
@@ -761,7 +761,7 @@ ETEXI
{
.name = "migrate_set_speed",
- .args_type = "value:s",
+ .args_type = "value:b",
.params = "value",
.help = "set maximum speed (in bytes) for migrations",
.mhandler.cmd = do_migrate_set_speed,