From nobody Sun Feb 8 20:12:46 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=1612462170; cv=none; d=zohomail.com; s=zohoarc; b=NtkPBp0tSgVKHjgJIoCN2adOQtjjWYnTeCaxXnmkd/SyDiydBbQ4hsUOXlVQ2eeaTb7TuhIylCQwT3Mx7FJN1ebhUX4Rss7OfazNIgMMc89xQtqtfkxINMXtz2tS478MYUgsKsx62svtRlydCBZ3vmrlYW2vVMOUudi1jy438vk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612462170; 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=chjKnqN30lt2ndWgun1hEhWVFr6iaBC4+T/1AjolowQ=; b=Uv1RwYI2MgNVzDS3zysvQPOkEpch0OooUhzDyt/sZE4qABL8hmMPIN9GJQs+IACturFcGXZQwJCpc2HHdq5DmWMZinslvq0wkOYTqoeYL+cmLyVYuu8m+E77tod/ttS/yj25kNDDRU3xVP4J/PB2bXQ65h6GsQuQN+6LHOaa+w0= 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 1612462170017202.7015806604535; Thu, 4 Feb 2021 10:09:30 -0800 (PST) Received: from localhost ([::1]:55900 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l7j4H-0001M2-Sg for importer@patchew.org; Thu, 04 Feb 2021 13:09:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50136) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l7iI5-0007OT-Je for qemu-devel@nongnu.org; Thu, 04 Feb 2021 12:19:37 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:22585) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l7iI2-0005Lq-O7 for qemu-devel@nongnu.org; Thu, 04 Feb 2021 12:19:37 -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-422-4phkoMkpPxWuqDGNsE8img-1; Thu, 04 Feb 2021 12:19:31 -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 738C9BBEE2; Thu, 4 Feb 2021 17:19:30 +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 52391226EE; Thu, 4 Feb 2021 17:19:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612459173; 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=chjKnqN30lt2ndWgun1hEhWVFr6iaBC4+T/1AjolowQ=; b=XYnnvn8skKEfjxVxzmEF0isRRfiqvjhjnVCEaY+Qpsmq9BmVE8yh2xEfI+F9B41Dkk8YKM N1paJsnDM0RBrhIUxnB9bFhOHcWGWf+NRsGmEUvJp1M1qGCiUe4GtjiBcHiK0Q3/0YNGmN c8dDCV1rZbwgbMv8G73QRbMslwqYKPM= X-MC-Unique: 4phkoMkpPxWuqDGNsE8img-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 09/33] migration: push Error **errp into loadvm_handle_cmd_packaged() Date: Thu, 4 Feb 2021 17:18:43 +0000 Message-Id: <20210204171907.901471-10-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=63.128.21.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_H4=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 | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/migration/savevm.c b/migration/savevm.c index 450c36994f..d9170b4364 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2121,18 +2121,18 @@ static int loadvm_postcopy_handle_resume(MigrationI= ncomingState *mis) * LOADVM_QUIT: success, but stop * -1: error */ -static int loadvm_handle_cmd_packaged(MigrationIncomingState *mis) +static int loadvm_handle_cmd_packaged(MigrationIncomingState *mis, Error *= *errp) { int ret; size_t length; QIOChannelBuffer *bioc; - Error *local_err =3D NULL; =20 length =3D qemu_get_be32(mis->from_src_file); trace_loadvm_handle_cmd_packaged(length); =20 if (length > MAX_VM_CMD_PACKAGED_SIZE) { - error_report("Unreasonably large packaged state: %zu", length); + error_setg(errp, "Unreasonably large packaged state: %zu > %d", + length, MAX_VM_CMD_PACKAGED_SIZE); return -1; } =20 @@ -2143,20 +2143,17 @@ static int loadvm_handle_cmd_packaged(MigrationInco= mingState *mis) length); if (ret !=3D length) { object_unref(OBJECT(bioc)); - error_report("CMD_PACKAGED: Buffer receive fail ret=3D%d length=3D= %zu", - ret, length); - return (ret < 0) ? ret : -EAGAIN; + error_setg(errp, "CMD_PACKAGED: Buffer receive fail ret=3D%d lengt= h=3D%zu", + ret, length); + return -1; } bioc->usage +=3D length; trace_loadvm_handle_cmd_packaged_received(ret); =20 QEMUFile *packf =3D qemu_fopen_channel_input(QIO_CHANNEL(bioc)); =20 - ret =3D qemu_loadvm_state_main(packf, mis, &local_err); + ret =3D qemu_loadvm_state_main(packf, mis, errp); trace_loadvm_handle_cmd_packaged_main(ret); - if (ret < 0) { - error_report_err(local_err); - } qemu_fclose(packf); object_unref(OBJECT(bioc)); =20 @@ -2282,12 +2279,7 @@ static int loadvm_process_command(QEMUFile *f, Error= **errp) break; =20 case MIG_CMD_PACKAGED: - ret =3D loadvm_handle_cmd_packaged(mis); - if (ret < 0) { - error_setg(errp, "Failed to load device state command: %d", re= t); - return -1; - } - return ret; + return loadvm_handle_cmd_packaged(mis, errp); =20 case MIG_CMD_POSTCOPY_ADVISE: ret =3D loadvm_postcopy_handle_advise(mis, len); --=20 2.29.2