From nobody Tue Nov 26 10:53:36 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1709066883918508.6210989438115; Tue, 27 Feb 2024 12:48:03 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rf4Ku-00060M-35; Tue, 27 Feb 2024 15:46:00 -0500 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 1rf1ob-0003SK-1w for qemu-devel@nongnu.org; Tue, 27 Feb 2024 13:04:29 -0500 Received: from gandalf.ozlabs.org ([150.107.74.76]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rf1oL-0001V6-DC for qemu-devel@nongnu.org; Tue, 27 Feb 2024 13:04:28 -0500 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gandalf.ozlabs.org (Postfix) with ESMTP id 4Tkljl2ffDz4wyk; Wed, 28 Feb 2024 05:04:11 +1100 (AEDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Tkljh5WjMz4wyj; Wed, 28 Feb 2024 05:04:08 +1100 (AEDT) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: qemu-devel@nongnu.org Cc: Peter Xu , Fabiano Rosas , Alex Williamson , Avihai Horon , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Subject: [PATCH v2 05/21] migration: Add Error** argument to qemu_savevm_state_setup() Date: Tue, 27 Feb 2024 19:03:29 +0100 Message-ID: <20240227180345.548960-6-clg@redhat.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240227180345.548960-1-clg@redhat.com> References: <20240227180345.548960-1-clg@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=150.107.74.76; envelope-from=SRS0=GitP=KE=redhat.com=clg@ozlabs.org; helo=gandalf.ozlabs.org X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, HEADER_FROM_DIFFERENT_DOMAINS=0.249, SPF_HELO_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_TEMPERROR=0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Tue, 27 Feb 2024 15:45:31 -0500 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-ZM-MESSAGEID: 1709066884781100003 This prepares ground for the changes coming next which add an Error** argument to the .save_setup() handler. Callers of qemu_savevm_state_setup() now handle the error and fail earlier. This is a functional change that should be examined closely. Signed-off-by: C=C3=A9dric Le Goater --- migration/savevm.h | 2 +- migration/migration.c | 20 ++++++++++++++++++-- migration/savevm.c | 14 +++++++------- 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/migration/savevm.h b/migration/savevm.h index 74669733dd63a080b765866c703234a5c4939223..9ec96a995c93a42aad621595f0e= d58596c532328 100644 --- a/migration/savevm.h +++ b/migration/savevm.h @@ -32,7 +32,7 @@ bool qemu_savevm_state_blocked(Error **errp); void qemu_savevm_non_migratable_list(strList **reasons); int qemu_savevm_state_prepare(Error **errp); -void qemu_savevm_state_setup(QEMUFile *f); +int qemu_savevm_state_setup(QEMUFile *f, Error **errp); bool qemu_savevm_state_guest_unplug_pending(void); int qemu_savevm_state_resume_prepare(MigrationState *s); void qemu_savevm_state_header(QEMUFile *f); diff --git a/migration/migration.c b/migration/migration.c index 5316bbe6704742e604ae55dc7b47a4e11e73c2a4..c1a62b696f62c0d5aca0505e58b= c4dc0ff561fde 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -3314,6 +3314,8 @@ static void *migration_thread(void *opaque) int64_t setup_start =3D qemu_clock_get_ms(QEMU_CLOCK_HOST); MigThrError thr_error; bool urgent =3D false; + Error *local_err =3D NULL; + int ret; =20 thread =3D migration_threads_add("live_migration", qemu_get_thread_id(= )); =20 @@ -3357,9 +3359,15 @@ static void *migration_thread(void *opaque) } =20 bql_lock(); - qemu_savevm_state_setup(s->to_dst_file); + ret =3D qemu_savevm_state_setup(s->to_dst_file, &local_err); bql_unlock(); =20 + if (ret) { + migrate_set_error(s, local_err); + error_free(local_err); + goto out; + } + qemu_savevm_wait_unplug(s, MIGRATION_STATUS_SETUP, MIGRATION_STATUS_ACTIVE); =20 @@ -3436,6 +3444,8 @@ static void *bg_migration_thread(void *opaque) MigThrError thr_error; QEMUFile *fb; bool early_fail =3D true; + Error *local_err =3D NULL; + int ret; =20 rcu_register_thread(); object_ref(OBJECT(s)); @@ -3469,9 +3479,15 @@ static void *bg_migration_thread(void *opaque) =20 bql_lock(); qemu_savevm_state_header(s->to_dst_file); - qemu_savevm_state_setup(s->to_dst_file); + ret =3D qemu_savevm_state_setup(s->to_dst_file, &local_err); bql_unlock(); =20 + if (ret) { + migrate_set_error(s, local_err); + error_free(local_err); + goto fail; + } + qemu_savevm_wait_unplug(s, MIGRATION_STATUS_SETUP, MIGRATION_STATUS_ACTIVE); =20 diff --git a/migration/savevm.c b/migration/savevm.c index 51876f2ef674bb76c7e7ef96e1119a083883deac..bc168371a31acf85f29f2c284be= 181250db45df4 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1311,11 +1311,10 @@ int qemu_savevm_state_prepare(Error **errp) return 0; } =20 -void qemu_savevm_state_setup(QEMUFile *f) +int qemu_savevm_state_setup(QEMUFile *f, Error **errp) { MigrationState *ms =3D migrate_get_current(); SaveStateEntry *se; - Error *local_err =3D NULL; int ret =3D 0; =20 json_writer_int64(ms->vmdesc, "page_size", qemu_target_page_size()); @@ -1351,12 +1350,10 @@ void qemu_savevm_state_setup(QEMUFile *f) } =20 if (ret) { - return; + return ret; } =20 - if (precopy_notify(PRECOPY_NOTIFY_SETUP, &local_err)) { - error_report_err(local_err); - } + return precopy_notify(PRECOPY_NOTIFY_SETUP, errp); } =20 int qemu_savevm_state_resume_prepare(MigrationState *s) @@ -1725,7 +1722,10 @@ static int qemu_savevm_state(QEMUFile *f, Error **er= rp) ms->to_dst_file =3D f; =20 qemu_savevm_state_header(f); - qemu_savevm_state_setup(f); + ret =3D qemu_savevm_state_setup(f, errp); + if (ret) { + return ret; + } =20 while (qemu_file_get_error(f) =3D=3D 0) { if (qemu_savevm_state_iterate(f, false) > 0) { --=20 2.43.2