From patchwork Tue May 14 18:34:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dr. David Alan Gilbert" X-Patchwork-Id: 164228 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp2967711ili; Tue, 14 May 2019 11:41:10 -0700 (PDT) X-Google-Smtp-Source: APXvYqwktHtfUCJJs0VbEm3hEYeGzQCCF8sKOkgRMUHscQxNmhF435Vkj9FXELzK9MWZDLQTr89O X-Received: by 2002:a50:fb19:: with SMTP id d25mr38301636edq.61.1557859270328; Tue, 14 May 2019 11:41:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557859270; cv=none; d=google.com; s=arc-20160816; b=YWVeJT7Eah3Qx2EI5XN9J3gku1jzV93wIBimQlAMyTbg/N5pB942RnEqsEGpsaogGs Fy0ofpRYSG1jTDe/7F4Q1pVxezF1PMPAUNQJ8GKBYcNs/zhwi7exkn7M55Z+sBGh/P7E TJiWHrM+RaHx+4RKaTKSsRpKo34FIBGO8SNMYt2yPHzTAU1MpiHf+QMv2F0ba7CjVMP+ g/7R5Bp6F+++gZaMOG2LFlLkPyThw1FA1+PfV24pmy5rq1BY7XfNHewIE81rj02xKYt0 ak/j2I+2EDQ9Zx3goZ/mq4/We09rXQEH63hv+cLAUWuUUyMSrNosBg0SbU5bFtNVwOKF cvlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from; bh=utV0KpF9vL5n9ScPwM2bqLWztYgBQzVKvTgaVsqWaBw=; b=Yp4RU/03oow8783ha9X2xBdkgvlVKMBnhbO+JHQ4raZQZUb8dfky4G0xeySjClQPDo KcTlByq3TSHmcWGpbkyeBSFa8PkEZiQz01EpntfD2rWTFz+93VCpLQJTNCMZ6VWlh+kT VIpuTZ013YYLMuwdtuZaZBaIdyAyOuGS7cp6YZiIPRsKxv1t1nOKxY4V5RC9m2is+RXj pdz+tt6PMoTE4EdRBKWepPmRpzIuTrzpEWwJkIY2Kqsi50Jhm6Xl/2g29VGe2wLGOAWT BZztXvtREwgnyQaABQpavQs83hUJj9qnPlD21RSjDwZeS7SDuzac4K7bz6hDsynpbuxF tKQQ== 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 p49si8579611edc.249.2019.05.14.11.41.10 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 14 May 2019 11:41:10 -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]:52466 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQcMP-0003K6-AN for patch@linaro.org; Tue, 14 May 2019 14:41:09 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39781) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQcH0-0006t9-Uq for qemu-devel@nongnu.org; Tue, 14 May 2019 14:35:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hQcH0-0001IR-3T for qemu-devel@nongnu.org; Tue, 14 May 2019 14:35:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49850) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hQcGz-0001Hf-Ub for qemu-devel@nongnu.org; Tue, 14 May 2019 14:35:34 -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 3BCCE309B15D; Tue, 14 May 2019 18:35:33 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-117-232.ams2.redhat.com [10.36.117.232]) by smtp.corp.redhat.com (Postfix) with ESMTP id E6CDB608BA; Tue, 14 May 2019 18:35:05 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, quintela@redhat.com, peterx@redhat.com, ehabkost@redhat.com, richardw.yang@linux.intel.com, yury-kotov@yandex-team.ru, chen.zhang@intel.com Date: Tue, 14 May 2019 19:34:43 +0100 Message-Id: <20190514183454.12758-6-dgilbert@redhat.com> In-Reply-To: <20190514183454.12758-1-dgilbert@redhat.com> References: <20190514183454.12758-1-dgilbert@redhat.com> 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.49]); Tue, 14 May 2019 18:35:33 +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] [PULL 05/16] 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Cole Robinson 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 Message-Id: Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Juan Quintela Signed-off-by: Dr. David Alan Gilbert --- migration/savevm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.21.0 diff --git a/migration/savevm.c b/migration/savevm.c index 587fec8ce2..81a9a2ef30 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2542,7 +2542,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()) {