From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 41DDDCAC5B8 for ; Tue, 30 Sep 2025 04:29:03 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v3Ruj-0001ET-Ea; Tue, 30 Sep 2025 00:24:34 -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 1v3Rsm-0006TE-2M for qemu-arm@nongnu.org; Tue, 30 Sep 2025 00:22:32 -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 1v3RsY-0003KB-KK for qemu-arm@nongnu.org; Tue, 30 Sep 2025 00:22:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1759206133; 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=sSbMiD0S6XANubdSaRE+CcxdWMc363o6uw1yalfL3f8=; b=SdqH2GHjLoW2Pp9VYq4gyK6VRRaXWBpQLIsMBV6356iqBdH/0B14xbNx57Uyg7TdBMunmy cFeIHO1JajiYqFWWkj1S8uu8ddRLdixkt5DU5d6LGy+QgoI7Nb9OcYonSD9PQ8Cz8SKc9y zXbWd03/iWAQSDNym9bRASNEcODsktI= Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-437-T2Ib8u0hPQGfyc33C-H_0A-1; Tue, 30 Sep 2025 00:22:10 -0400 X-MC-Unique: T2Ib8u0hPQGfyc33C-H_0A-1 X-Mimecast-MFC-AGG-ID: T2Ib8u0hPQGfyc33C-H_0A_1759206130 Received: by mail-pf1-f200.google.com with SMTP id d2e1a72fcca58-780d26fb6b4so4575427b3a.0 for ; Mon, 29 Sep 2025 21:22:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759206130; x=1759810930; 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=sSbMiD0S6XANubdSaRE+CcxdWMc363o6uw1yalfL3f8=; b=l1wEj0K9xEkyR6tHXLlpJPNmvwaABt5bHC6gxvJ2+DDvwAGRwCIAGhwTvVmqkghcZe vsf43Qp56xIa9u5d3fx/tCUGn983PP0mYdwIjGe+ayxORpS95LwaIKm0hwKQeOkrBsI6 Rib9pvEXEpcSObcHghXODBeqhdZcNiOn265mFnPbj/l4xpC1bVvEHXsyIonXmJYTfkQC z1bRYxviLRH6Ow9DOV7V+YL21xhL74M1RVV+RVYLw+/1e6MuMpgflX+BusIQvQNZTpPM 9XP4XHubsXTADolImaxfQFLSyQB7rxdiaVgvNSi8/ihiTJu0QkxNpZnnsHB8hzZ2MeYZ Acuw== X-Forwarded-Encrypted: i=1; AJvYcCUOuVaaeVbS9VLd1EYRAayHhbJLY8LQ9zdQEQi+pe8vO8q/jcn227sEgzmFM3dPcJbQi0lKaOYUeQ==@nongnu.org X-Gm-Message-State: AOJu0Yz0XYjyTIk/GWL9Er0Yu6fYN8LWvdfYpPERX5C6F0mQ+x/Elx/R lw/50GAID9yD9aL/ztwBBOYFTOkrm+lOoA/yCDiXIBjOXkMOlMHRNRj1UzhdjmvrI9fXhGxAwcx OZdjdQjbAdwdMlNA/B7eRP5h/F1QhVsoDkRlniA5nAsFmH9Z7iOVbmg== X-Gm-Gg: ASbGncvCdUUzeVuVwLHQAOUbXYOOCqbl3RXyAEDvXNymAYGLR/g4DF1/5aSXxHII5q9 qurmNRG0Ju3X03Qc0apdADCbf6Icxi0TvU3dcoVnW2Za8mj4O6qqpasJHgsHbYoMJMVY2bppvVX 1yOmOL6WHkCA57tFny+cc8UfhuuJvnSmteJ3zOiCLq7nlz9d1b+IYk9iFi96kS2EXs7jh/lw+RZ m1Y5b7vrJcgTUc33FTtlnK/lRE2SwqY7U/bdhJBwyzETfh0Xz+z5+Q7D4ufJEmn8tpQqxDXqvkt +GmaEPDhkt1CzS44Woxfm+0F5C0p9f+DLa0Z49zJ4JFyeToOQBrJg7hxig== X-Received: by 2002:a05:6a21:6d89:b0:2d5:264c:e49d with SMTP id adf61e73a8af0-2e7bf47c0fbmr20132326637.11.1759206129797; Mon, 29 Sep 2025 21:22:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGeQqJXlQZo3Xz7swq1CiaKu4JakmJL3iYI84a4Ym80MT9ctRHN/M7FjYsTRZRDQEOlRxNfuQ== X-Received: by 2002:a05:6a21:6d89:b0:2d5:264c:e49d with SMTP id adf61e73a8af0-2e7bf47c0fbmr20132270637.11.1759206129375; Mon, 29 Sep 2025 21:22:09 -0700 (PDT) Received: from armenon-kvm.bengluru.csb ([49.36.108.92]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b57c55a339dsm12534158a12.40.2025.09.29.21.22.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Sep 2025 21:22:09 -0700 (PDT) From: Arun Menon Date: Tue, 30 Sep 2025 09:48:31 +0530 Subject: [PATCH v15 22/26] migration: push Error **errp into loadvm_postcopy_handle_switchover_start() MIME-Version: 1.0 Message-Id: <20250930-propagate_tpm_error-v15-22-84afd3af1e47@redhat.com> References: <20250930-propagate_tpm_error-v15-0-84afd3af1e47@redhat.com> In-Reply-To: <20250930-propagate_tpm_error-v15-0-84afd3af1e47@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=1850; i=armenon@redhat.com; h=from:subject:message-id; bh=BaBhVPmuOC8KBhh2+81w1uLDIxw24n1+NGBQJ8RFRwI=; b=owGbwMvMwCWWVaVqcZPfqI/xtFoSQ8btKKHk2RNjfeeG3vrJFD/vU9L5nrCNx1wOGs6QiJ2xs 7BlhapTRykLgxgXg6yYIkvD1wDZpoDCiEjbl9dh5rAygQxh4OIUgImIrWX4H7Lm1Opu0/m3Pi3k eVKRc0Ox5OeDaa8OT3vw1qpBN/sd/zZGhs9HXC6/d73ex8sgZ7zsw5kow6qdj0QDTqzKmde0UJV 1MTsA X-Developer-Key: i=armenon@redhat.com; a=openpgp; fpr=80F5501D82507158593DE9D76A7A2538D90F328E X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: hkT3HDqxqUXG9oc8lVOHLdol_sHQuRWd_t4601QNJcQ_1759206130 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit 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: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=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=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@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-arm-bounces+qemu-arm=archiver.kernel.org@nongnu.org Sender: qemu-arm-bounces+qemu-arm=archiver.kernel.org@nongnu.org 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_switchover_start() must report an error in errp, in case of failure. Reviewed-by: Fabiano Rosas Reviewed-by: Daniel P. Berrangé Tested-by: Fabiano Rosas Reviewed-by: Akihiko Odaki Signed-off-by: Arun Menon --- migration/savevm.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/migration/savevm.c b/migration/savevm.c index 8937496d9f667f8f524f73bab80dd7e711973a1c..34b7a28d38dcc4293457a87b34dbeaf538d89de9 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2534,7 +2534,7 @@ static int loadvm_process_enable_colo(MigrationIncomingState *mis, return ret; } -static int loadvm_postcopy_handle_switchover_start(void) +static int loadvm_postcopy_handle_switchover_start(Error **errp) { SaveStateEntry *se; @@ -2547,6 +2547,7 @@ static int loadvm_postcopy_handle_switchover_start(void) ret = se->ops->switchover_start(se->opaque); if (ret < 0) { + error_setg(errp, "Switchover start failed: %d", ret); return ret; } } @@ -2655,11 +2656,7 @@ static int loadvm_process_command(QEMUFile *f, Error **errp) return loadvm_process_enable_colo(mis, errp); case MIG_CMD_SWITCHOVER_START: - ret = loadvm_postcopy_handle_switchover_start(); - if (ret < 0) { - error_setg(errp, "Failed to load device state command: %d", ret); - } - return ret; + return loadvm_postcopy_handle_switchover_start(errp); } return 0; -- 2.51.0