From nobody Mon Nov 17 01:27:45 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1602172671; cv=none; d=zohomail.com; s=zohoarc; b=Vzu5qpZoBnchg4gOi5JjLJ2LQbxhY6YnQy7EOdi+loaXmsueR+UqRIoSXgsuXlSYBT7jz/6ru6Zo1XFUVKveUviHcEwwM9lkLLsnGoIT91dItMPVRvSo9KMrb9I1Ea3brny2thM5z9y8xRL9m9Gw5NBK5/lyrlme3xP7ET8HM0Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602172671; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5sNhBXvjOCHUoSwhmyprlcdhGjll2iz3Y11g+QJFKeo=; b=N81cxYOsBDDXqzPVFAIQkVt/iE92LAOdHLlhl46X9byoDxZsElRPZSx11oH0KhJPyjyfbWihHN40pKolmgX0LSyrSVoBIom2UEi1Y6/+kQeyyiw8p0PjPAko+7q6UWFt9v0pH9irXla66BJxAIvtn6uxdrZH7hAnPyRdqz12XQc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1602172671449953.8665208672327; Thu, 8 Oct 2020 08:57:51 -0700 (PDT) Received: from localhost ([::1]:57556 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kQYIg-00067G-0y for importer@patchew.org; Thu, 08 Oct 2020 11:57:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58526) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQYBh-0006iS-Fx for qemu-devel@nongnu.org; Thu, 08 Oct 2020 11:50:37 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:53247) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kQYBd-0002e8-NV for qemu-devel@nongnu.org; Thu, 08 Oct 2020 11:50:37 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-213-QYoSJcvJPLOSGP_bpEYO4Q-1; Thu, 08 Oct 2020 11:50:26 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6CF2810AAFFC; Thu, 8 Oct 2020 15:50:14 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.36.110.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id E590F5C1BD; Thu, 8 Oct 2020 15:50:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602172233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5sNhBXvjOCHUoSwhmyprlcdhGjll2iz3Y11g+QJFKeo=; b=cxoqe4Wlhw3EzH2SJYj3xMFp9x77JsQ4DhaTQEJG+AMW0so+dRBycvJcg4C0xxRLmjjGkl QNCuhosE/pDuNkX99p/sGyonpMooCCb56HKwJmrGAVfw69FclDmruyusqBCQT8yP/Qkue8 nRRj+NoDtPji2FEp7GWymwCzh1pQVm0= X-MC-Unique: QYoSJcvJPLOSGP_bpEYO4Q-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v6 02/10] migration: stop returning errno from load_snapshot() Date: Thu, 8 Oct 2020 16:49:53 +0100 Message-Id: <20201008155001.3357288-3-berrange@redhat.com> In-Reply-To: <20201008155001.3357288-1-berrange@redhat.com> References: <20201008155001.3357288-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/08 02:56:27 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Peter Krempa , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , "Denis V. Lunev" , qemu-block@nongnu.org, Juan Quintela , John Snow , Markus Armbruster , Max Reitz , Pavel Dovgalyuk , Paolo Bonzini , "Dr. David Alan Gilbert" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) None of the callers care about the errno value since there is a full Error object populated. This gives consistency with save_snapshot() which already just returns -1. Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Daniel P. Berrang=C3=A9 --- migration/savevm.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/migration/savevm.c b/migration/savevm.c index a52da440f4..87eaa07553 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2874,16 +2874,16 @@ int load_snapshot(const char *name, Error **errp) MigrationIncomingState *mis =3D migration_incoming_get_current(); =20 if (!bdrv_all_can_snapshot(errp)) { - return -ENOTSUP; + return -1; } ret =3D bdrv_all_find_snapshot(name, errp); if (ret < 0) { - return ret; + return -1; } =20 bs_vm_state =3D bdrv_all_find_vmstate_bs(errp); if (!bs_vm_state) { - return -ENOTSUP; + return -1; } aio_context =3D bdrv_get_aio_context(bs_vm_state); =20 @@ -2892,11 +2892,11 @@ int load_snapshot(const char *name, Error **errp) ret =3D bdrv_snapshot_find(bs_vm_state, &sn, name); aio_context_release(aio_context); if (ret < 0) { - return ret; + return -1; } else if (sn.vm_state_size =3D=3D 0) { error_setg(errp, "This is a disk-only snapshot. Revert to it " " offline using qemu-img"); - return -EINVAL; + return -1; } =20 /* @@ -2917,7 +2917,6 @@ int load_snapshot(const char *name, Error **errp) f =3D qemu_fopen_bdrv(bs_vm_state, 0); if (!f) { error_setg(errp, "Could not open VM state file"); - ret =3D -EINVAL; goto err_drain; } =20 @@ -2933,14 +2932,14 @@ int load_snapshot(const char *name, Error **errp) =20 if (ret < 0) { error_setg(errp, "Error %d while loading VM state", ret); - return ret; + return -1; } =20 return 0; =20 err_drain: bdrv_drain_all_end(); - return ret; + return -1; } =20 void vmstate_register_ram(MemoryRegion *mr, DeviceState *dev) --=20 2.26.2