From: Wei Yang <richardw.yang@linux.intel.com>
Date: Mon, 22 Jul 2019 07:53:38 +0000 (+0800)
Subject: migration: return -EINVAL directly when version_id mismatch
X-Git-Tag: v4.2.0-rc0~238^2~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=be4a1a1b6f4559c9b1f97aac31e0fb01a1fbe48e;p=thirdparty%2Fqemu.git

migration: return -EINVAL directly when version_id mismatch

It is not reasonable to continue when version_id mismatch.

Signed-off-by: Wei Yang <richardw.yang@linux.intel.com>
Message-Id: <20190722075339.25121-2-richardw.yang@linux.intel.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---

diff --git a/migration/ram.c b/migration/ram.c
index 97f241d6d9e..6a75aedc91d 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -4334,7 +4334,7 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id)
     seq_iter++;
 
     if (version_id != 4) {
-        ret = -EINVAL;
+        return -EINVAL;
     }
 
     if (!migrate_use_compression()) {