From patchwork Tue Apr 9 23:19:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 161992 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp5533846jan; Tue, 9 Apr 2019 16:29:24 -0700 (PDT) X-Google-Smtp-Source: APXvYqyvILkTlwGZxv60lvIwH++LO6hNgoiUt0rHpd+gqclLFz7j/3671BcMF9lfwvkgAuMAbA4E X-Received: by 2002:a7b:c1cf:: with SMTP id a15mr511810wmj.44.1554852564260; Tue, 09 Apr 2019 16:29:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554852564; cv=none; d=google.com; s=arc-20160816; b=vZ36bgUdg5k0ITuvHgln2wuBrB1AUTjY6yvQj45yb0m6HockJ6N3RB3QVuucVR5Hoa e7/enD95kRxbOh8WLT6YZsuWmXqQgDhV+06kUIBa4ferDmHZga8mhse6EpLGJiuV9aox iyeIfKs9jNd2DBZdJKNRglyUepL4qLQJslVMtWtJ5EFMcaW+l2fWoLJ6XUjwe27VF55a oox7PQcFAcmXreEt4Y2JAgsPDb78gfgL9mFbLdIVK1ubX160NULg5KeLPlW7R1HNSi4A Pps04/ifb3Wqg9ONPACO8ojcPwebHoUZKFPWG3qvHbyB0GgloLptaYH9p0+NBb7/pBx8 p2dQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:message-id:date:to:from; bh=mdXfsMJmLwzjuU/1Ka/I5bPmnQhtZkF/1VeOYTAcAcY=; b=PYkPWJHHsL5UbZE8KzUKXTE/hx143Jcrd9GX74IFBzlS2VXMjaL6TZWciLSk2LJ+BJ 1zyV8XV2rkzS23Wuk7FXfex5CM8AFrnQRtRl6a+BQ0WVn/elh6ai6eSQVX3xt+Igexsi huMZO2z0C8US6J3BRKyZ3uvAF5tZvs+U1ST3Uz8G/UZg2rG2F0jB2GF9REhtXX1z0H82 k08y+eQcCaEGcAsesGNbDEo6bEZo6Sb+p2Xjd9zTSeF8X8+i9wnAu40l25UucUEP4uDj 4fLVpMEvZs8zfsVIgquIgmNWvIhFns5j3MZBhpSTGRNROiz/iBpeHNsOTvkH2hxhYKQj HahQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r187si302667wmf.158.2019.04.09.16.29.24 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 09 Apr 2019 16:29:24 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([127.0.0.1]:50555 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hE0B9-0002Sg-AW for patch@linaro.org; Tue, 09 Apr 2019 19:29:23 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53429) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hE0Az-0002SN-1v for qemu-devel@nongnu.org; Tue, 09 Apr 2019 19:29:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hE0Ay-0008ST-8K for qemu-devel@nongnu.org; Tue, 09 Apr 2019 19:29:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56910) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hE0Ay-0008S2-0U for qemu-devel@nongnu.org; Tue, 09 Apr 2019 19:29:12 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 909D43018ECF for ; Tue, 9 Apr 2019 23:20:09 +0000 (UTC) Received: from worklaptop.redhat.com (ovpn-123-33.rdu2.redhat.com [10.10.123.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 91B4F64046; Tue, 9 Apr 2019 23:20:01 +0000 (UTC) From: Cole Robinson To: qemu-devel@nongnu.org Date: Tue, 9 Apr 2019 19:19:57 -0400 Message-Id: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Tue, 09 Apr 2019 23:20:09 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] migration: savevm: fix error code with migration blockers X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Cole Robinson , dgilbert@redhat.com, quintela@redhat.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The only caller that checks the error code is looking for != 0, so returning false is incorrect. Fixes: 5aaac467938 "migration: savevm: consult migration blockers" Signed-off-by: Cole Robinson --- migration/savevm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.21.0 Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Juan Quintela diff --git a/migration/savevm.c b/migration/savevm.c index 34bcad3807..a3dae4cf02 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2544,7 +2544,7 @@ int save_snapshot(const char *name, Error **errp) AioContext *aio_context; if (migration_is_blocked(errp)) { - return false; + return ret; } if (!replay_can_snapshot()) {