summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAshijeet Acharya <ashijeetacharya@gmail.com>2016-09-10 02:43:17 +0530
committerJuan Quintela <quintela@trasno.org>2016-10-13 17:23:53 +0200
commit091ecc8b69bd735383e171828d4e8ed5e34c2a3b (patch)
tree7bc2456e93a6b09ee59fd0a7941ee117e60ace94
parent7f375e0446bb3ce1cbb93b3e145452ec42bb2041 (diff)
downloadqemu-091ecc8b69bd735383e171828d4e8ed5e34c2a3b.zip
migrate: Fix bounds check for migration parameters in migration.c
This patch fixes the out-of-bounds check of migration parameters in qmp_migrate_set_parameters() for cpu-throttle-initial and cpu-throttle-increment by adding a return statement for both as they were broken since their introduction in 2.5 via commit 1626fee. Due to the missing return statements, parameters were getting set to out-of-bounds values despite the error. Signed-off-by: Ashijeet Acharya <ashijeetacharya@gmail.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Amit Shah <amit.shah@redhat.com> Reviewed-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Juan Quintela <quintela@redhat.com>
-rw-r--r--migration/migration.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/migration/migration.c b/migration/migration.c
index 42336e3bfd..04b706f69e 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -796,6 +796,7 @@ void qmp_migrate_set_parameters(MigrationParameters *params, Error **errp)
error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
"cpu_throttle_initial",
"an integer in the range of 1 to 99");
+ return;
}
if (params->has_cpu_throttle_increment &&
(params->cpu_throttle_increment < 1 ||
@@ -803,6 +804,7 @@ void qmp_migrate_set_parameters(MigrationParameters *params, Error **errp)
error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
"cpu_throttle_increment",
"an integer in the range of 1 to 99");
+ return;
}
if (params->has_compress_level) {