From nobody Sat Nov 15 11:14:54 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1752713074; cv=none; d=zohomail.com; s=zohoarc; b=X1iGqSHDdtPuL1b9FUatfGac7zUeNAciF8Y+HnnPklrXu4q6zOOECZiFDwzQhMa1cdFN4irN66mCZXE8CGQeletTFtiK/VG2pC6TCPfLKJ4WE+qyKMn1J/N9w8H5k/tkgtkv1ceNc1qIejkB/C/oD6BguH0caJE3uyDnD3q39Xs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752713074; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=+wTvA/7usbgasNF/ttkqJIAe4EVgQ2LmCMRyT5qNtjg=; b=Fi2ScH+gHMe843zzEKkV7n1PmcHtCcJ2NQ2/GplXOB8Q719ZjPoqTe9P1L6vOVMPQo3kK9toU2ym869BCkn3U3SYnWaaizGTl0GMdBm5N3BbiKFz4EfHlgMb3ImwN3mkmS+yO+3XTo+A7fk/MnqBM0A7BCwT1JVcqAFINnPtQDQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1752713074740872.2680491502163; Wed, 16 Jul 2025 17:44:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ucCij-0008DN-8C; Wed, 16 Jul 2025 20:43:33 -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 1ucCg7-0004C1-MQ for qemu-devel@nongnu.org; Wed, 16 Jul 2025 20:40:55 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ucCg0-00053W-Nf for qemu-devel@nongnu.org; Wed, 16 Jul 2025 20:40:51 -0400 Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-606-WVIi5RyGOje2SrCIMrNmAw-1; Wed, 16 Jul 2025 20:40:40 -0400 Received: by mail-pj1-f71.google.com with SMTP id 98e67ed59e1d1-3132c1942a1so526085a91.2 for ; Wed, 16 Jul 2025 17:40:40 -0700 (PDT) Received: from armenon-kvm.bengluru.csb ([49.36.97.205]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-31c9f287c19sm2214424a91.31.2025.07.16.17.40.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jul 2025 17:40:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752712842; 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=+wTvA/7usbgasNF/ttkqJIAe4EVgQ2LmCMRyT5qNtjg=; b=LrqOUEIbIAxy7KRGaLI3wFsfNdVUyM46eHUcyiu3rPLpaRJhiO6e6wvXOsgBZN4O+yIwdi AxO4IyEu1EwAuqLYQdfCKo6pKIs3efsCQu9F/SENfKRW85zwnwbUKMaFZ+RmXok08hL7L1 TJQlDD6j5TA9lq7LRT0JXVpaY1V8BoE= X-MC-Unique: WVIi5RyGOje2SrCIMrNmAw-1 X-Mimecast-MFC-AGG-ID: WVIi5RyGOje2SrCIMrNmAw_1752712840 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752712839; x=1753317639; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+wTvA/7usbgasNF/ttkqJIAe4EVgQ2LmCMRyT5qNtjg=; b=HtqWYJA4qoqeTxeg5QOTJCrVSH8Z/KK06LjYz2NYXOARJV2638yKPI1CDgalCdvH13 Nqhb2UF4ceVsFKG9UzsPKj0r7L+m4hDMUqjaKqhhvfukjmbmldRGNl2TqiEb6EyY+0xV f9gM0qgjf/D36JGCrzAynY4G3hyKFF6+hTSHP4VezPljutK5ItHDxosvBPyv0xtD4Et3 m4LF3O+zoHy/oYXAvbVeBVB9+FcR4/DsMhQvQgrCp0zmeK2/jisqjTABFNMgGD25TbjY kIiVwf9LD7Oz+GF0fwO1uy0FaLZI8egMG08eemuz0vMUJoA0xJl65qU9veuwqnEvabeY 3flA== X-Gm-Message-State: AOJu0Yz/NIFlwncklg0a0Ou2qsLDBAVs4TSTb+4fYL0+JQDtA/wMXPZj fsw0rePAAaDDQ0bqPNhjjce5SnrT+dZEhFVhxfhz3Nh9V3WRI+sMQ/05OFnZx71m6NNTAcXK10n 7x68bxChLIWKTVrBCL5hp8PbfN4YhsC+nB6CgyKI81D5IGKUp6aMT6EclfIQBGeVrol8= X-Gm-Gg: ASbGncscYWipORMwggTyVsqHjKRYGdlE3bOMKY+B2jqde8CvpCntsP/RV2ynEeq5ByD B7AEK5h5unKtL2OHQXBQhpxgyUGea7omasV2AMvQ4OWSwYe+/PtjGRt5JeMy/C0TYcvUezjcmE7 gCXzWERX20PKQS9cJpxrbc4Po/4jOPNEiQ3ny26QxFlkZpvQ11y2iXhKZQouXBahIqT8bn4CPmz aRjOA3i805hR3NMOk9VKZoJSQbTCzao5qFdx/7zbafpDApl/L9P9A5YLZ39T4c8eKOQUr0NmBsQ ymtf5SHzdBkyLdUqClA/UlQjuD3jh83b1ofOhHzfbJQdRVkjfuzL X-Received: by 2002:a17:90b:5252:b0:31c:3669:3bd8 with SMTP id 98e67ed59e1d1-31c9f424a5fmr5294387a91.21.1752712839418; Wed, 16 Jul 2025 17:40:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFargZkGZTy7Pszbtj1KBS2ZdptFvAavEVwIHRtZ7HryroP4gHSeK03dF0teIY2oaTbn16BOw== X-Received: by 2002:a17:90b:5252:b0:31c:3669:3bd8 with SMTP id 98e67ed59e1d1-31c9f424a5fmr5294359a91.21.1752712839010; Wed, 16 Jul 2025 17:40:39 -0700 (PDT) From: Arun Menon Date: Thu, 17 Jul 2025 06:07:34 +0530 Subject: [PATCH v5 11/23] migration: push Error **errp into loadvm_postcopy_handle_listen() MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250717-propagate_tpm_error-v5-11-1f406f88ee65@redhat.com> References: <20250717-propagate_tpm_error-v5-0-1f406f88ee65@redhat.com> In-Reply-To: <20250717-propagate_tpm_error-v5-0-1f406f88ee65@redhat.com> To: qemu-devel@nongnu.org Cc: "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?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Akihiko Odaki , Dmitry Osipenko , Matthew Rosato , Arun Menon X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2678; i=armenon@redhat.com; h=from:subject:message-id; bh=uqQOArr5pW+vBy5T/LbQo/AfxHnsu2F8gE95SYm7aNQ=; b=owGbwMvMwCWWVaVqcZPfqI/xtFoSQ0aFm8Kc2yKndfkz56jwX978/5bWYT2Fpfvn7ZfXXh3KZ eJnsK2mo5SFQYyLQVZMkaXha4BsU0BhRKTty+swc1iZQIYwcHEKwETc/zEy7Hxy8sh7NWObqaW3 jkgxF7Czsfh1PP0sPj/2brfOxMrfmYwMO2/sWbD2DLPOrR0ni03+vOu61vFqUeTB2w8mhZQn88r nMQAA X-Developer-Key: i=armenon@redhat.com; a=openpgp; fpr=80F5501D82507158593DE9D76A7A2538D90F328E 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=170.10.133.124; envelope-from=armenon@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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1752713076305116600 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_postcopy_handle_listen() must report an error in errp, in case of failure. Signed-off-by: Arun Menon Reviewed-by: Daniel P. Berrang=C3=A9 --- migration/savevm.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/migration/savevm.c b/migration/savevm.c index 608560af35dc76813bf6e9b571df3bd343f0eeab..a5ecec94482dfd23403d5b24e8e= 0c82d4cb73cc7 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2173,15 +2173,16 @@ static void *postcopy_ram_listen_thread(void *opaqu= e) } =20 /* After this message we must be able to immediately receive postcopy data= */ -static int loadvm_postcopy_handle_listen(MigrationIncomingState *mis) +static int loadvm_postcopy_handle_listen(MigrationIncomingState *mis, + Error **errp) { PostcopyState ps =3D postcopy_state_set(POSTCOPY_INCOMING_LISTENING); - Error *local_err =3D NULL; =20 trace_loadvm_postcopy_handle_listen("enter"); =20 if (ps !=3D POSTCOPY_INCOMING_ADVISE && ps !=3D POSTCOPY_INCOMING_DISC= ARD) { - error_report("CMD_POSTCOPY_LISTEN in wrong postcopy state (%d)", p= s); + error_setg(errp, "CMD_POSTCOPY_LISTEN in wrong postcopy " + "state (%d)", ps); return -1; } if (ps =3D=3D POSTCOPY_INCOMING_ADVISE) { @@ -2204,14 +2205,14 @@ static int loadvm_postcopy_handle_listen(MigrationI= ncomingState *mis) if (migrate_postcopy_ram()) { if (postcopy_ram_incoming_setup(mis)) { postcopy_ram_incoming_cleanup(mis); + error_setg(errp, "Failed to setup incoming postcopy RAM blocks= "); return -1; } } =20 trace_loadvm_postcopy_handle_listen("after uffd"); =20 - if (postcopy_notify(POSTCOPY_NOTIFY_INBOUND_LISTEN, &local_err)) { - error_report_err(local_err); + if (postcopy_notify(POSTCOPY_NOTIFY_INBOUND_LISTEN, errp)) { return -1; } =20 @@ -2619,12 +2620,7 @@ static int loadvm_process_command(QEMUFile *f, Error= **errp) return loadvm_postcopy_handle_advise(mis, len, errp); =20 case MIG_CMD_POSTCOPY_LISTEN: - ret =3D loadvm_postcopy_handle_listen(mis); - if (ret < 0) { - error_setg(errp, "Failed to load device state command: %d", re= t); - return -1; - } - return ret; + return loadvm_postcopy_handle_listen(mis, errp); =20 case MIG_CMD_POSTCOPY_RUN: ret =3D loadvm_postcopy_handle_run(mis); --=20 2.50.0