From nobody Mon Feb 9 10:27:42 2026 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=1612463349; cv=none; d=zohomail.com; s=zohoarc; b=EovVs1+zPboae1w1uIfjVeN4B3pJG+BEvrJUW40H8Ju3dO3TFIjAmbNZC6ca0B9l88AyDEFXq1mcp/1dc75NbkPOj1Gt5defphzDxppiwGFpNkhvPo2erGHuHteryNTn4HcZf/p+P86niJPj7eF1EeNW7CUo4RFpb1Aa/5CrAqE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612463349; 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=KkQzQEOZtsNbJ5a3pC1X3wjE7y7HyONi/y17NLqswl8=; b=NSf6DGucrfQA3nycwePJVZiTgn41kAXJbKqUf5dbqFVjgDd6au2MmPpDY3R2e8W4O3HKXTsde0BwklS85kOoJmADyyxKsGZEmrggc9GdN2lDX83b2WNC5ydQSm/9VaVGgKbKegpwJvZHuF8BEOgkMQJUtQdo5wQ7cEoP+DaSzgY= 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 1612463349650826.1850905940411; Thu, 4 Feb 2021 10:29:09 -0800 (PST) Received: from localhost ([::1]:60480 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l7jNM-0004pF-Jc for importer@patchew.org; Thu, 04 Feb 2021 13:29:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50606) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l7iIl-00086b-8y for qemu-devel@nongnu.org; Thu, 04 Feb 2021 12:20:20 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:38908) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l7iIa-0005jP-Ph for qemu-devel@nongnu.org; Thu, 04 Feb 2021 12:20:18 -0500 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-509-2wwHEEK8MluV0KvNdo3Asg-1; Thu, 04 Feb 2021 12:19:59 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9380E801968; Thu, 4 Feb 2021 17:19:58 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-221.ams2.redhat.com [10.36.112.221]) by smtp.corp.redhat.com (Postfix) with ESMTP id 609D160CFA; Thu, 4 Feb 2021 17:19:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612459207; 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=KkQzQEOZtsNbJ5a3pC1X3wjE7y7HyONi/y17NLqswl8=; b=cCJmNhG60xz1Nnqq446ry1h5Zv5NZeXt93/jaMGMZoJUHox0KHwshvfF7cvFxwI0mmvOZ5 GJrkjkBjtP1dhI7J4CHFuotQFq+gSdJTeooFda7duRPG8O9Fg/pzZGk7OJieGCxaFwMxgQ 7RSbpr+F62hDOR5zaD7T9Aw+BwG4lBI= X-MC-Unique: 2wwHEEK8MluV0KvNdo3Asg-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 26/33] migration: push Error **errp into qemu_savevm_state_complete_precopy_non_iterable() Date: Thu, 4 Feb 2021 17:19:00 +0000 Message-Id: <20210204171907.901471-27-berrange@redhat.com> In-Reply-To: <20210204171907.901471-1-berrange@redhat.com> References: <20210204171907.901471-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.351, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: Juan Quintela , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , "Dr. David Alan Gilbert" , Hailiang Zhang Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) This is an incremental step in converting vmstate loading code to report via Error objects instead of printing directly to the console/monitor. Signed-off-by: Daniel P. Berrang=C3=A9 --- migration/savevm.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/migration/savevm.c b/migration/savevm.c index 3b46fbba32..95e228a646 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1369,7 +1369,8 @@ int qemu_savevm_state_complete_precopy_iterable(QEMUF= ile *f, bool in_postcopy, static int qemu_savevm_state_complete_precopy_non_iterable(QEMUFile *f, bool in_postcopy, - bool inactivate_disks) + bool inactivate_disks, + Error **errp) { g_autoptr(JSONWriter) vmdesc =3D NULL; int vmdesc_len; @@ -1398,9 +1399,11 @@ int qemu_savevm_state_complete_precopy_non_iterable(= QEMUFile *f, =20 save_section_header(f, se, QEMU_VM_SECTION_FULL); ret =3D vmstate_save(f, se, vmdesc); - if (ret) { + if (ret < 0) { + error_setg_errno(errp, -ret, + "failed to save device state '%s'", se->idstr= ); qemu_file_set_error(f, ret); - return ret; + return -1; } trace_savevm_section_end(se->idstr, se->section_id, 0); save_section_footer(f, se); @@ -1413,10 +1416,10 @@ int qemu_savevm_state_complete_precopy_non_iterable= (QEMUFile *f, * bdrv_invalidate_cache_all() on the other end won't fail. */ ret =3D bdrv_inactivate_all(); if (ret) { - error_report("%s: bdrv_inactivate_all() failed (%d)", - __func__, ret); + error_setg_errno(errp, -ret, + "failed to deactivate disks when completing p= recopy save"); qemu_file_set_error(f, ret); - return ret; + return -1; } } if (!in_postcopy) { @@ -1440,7 +1443,6 @@ int qemu_savevm_state_complete_precopy_non_iterable(Q= EMUFile *f, int qemu_savevm_state_complete_precopy(QEMUFile *f, bool iterable_only, bool inactivate_disks) { - int ret; Error *local_err =3D NULL; bool in_postcopy =3D migration_in_postcopy(); =20 @@ -1464,10 +1466,11 @@ int qemu_savevm_state_complete_precopy(QEMUFile *f,= bool iterable_only, goto flush; } =20 - ret =3D qemu_savevm_state_complete_precopy_non_iterable(f, in_postcopy, - inactivate_disks= ); - if (ret) { - return ret; + if (qemu_savevm_state_complete_precopy_non_iterable(f, in_postcopy, + inactivate_disks, + &local_err) < 0) { + error_report_err(local_err); + return -1; } =20 flush: --=20 2.29.2