From nobody Sun Sep 28 16:34:02 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=1758209633; cv=none; d=zohomail.com; s=zohoarc; b=UVYrdSl70lUqgXgvcIhnO+jeQsIfwMa6gKqlMjtm1GEHI3ftJlBa98dhTUH2++KNgHHiybRUfY99wiGRQNjkwnFfX0gN3XSKR89lUPrg6xPivm3c5CGk0oNU5xb0oWB1ma++PuscvVpdDXtsRO7pfpgELqSMHTlA+H9tul4NOL4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1758209633; 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=1nZZiGu+K47IEF65X0NaWF9ITwNWS/RFb4YkerOV6gk=; b=VoFkcs+QZ21pA/vqkL990vbpaFjI9vAzbrkbVVonhgQ4SxDWbXktTwpLVj477RwegHnV7C7fUdyGulTUNAf1Axg5NE5O8DYMIVM+GIZC/jZT1OOeFXy+ze8i+n2myEXGxtiEREWSBE2D8LBg0H4OwHwQl9+mW/etEzqbwc5n+UY= 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 1758209633888190.64428875509077; Thu, 18 Sep 2025 08:33:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uzGVE-00042G-9t; Thu, 18 Sep 2025 11:24:56 -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 1uzGVA-0003vK-9G for qemu-devel@nongnu.org; Thu, 18 Sep 2025 11:24:52 -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 1uzGV8-0002jr-3I for qemu-devel@nongnu.org; Thu, 18 Sep 2025 11:24:51 -0400 Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-548-gh1yR-QyO0GDVfRkCwHQcw-1; Thu, 18 Sep 2025 11:24:48 -0400 Received: by mail-pf1-f198.google.com with SMTP id d2e1a72fcca58-77241858ec1so1164403b3a.0 for ; Thu, 18 Sep 2025 08:24:48 -0700 (PDT) Received: from armenon-kvm.bengluru.csb ([49.36.110.230]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-77cfc2481d7sm2675512b3a.32.2025.09.18.08.24.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Sep 2025 08:24:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1758209089; 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=1nZZiGu+K47IEF65X0NaWF9ITwNWS/RFb4YkerOV6gk=; b=NEZAgHugmZOitleeg/V+Bvgn5Yw9T0hMtFGxYJYUgkdxD/M1bXy38F6/Ha/kJ4wLLIWtzt vb1uLM144B1zMgxBTq0PmTPeSW7Z+43rjMi6R2aKgWRNGS8VCyhFDBrQ5HGwIKQ2G3qcUh lE2xN2GcfZPTGh6p2nbHzXegQ5ixP8U= X-MC-Unique: gh1yR-QyO0GDVfRkCwHQcw-1 X-Mimecast-MFC-AGG-ID: gh1yR-QyO0GDVfRkCwHQcw_1758209087 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758209087; x=1758813887; 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=1nZZiGu+K47IEF65X0NaWF9ITwNWS/RFb4YkerOV6gk=; b=S+ibYidOHoZ75DRUBGL9Jd2ue2yQKy8DIPjTk+f6wG9Y6OjVkX3zhz27ZUy8+vVnJM ZUU3PsWMq1WpOM1afqyAadtk26wtoiwD2Wfc1SPtsUzJLCpu5Aos8+oYyIX1IlkTova3 gu2Ec/xe3R56y1J7ItVWLSHkHvIjLFZLkowq4wPjbMYgowpChlJUZU9n7vrwGwN1IR3/ gektArZZ+bISlTf9xPvvI49zlSZwo15/8ikH7l5FZdXlLmjnCl9mNmbqHVQ9HERCh5bv NQzyQhfb9fWAfCM6pFNAH6sg2+ntSTdN7InkvO6IFieANirXCXlEuXQWA4fTwXmin4Uh PGpA== X-Gm-Message-State: AOJu0YztqomnE8avya4bvsSK0hyCXMPcYzoqPIHZ4MmLY0yGCvJY7luk +jjfn5zuOXQa1U8b9vu1eD3TO08itiByoZL5TqBS84D0W6SxrCeDXcXSj8dhSwgBnQHL6yqTF8x RKevDyvvWglNsqpiruz90LepefluzXMUNDF+QYTgOGZmhFdmyUjAZqeWl X-Gm-Gg: ASbGncuhwtvsU/DoFOxkY0CR6LOxzSU8/Hbw2Ye54Jht/XlQ+IhR6ikEsJcMp+nhtch V7reHOGBYVd4cH1VrUUwRgmoxmEZUp768iITtrS8Bs7I99Hn/2g6qH60T/JBDBrheW6SP2KmIVp ZQ6Pt4TGfjac06NeSLnhdToo6JcqgT+UdebrlcWYhBU513B4jffeS7cT/C0H8Vm1HZHCZnqZ+7x LI6fuWrbG+g2W1MkIXbCW/ZZLsJidVb9VxYCBbMtrKJXTF4xoZdzneneHBpYHKDosAKwRZ5Uu66 UKmJta7Vvo1qX/nxhkYZX7jC7tkSTsb5UGOe5XW7pBWZUS9HEgsfNg== X-Received: by 2002:a05:6a00:1992:b0:77d:13e3:ccfa with SMTP id d2e1a72fcca58-77d13e3ecdcmr4288499b3a.4.1758209086913; Thu, 18 Sep 2025 08:24:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFDEtBDV5GWMugTnv1URRn1BiyYUovAg3YH4X1KUhW5RH8Tqoso5H7nEGfbh/kQsHMtMUgpOA== X-Received: by 2002:a05:6a00:1992:b0:77d:13e3:ccfa with SMTP id d2e1a72fcca58-77d13e3ecdcmr4288448b3a.4.1758209086417; Thu, 18 Sep 2025 08:24:46 -0700 (PDT) From: Arun Menon Date: Thu, 18 Sep 2025 20:53:24 +0530 Subject: [PATCH v14 07/27] migration: push Error **errp into qemu_loadvm_state() MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250918-propagate_tpm_error-v14-7-36f11a6fb9d3@redhat.com> References: <20250918-propagate_tpm_error-v14-0-36f11a6fb9d3@redhat.com> In-Reply-To: <20250918-propagate_tpm_error-v14-0-36f11a6fb9d3@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 X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=6219; i=armenon@redhat.com; h=from:subject:message-id; bh=IIT+8nokWMp/vohnpdDSOWEYBogGfJ2e1LS670VvRDE=; b=owGbwMvMwCWWVaVqcZPfqI/xtFoSQ8YZ5e8rH4j+3TtdeO4GHa/m5alnPk6oOjLD3u9Q3ly1G 3M8dUzzO0pZGMS4GGTFFFkavgbINgUURkTavrwOM4eVCWQIAxenAEwkYwvDP827duf2i9pN5F5l Gsgqu6Xtl/bC2NKlHb9PlKb1TdO/Hsnwv0gu40X7oco3CyansIbnpq8t2PdW3/HiTlMDrm9ZEc6 LmQE= 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.005, 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: 1758209634711116600 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 qemu_loadvm_state() must report an error in errp, in case of failure. 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. Suggested-by: Akihiko Odaki Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Fabiano Rosas Signed-off-by: Arun Menon --- migration/migration.c | 14 ++++++++++++-- migration/savevm.c | 30 ++++++++++++++++++------------ migration/savevm.h | 2 +- 3 files changed, 31 insertions(+), 15 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 10c216d25dec01f206eacad2edd24d21f00e614c..fcf76cf73595c93e7616ee7341f= 2e02a598e4e3b 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -881,7 +881,7 @@ process_incoming_migration_co(void *opaque) MIGRATION_STATUS_ACTIVE); =20 mis->loadvm_co =3D qemu_coroutine_self(); - ret =3D qemu_loadvm_state(mis->from_src_file); + ret =3D qemu_loadvm_state(mis->from_src_file, &local_err); mis->loadvm_co =3D NULL; =20 trace_vmstate_downtime_checkpoint("dst-precopy-loadvm-completed"); @@ -908,7 +908,8 @@ process_incoming_migration_co(void *opaque) } =20 if (ret < 0) { - error_setg(&local_err, "load of migration failed: %s", strerror(-r= et)); + error_prepend(&local_err, "load of migration failed: %s: ", + strerror(-ret)); goto fail; } =20 @@ -935,6 +936,15 @@ fail: } =20 exit(EXIT_FAILURE); + } else { + /* + * Report the error here in case that QEMU abruptly exits + * when postcopy is enabled. + */ + WITH_QEMU_LOCK_GUARD(&s->error_mutex) { + error_report_err(s->error); + s->error =3D NULL; + } } out: /* Pairs with the refcount taken in qmp_migrate_incoming() */ diff --git a/migration/savevm.c b/migration/savevm.c index de5671ffd1cd06e728227a3056c3f895d3a6e6f3..0087fca15ce108685667d380835= 0d80d37b807b1 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -3159,28 +3159,24 @@ out: return ret; } =20 -int qemu_loadvm_state(QEMUFile *f) +int qemu_loadvm_state(QEMUFile *f, Error **errp) { MigrationState *s =3D migrate_get_current(); MigrationIncomingState *mis =3D migration_incoming_get_current(); - Error *local_err =3D NULL; int ret; =20 - if (qemu_savevm_state_blocked(&local_err)) { - error_report_err(local_err); + if (qemu_savevm_state_blocked(errp)) { return -EINVAL; } =20 qemu_loadvm_thread_pool_create(mis); =20 - ret =3D qemu_loadvm_state_header(f, &local_err); + ret =3D qemu_loadvm_state_header(f, errp); if (ret) { - error_report_err(local_err); return ret; } =20 - if (qemu_loadvm_state_setup(f, &local_err) !=3D 0) { - error_report_err(local_err); + if (qemu_loadvm_state_setup(f, errp) !=3D 0) { return -EINVAL; } =20 @@ -3191,6 +3187,9 @@ int qemu_loadvm_state(QEMUFile *f) cpu_synchronize_all_pre_loadvm(); =20 ret =3D qemu_loadvm_state_main(f, mis); + if (ret < 0) { + error_setg(errp, "Load VM state failed: %d", ret); + } qemu_event_set(&mis->main_thread_load_event); =20 trace_qemu_loadvm_state_post_main(ret); @@ -3208,8 +3207,15 @@ int qemu_loadvm_state(QEMUFile *f) if (migrate_has_error(migrate_get_current()) || !qemu_loadvm_thread_pool_wait(s, mis)) { ret =3D -EINVAL; + error_setg(errp, + "Error while loading vmstate"); } else { ret =3D qemu_file_get_error(f); + if (ret < 0) { + error_setg(errp, + "Error while loading vmstate: stream error: %d", + ret); + } } } /* @@ -3474,6 +3480,7 @@ void qmp_xen_save_devices_state(const char *filename,= bool has_live, bool live, =20 void qmp_xen_load_devices_state(const char *filename, Error **errp) { + ERRP_GUARD(); QEMUFile *f; QIOChannelFile *ioc; int ret; @@ -3495,10 +3502,10 @@ void qmp_xen_load_devices_state(const char *filenam= e, Error **errp) f =3D qemu_file_new_input(QIO_CHANNEL(ioc)); object_unref(OBJECT(ioc)); =20 - ret =3D qemu_loadvm_state(f); + ret =3D qemu_loadvm_state(f, errp); qemu_fclose(f); if (ret < 0) { - error_setg(errp, "loading Xen device state failed"); + error_prepend(errp, "loading Xen device state failed: "); } migration_incoming_state_destroy(); } @@ -3569,13 +3576,12 @@ bool load_snapshot(const char *name, const char *vm= state, ret =3D -EINVAL; goto err_drain; } - ret =3D qemu_loadvm_state(f); + ret =3D qemu_loadvm_state(f, errp); migration_incoming_state_destroy(); =20 bdrv_drain_all_end(); =20 if (ret < 0) { - error_setg(errp, "Error %d while loading VM state", ret); return false; } =20 diff --git a/migration/savevm.h b/migration/savevm.h index 2d5e9c716686f06720325e82fe90c75335ced1de..b80770b7461a60e2ad6ba5e24a7= baeae73d90955 100644 --- a/migration/savevm.h +++ b/migration/savevm.h @@ -64,7 +64,7 @@ void qemu_savevm_send_colo_enable(QEMUFile *f); void qemu_savevm_live_state(QEMUFile *f); int qemu_save_device_state(QEMUFile *f); =20 -int qemu_loadvm_state(QEMUFile *f); +int qemu_loadvm_state(QEMUFile *f, Error **errp); void qemu_loadvm_state_cleanup(MigrationIncomingState *mis); int qemu_loadvm_state_main(QEMUFile *f, MigrationIncomingState *mis); int qemu_load_device_state(QEMUFile *f); --=20 2.51.0