From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F24C5C83F34 for ; Thu, 17 Jul 2025 19:55:56 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ucUhm-00038f-JE; Thu, 17 Jul 2025 15:55:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ucSFp-0006DL-00 for qemu-devel@nongnu.org; Thu, 17 Jul 2025 13:18:48 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ucSFl-0003aj-N5 for qemu-devel@nongnu.org; Thu, 17 Jul 2025 13:18:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752772720; h=from:from:reply-to: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=lFFU3tEcBSYndnQDss/8hB6eXEkIGZCYNDTF0CCO8Oc=; b=LKxYr91Ii2Ss6ja6hLhuO/n0CJnVpIfPR0qZi7xyKpPm9KmLU12g2bo8tWRAW0PTj/lNCQ rmZkqG/fRLOr6r/oYlRQP2Up4F6NXx4QmpIZOg11IxCnAtTUlU01e6NHyYVfC6K3BRC44V AeM+KoofshAYMnlzGvDKIz1kOiBk4B0= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-19-Rfi262XkMz6_akj8yuKScg-1; Thu, 17 Jul 2025 13:18:36 -0400 X-MC-Unique: Rfi262XkMz6_akj8yuKScg-1 X-Mimecast-MFC-AGG-ID: Rfi262XkMz6_akj8yuKScg_1752772714 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 574F81800C32; Thu, 17 Jul 2025 17:18:34 +0000 (UTC) Received: from redhat.com (unknown [10.42.28.171]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C797319560A1; Thu, 17 Jul 2025 17:18:25 +0000 (UTC) Date: Thu, 17 Jul 2025 18:18:22 +0100 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Arun Menon Cc: qemu-devel@nongnu.org, "Michael S. Tsirkin" , Marcel Apfelbaum , Cornelia Huck , Halil Pasic , Eric Farman , Richard Henderson , David Hildenbrand , Ilya Leoshkevich , Thomas Huth , Christian Borntraeger , Paolo Bonzini , Fam Zheng , Nicholas Piggin , Daniel Henrique Barboza , Harsh Prateek Bora , Alex Williamson , =?utf-8?Q?C=C3=A9dric?= Le Goater , Peter Xu , Fabiano Rosas , Hailiang Zhang , Steve Sistare , qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, Stefan Berger , =?utf-8?Q?Marc-Andr=C3=A9?= Lureau , Alex =?utf-8?Q?Benn=C3=A9e?= , Akihiko Odaki , Dmitry Osipenko , Matthew Rosato Subject: Re: [PATCH v5 15/23] migration: push Error **errp into loadvm_handle_recv_bitmap() Message-ID: References: <20250717-propagate_tpm_error-v5-0-1f406f88ee65@redhat.com> <20250717-propagate_tpm_error-v5-15-1f406f88ee65@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20250717-propagate_tpm_error-v5-15-1f406f88ee65@redhat.com> User-Agent: Mutt/2.2.14 (2025-02-20) X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On Thu, Jul 17, 2025 at 06:07:38AM +0530, Arun Menon wrote: > This is an incremental step in converting vmstate loading > code to report error via Error objects instead of directly > printing it to console/monitor. > It is ensured that loadvm_handle_recv_bitmap() must report an error > in errp, in case of failure. > > Signed-off-by: Arun Menon > --- > migration/savevm.c | 22 ++++++++++------------ > 1 file changed, 10 insertions(+), 12 deletions(-) Reviewed-by: Daniel P. Berrangé > > diff --git a/migration/savevm.c b/migration/savevm.c > index 20dce4b43a181d2f47b6b22e7a15aa4fc45cac5c..1cbc44a5314043a403d983511066cf137681a18d 100644 > --- a/migration/savevm.c > +++ b/migration/savevm.c > @@ -2471,32 +2471,35 @@ static int loadvm_handle_cmd_packaged(MigrationIncomingState *mis, Error **errp) > * len (1 byte) + ramblock_name (<255 bytes) > */ > static int loadvm_handle_recv_bitmap(MigrationIncomingState *mis, > - uint16_t len) > + uint16_t len, Error **errp) > { > QEMUFile *file = mis->from_src_file; > RAMBlock *rb; > char block_name[256]; > size_t cnt; > + int ret; > > cnt = qemu_get_counted_string(file, block_name); > if (!cnt) { > - error_report("%s: failed to read block name", __func__); > + error_setg(errp, "%s: failed to read block name", __func__); > return -EINVAL; > } > > /* Validate before using the data */ > - if (qemu_file_get_error(file)) { > - return qemu_file_get_error(file); > + ret = qemu_file_get_error(file); > + if (ret < 0) { > + error_setg(errp, "migration stream has error: %d", ret); > + return ret; > } > > if (len != cnt + 1) { > - error_report("%s: invalid payload length (%d)", __func__, len); > + error_setg(errp, "%s: invalid payload length (%d)", __func__, len); > return -EINVAL; > } > > rb = qemu_ram_block_by_name(block_name); > if (!rb) { > - error_report("%s: block '%s' not found", __func__, block_name); > + error_setg(errp, "%s: block '%s' not found", __func__, block_name); > return -EINVAL; > } (Pre-existing) redundant use of __func__ that can be removed. Reviewed-by: Daniel P. Berrangé With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|