From nobody Sat Nov 15 11:14:52 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=1752713278; cv=none; d=zohomail.com; s=zohoarc; b=VtwwCEJMnMbdLNCcs8hDcPpcQXajk64YcT1klCZKpHmbhTDENoCFaXkJG0gdV89vqkBwArBVuz2Hk39ctHMwlTYdLkGChGweI+J4HelyV8xeHx7JuX8TBOIWdu02oQuQ3gMahYEvx7HKp9xZcbcPxwNvobb5vCH5UJkAicTCODI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752713278; 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=UaNetO2Qn1xjqwHWbrWgZcK9a9Y4Ysw6MagpqH4pFTg=; b=SvogFoggxTpvZJRhMyMKgIlc0YyIQahhVWM4h7fxNiqZMPqM4S9JIOjcFrhrJRpEIQOqAFF1UCjHHsmQ/BAQdMpU5oLP9yLWbZC6ZZMrFK2m4+tEAwcGQH3fH5dmt98BcHeSNYxJYo217zE0pZxIcx5gNGwrMLnk9eRSwQZ1lp8= 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 1752713278181976.7178453107907; Wed, 16 Jul 2025 17:47:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ucCl0-0005OY-3c; Wed, 16 Jul 2025 20:45:57 -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 1ucChO-0005ju-AD for qemu-devel@nongnu.org; Wed, 16 Jul 2025 20:42:11 -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 1ucChL-0005KX-HI for qemu-devel@nongnu.org; Wed, 16 Jul 2025 20:42:09 -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-665-kqK5JYbcMVSYdazTzrpVgw-1; Wed, 16 Jul 2025 20:42:03 -0400 Received: by mail-pj1-f71.google.com with SMTP id 98e67ed59e1d1-31cb0471b45so159416a91.0 for ; Wed, 16 Jul 2025 17:42:03 -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.41.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jul 2025 17:42:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752712925; 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=UaNetO2Qn1xjqwHWbrWgZcK9a9Y4Ysw6MagpqH4pFTg=; b=M/pRXlzSDVxaFbwfvc+puPJ0LFc3gQUXQ9Kz4btU3IjDq9SSzrkBMAVs5BY/lzFkL5V8G8 baX+pglCpN/IIyAHek0V3g7WJm3285b5f1lqQ3cZ0ZMfTSYFD3ZaAELuBPEz6yxPY7awfo iFCZC7i2jbTgmrdaNZ5tZAR8XhQAHjM= X-MC-Unique: kqK5JYbcMVSYdazTzrpVgw-1 X-Mimecast-MFC-AGG-ID: kqK5JYbcMVSYdazTzrpVgw_1752712922 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752712922; x=1753317722; 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=UaNetO2Qn1xjqwHWbrWgZcK9a9Y4Ysw6MagpqH4pFTg=; b=LCk0YH1JEdiPsL3Hg/NI0hKPnXACKobIJBB9Oig34JbPaTGDHYynDITUrJKjanbm2I tFoNq7nmCtrZQc458tSn3SaowYq7dehqAs0PSsmyIiEX7a/whRzS7ZKWTza1KsiJizpI YwCMMDiiOgpKF2rnjRyLwf5/JLilWtjFE+1/REi2ksKnS1IA3NywmeKw/c5dHwPZPq77 0YwXIwo9MPkX7Dhao8FoPFfxwYk/XcpBCHBmYkHvh1gZ86m08uxsoeaAc74wn7S6pCXB rq/jSf9xF9lbKKQy2YwdBEEMazGQpPgg+pw2oboqSs6TJ4LwQW7MJdA6b5pxPqFoWZPN RCpQ== X-Gm-Message-State: AOJu0YwDs/+Z564ttCEIiUlgM376LkC0Omecgl0TUDjzyhIDRsl/X8LU chQW87Lpj2l7yJlc8yRU8SO9uB9VV1iHeDZ7EYuxYMd3ZDNlbCP5uWlRJJcT2MF5SbF1lbGrozH 0Z70i4WmKEvHCUmf7pWWtyPNQXVcC/Cm09GgMyVD1rqMMEmjp/URWbAgc X-Gm-Gg: ASbGnctySMq4yuVQW7H/UG1HtxOInayi01ieu22TCU87FbDspJl1RONVLmLbhxATglM mfB4SvGUSXSfjaPNKYMzMknXtY0GL2JA9cVEh7xcEHVt7MxuhXs2AhGfBQLCLGqcHC+RwP3VAY/ hKPAO7KOsEzlT/tdjs2sS6QB2DBWBNzVzd+EWnJp8DDAvGSXJPr6UjQ/4RGm6kG9HLLLQR/LGaI yvIpGWmvTrUnX3KP13ADyrdmS3ZBo32oY7qg0N4O56/HxX7nIsb0MtWJ725zZ+J/hE02tewDB+4 SclsHE2lwZe4uAKT9KXgHrt0GKujSfx/4XAEDbCC5pIZTwhje72J X-Received: by 2002:a17:90b:5446:b0:311:482a:f956 with SMTP id 98e67ed59e1d1-31cae9989e4mr1609991a91.5.1752712922302; Wed, 16 Jul 2025 17:42:02 -0700 (PDT) X-Google-Smtp-Source: AGHT+IERJSQdSSL8Vo3WArCwO2D+1ROILgOberqXZPMTsuecnhPfXXsILl4OADCEzpvNuMViRToPgg== X-Received: by 2002:a17:90b:5446:b0:311:482a:f956 with SMTP id 98e67ed59e1d1-31cae9989e4mr1609954a91.5.1752712921886; Wed, 16 Jul 2025 17:42:01 -0700 (PDT) From: Arun Menon Date: Thu, 17 Jul 2025 06:07:44 +0530 Subject: [PATCH v5 21/23] migration: Capture error in postcopy_ram_listen_thread() MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250717-propagate_tpm_error-v5-21-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=2959; i=armenon@redhat.com; h=from:subject:message-id; bh=42uhy85WkdN9bMSUXABk6f8LoYWAKhZekD76Ts14rfw=; b=owGbwMvMwCWWVaVqcZPfqI/xtFoSQ0aFm/LcVSX3Ww+8nSl1JsVzYSerZG50kLWXseV9DaNFb F75j1U6SlkYxLgYZMUUWRq+Bsg2BRRGRNq+vA4zh5UJZAgDF6cATOT9IUaG1vJed0+Thc5GNY8Y btmcWfEr2Tu16tM/4SPispMdzlebMDL8Y7s8JUdf5enJr3dYJS4mROyUKjZf3Pd9qZx7WhS/zF8 mAA== 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.129.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: 1752713278511116600 This is an incremental step in converting vmstate loading code to report error via Error objects instead of directly printing it to console/monitor. postcopy_ram_listen_thread() calls qemu_loadvm_state_main() to load the vm, and in case of a failure, it should set the error in the migration object. When postcopy live migration runs, the device states are loaded by both the qemu coroutine process_incoming_migration_co() and the postcopy_ram_listen_thread(). Therefore, it is important that the coroutine also reports the error in case of failure, with error_report_err(). Otherwise, the source qemu will not display any errors before going into the postcopy pause state. Signed-off-by: Arun Menon --- migration/migration.c | 2 +- migration/savevm.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 1f0a8bd6ab28ff09bb76919564bdbfbde35c5e42..efd02d917cfe4d1221907123ead= d98932b02e8bc 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -925,7 +925,7 @@ fail: migrate_set_state(&mis->state, MIGRATION_STATUS_ACTIVE, MIGRATION_STATUS_FAILED); migrate_set_error(s, local_err); - error_free(local_err); + error_report_err(local_err); =20 migration_incoming_state_destroy(); =20 diff --git a/migration/savevm.c b/migration/savevm.c index 0fff65c96344c65191353311e72730cd6e3bfb23..4f67eebe5321c175d51e8029e36= ceb336c98ad1f 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2086,6 +2086,7 @@ static void *postcopy_ram_listen_thread(void *opaque) QEMUFile *f =3D mis->from_src_file; int load_res; MigrationState *migr =3D migrate_get_current(); + Error *local_err =3D NULL; =20 object_ref(OBJECT(migr)); =20 @@ -2102,7 +2103,7 @@ static void *postcopy_ram_listen_thread(void *opaque) qemu_file_set_blocking(f, true); =20 /* TODO: sanity check that only postcopiable data will be loaded here = */ - load_res =3D qemu_loadvm_state_main(f, mis, NULL); + load_res =3D qemu_loadvm_state_main(f, mis, &local_err); =20 /* * This is tricky, but, mis->from_src_file can change after it @@ -2128,7 +2129,12 @@ static void *postcopy_ram_listen_thread(void *opaque) __func__, load_res); load_res =3D 0; /* prevent further exit() */ } else { - error_report("%s: loadvm failed: %d", __func__, load_res); + if (local_err !=3D NULL) { + error_prepend(&local_err, "%s: loadvm failed: %d", __func_= _, + load_res); + migrate_set_error(migr, local_err); + error_report_err(local_err); + } migrate_set_state(&mis->state, MIGRATION_STATUS_POSTCOPY_ACTIV= E, MIGRATION_STATUS_FAILED); } --=20 2.50.0