commit d013283a46e1f197594e76ed320f867067ab80b3
author Juan Quintela <quintela@redhat.com> Wed Apr 03 13:49:51 2019 +0200
committer Dr. David Alan Gilbert <dgilbert@redhat.com> Fri Apr 05 15:32:13 2019 +0100
tree 5d96aad165c6ce872f1182856570dbfa9d594afc
parent c6e5bafb6ff330e972eae7b823321143ab3e29e2

migration: Fix migrate_set_parameter

Otherwise we are setting err twice, what is wrong and causes an abort.

Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20190403114958.3705-2-quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

hmp.c

diff --git a/hmp.c b/hmp.c
index 9294114..8eec768 100644
--- a/hmp.c
+++ b/hmp.c
@@ -1825,8 +1825,10 @@
     case MIGRATION_PARAMETER_XBZRLE_CACHE_SIZE:
         p->has_xbzrle_cache_size = true;
         visit_type_size(v, param, &cache_size, &err);
-        if (err || cache_size > INT64_MAX
-            || (size_t)cache_size != cache_size) {
+        if (err) {
+            break;
+        }
+        if (cache_size > INT64_MAX || (size_t)cache_size != cache_size) {
             error_setg(&err, "Invalid size %s", valuestr);
             break;
         }