qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Dr. David Alan Gilbert (git)" <dgilbert@redhat.com>
To: qemu-devel@nongnu.org, chen.zhang@intel.com, quintela@redhat.com,
	peterx@redhat.com
Subject: [Qemu-devel] [PULL 2/2] migration: Fix migrate_set_parameter
Date: Fri,  5 Apr 2019 16:49:34 +0100	[thread overview]
Message-ID: <20190405154934.18664-3-dgilbert@redhat.com> (raw)
In-Reply-To: <20190405154934.18664-1-dgilbert@redhat.com>

From: Juan Quintela <quintela@redhat.com>

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 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/hmp.c b/hmp.c
index 92941142af..8eec768088 100644
--- a/hmp.c
+++ b/hmp.c
@@ -1825,8 +1825,10 @@ void hmp_migrate_set_parameter(Monitor *mon, const QDict *qdict)
     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;
         }
-- 
2.21.0

  parent reply	other threads:[~2019-04-05 15:49 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-05 15:49 [Qemu-devel] [PULL 0/2] migration queue Dr. David Alan Gilbert (git)
2019-04-05 15:49 ` Dr. David Alan Gilbert (git)
2019-04-05 15:49 ` [Qemu-devel] [PULL 1/2] migration/ram.c: Fix codes conflict about bitmap_mutex Dr. David Alan Gilbert (git)
2019-04-05 15:49   ` Dr. David Alan Gilbert (git)
2019-04-05 15:49 ` Dr. David Alan Gilbert (git) [this message]
2019-04-05 15:49   ` [Qemu-devel] [PULL 2/2] migration: Fix migrate_set_parameter Dr. David Alan Gilbert (git)
2019-04-07 13:54 ` [Qemu-devel] [PULL 0/2] migration queue Peter Maydell
2019-04-07 13:54   ` Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190405154934.18664-3-dgilbert@redhat.com \
    --to=dgilbert@redhat.com \
    --cc=chen.zhang@intel.com \
    --cc=peterx@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=quintela@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).