From nobody Sun Sep 28 16:33:56 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=1756570886; cv=none; d=zohomail.com; s=zohoarc; b=oDEvnJ7uz4SPARjBmB7WuOwKqzPRuzJconakWnrEPqMOK1+pus62XbvB29q25x0HS1O/qqWTK18iU8yPStuIzeSAWgZFTGFK6b33x00GO5reKZf+NqwtFspNbMPohdNHFG2azSB1QOYNeWQ+6KCvd4JNOQP3c9oYjNCBD4ZvJtQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756570886; 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=Za1NNvSl7uFr3wDIymXqGWcBuLkcyiqwtqIRxvI2IEk=; b=OZG8sBuQeM6w6T81NNuLPOFSqjij/vn037w2/AE0b9vFrtnEX/Syd+w7H3w/fpo2tt2pfUkV17Ti+uUY0XYnr04MLljHSg8cfkLAhEwjMbZzSxk4DVTNvncaw6xy4peZbeuwYusGCuAiO6jdTEAh3w9FQuckw2Ey6Dhmbq+mZgY= 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 1756570886227341.42286392931146; Sat, 30 Aug 2025 09:21:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1usNdy-0002QI-4K; Sat, 30 Aug 2025 11:37:30 -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 1us5MT-00060i-AZ for qemu-devel@nongnu.org; Fri, 29 Aug 2025 16:06:13 -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 1us5MR-00055V-IQ for qemu-devel@nongnu.org; Fri, 29 Aug 2025 16:06:13 -0400 Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-122-L_w5-HYUNiCrkCy4KqIoog-1; Fri, 29 Aug 2025 16:06:09 -0400 Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-2445803f0cfso32569585ad.1 for ; Fri, 29 Aug 2025 13:06:09 -0700 (PDT) Received: from armenon-kvm.bengluru.csb ([49.47.195.108]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-327d8f66f16sm3570543a91.0.2025.08.29.13.05.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Aug 2025 13:06:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1756497970; 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=Za1NNvSl7uFr3wDIymXqGWcBuLkcyiqwtqIRxvI2IEk=; b=BsqtvSMeTuAsEBI3iFuXXSa6fwb1vhNv8fQTcS/1CdKEyhS+DuTQrXG8ia6sxWCZDRVTUr O44FADbBXDPnH6Cg984i9gw7ECC1wMgqJIbxmRu5qp/91/rC2/gg0+jkiEhvDMsQhHBv1l VQeHUmneEOpcAeesyp2YOmwIu09PNOs= X-MC-Unique: L_w5-HYUNiCrkCy4KqIoog-1 X-Mimecast-MFC-AGG-ID: L_w5-HYUNiCrkCy4KqIoog_1756497968 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756497968; x=1757102768; 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=Za1NNvSl7uFr3wDIymXqGWcBuLkcyiqwtqIRxvI2IEk=; b=ZyJ1hUat9Nt+/CwDPRVyN8u0ff7AF+90N8J2IIQnEnrU0qTES3j0GfkOnzUyJZjpCl H/0mYwXIf3FDG2EaqeZIdaE6doqheEgytaIAwQuQcA0qbFiKChVbIyunl5MLhqa6vlyK 0zShvUCy0ldZERMs/BTPkKjwE7KKdEMUW1nXF34oz3vSYXm0HRiwlu4KlcbqgMcWBzZZ ORYl1ulWmep9nJP/zPVJsIkzLXqfPa3bLcipbFkLsiSTwW0Fh/7NCMYxXAv9UixP0Cjo SrgWJf3ZPDgK0l48kHyYFOxkqoh3ieZag9hJS69xbNaZcHYyu5oIZepGDyjtz0+eXUVr twmA== X-Gm-Message-State: AOJu0Yx5Gv3yBv6OphR6jUY1mLybPYgUEUwVgJuvjwxwwGrDSP4hGqFJ UXQnJRXRaIBXzkVxGEFdeggXj1i0qY4padFtVx2mcGfmcgq6FMEtvNtFwwhlqKhRYUDWWCLGCIG jraYRg3HIYSSR4nglbJlY1UXRFXlPLWhlLb0mOh4km5hb7febpHcEXYqH X-Gm-Gg: ASbGncu+FN9uyXe7HvXncurq06St+5qkEqHidkd4pzDnovJw7MKqMO9U3zoGPb/j/lF VszKn7MEcZB/zrAtqpAOAYwHIq0ekhmLCoG6JV1tXq1OOKmN2QW1iIkDyzCIBCiLcKIm3deFxW2 MfoUKZywSGpXr02hOqzzWtlN78tNNARPAG73AJVoLzoaib/Q8cZDSqalf14PHiXxQtyWoAe7abT Rjo72aSogNIZZwcZYX3s9KCjZaI7KibNV+XXGXsElmBn99CiDQg8Q0aksj159yRZLQbgd5nmzFi s/l7NRaRLOu7G1qLZEgHyJPUlbwknq2N98/mt2cy8WPrJBOvYrECqg== X-Received: by 2002:a17:902:f70a:b0:248:cd0b:3434 with SMTP id d9443c01a7336-248cd0b3913mr129256455ad.36.1756497968200; Fri, 29 Aug 2025 13:06:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHT7tKzYbbRW8J8wAF+R2djLZuIkTNdGT9d35QTNoUfyVKA94bY+WKbDKxn4qCNUkMWeLeCQg== X-Received: by 2002:a17:902:f70a:b0:248:cd0b:3434 with SMTP id d9443c01a7336-248cd0b3913mr129256155ad.36.1756497967838; Fri, 29 Aug 2025 13:06:07 -0700 (PDT) From: Arun Menon Date: Sat, 30 Aug 2025 01:31:56 +0530 Subject: [PATCH v13 16/27] 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: <20250830-propagate_tpm_error-v13-16-a4e777b7eb2c@redhat.com> References: <20250830-propagate_tpm_error-v13-0-a4e777b7eb2c@redhat.com> In-Reply-To: <20250830-propagate_tpm_error-v13-0-a4e777b7eb2c@redhat.com> To: qemu-devel@nongnu.org Cc: Peter Xu , Fabiano Rosas , =?utf-8?q?Alex_Benn=C3=A9e?= , Akihiko Odaki , Dmitry Osipenko , "Michael S. Tsirkin" , Marcel Apfelbaum , Cornelia Huck , Halil Pasic , Eric Farman , Thomas Huth , Christian Borntraeger , Matthew Rosato , Richard Henderson , David Hildenbrand , Ilya Leoshkevich , Nicholas Piggin , Harsh Prateek Bora , Paolo Bonzini , Fam Zheng , Alex Williamson , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Steve Sistare , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, Hailiang Zhang , Stefan Berger , Peter Maydell , qemu-arm@nongnu.org, Arun Menon , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2751; i=armenon@redhat.com; h=from:subject:message-id; bh=BsaDnW57QysoXysSxJ9DH2reNuwbEbmWWZabpe2MJIE=; b=owGbwMvMwCWWVaVqcZPfqI/xtFoSQ8Ymdt9JLwJUHvwKVtv0ROoTB8O2hbbNXMf//3c49zLV2 bvMzO1URykLgxgXg6yYIkvD1wDZpoDCiEjbl9dh5rAygQxh4OIUgIl81GZkaOcK4qyx78sPf/nT ZMa/hMn3Pzyu7Zv4TYvvYJW6/7+YCQz/4+6tu7eiutVfNsZv3S1T7Z/nvz2YcPna7FXXKjZMvzz nFQcA 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_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-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.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: 1756570888024116600 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. Reviewed-by: Fabiano Rosas Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Arun Menon --- migration/savevm.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/migration/savevm.c b/migration/savevm.c index 680f6e1c4bbc979f779d9fde28ab71ae234b5891..c681d6d21af356a97645f2a0d36= e7440e3bd95c6 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2181,15 +2181,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) { @@ -2212,14 +2213,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 @@ -2622,11 +2623,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 ret; + return loadvm_postcopy_handle_listen(mis, errp); =20 case MIG_CMD_POSTCOPY_RUN: ret =3D loadvm_postcopy_handle_run(mis); --=20 2.51.0