From nobody Sun Sep 28 16:33:54 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=1756570213; cv=none; d=zohomail.com; s=zohoarc; b=DCFmyvc1n0Cme2omPzq0QSfXmWyacs+ENQN2Mce1UClrepRiTPJ2OxQy6udvP7EkvKN7cl7yf6JLJTrYaiMJN3vh0bzkHXP4d10Z5g2N8TcnisGd/QlFjD0ioaIooPU1R1yESP3ERMq0svFIQhvHs1pJ3raOuE1kL9HBFV5l6pc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756570213; 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=sTWUNM+v16RdqicPQUSVUg/HZymrt0SY9y6hBqA0bZE=; b=I/jHy/fmROzSkneUhqqVVs4/909cE5B2Rz3Wio8qlnXJ+astb6Gv/MT9+tvjS3m9HfswlyLlx4HwSIdyITu/nsk5ZOOV6D5m3FpphjGdUkyPiGxaKOL4+sLfTlRcAsYDfT2EqhORMpSyuKxElAEGjjl0B+NMdSi9cOuLshiwRsI= 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 1756570213380203.87267361719705; Sat, 30 Aug 2025 09:10:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1usNf7-0005f2-5u; Sat, 30 Aug 2025 11:38:41 -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 1us5M1-0005rV-Rs for qemu-devel@nongnu.org; Fri, 29 Aug 2025 16:05:46 -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 1us5Lz-00051o-Jp for qemu-devel@nongnu.org; Fri, 29 Aug 2025 16:05:45 -0400 Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-464-r03f-ciVP_aZeFkpSEAwyw-1; Fri, 29 Aug 2025 16:05:40 -0400 Received: by mail-pj1-f69.google.com with SMTP id 98e67ed59e1d1-327b289e88dso2294182a91.3 for ; Fri, 29 Aug 2025 13:05:40 -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.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Aug 2025 13:05:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1756497942; 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=sTWUNM+v16RdqicPQUSVUg/HZymrt0SY9y6hBqA0bZE=; b=R7qHIomNg9/HNnucYYOIOJ1sYN22fo1zYrQ4ktEb27TNzm+OtlVDaKWOoq6NuqYkxuoK/W s0q7OXeN0ssDD/xF34xP1X/hkbgW+Hy3NCGxF4kkhQpEuQSdvNHBkoHCs4ZftGrEAHO2NL OlpOaYOqnZ/rnplEKFBaw4j+o0Eu+LQ= X-MC-Unique: r03f-ciVP_aZeFkpSEAwyw-1 X-Mimecast-MFC-AGG-ID: r03f-ciVP_aZeFkpSEAwyw_1756497940 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756497940; x=1757102740; 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=sTWUNM+v16RdqicPQUSVUg/HZymrt0SY9y6hBqA0bZE=; b=B6rFk/L+QV533WTIJ1AXBElWh/5pyOgu+Iyep2mZljz1L9LJ7WYZVA/knkop8Xp+bd 497VvtAGl7Klyw5C93QrjHZ99dkJ8PQfXW5pLYDnvW3pz12GSUz6xcb6gBncwvCyq0UH 8bF3crR/qLZ3LaDOPEnqlTBCMsK7IIBrFgFkGxRH/pTwzS1ie4JsGtKda8u/On5k7Xmw zXHcSjZXyZ164zJkExWUqaMThwu5WfFB3CqgW0JDVAdeLN6EOfs4J8P98tydj5v0PUVB ZXuwcpow0D0iCguhtOUTIukt1wX1BhT5azh6vkiopp+rxFGsiCmFc5YtslwV9gdBO5QQ dcAQ== X-Gm-Message-State: AOJu0YwPOBvAImTnjL8XUMJzK0rDATdYCJmJNcTds8W2cVnMxWWx8CrW ESGQNPe1XSAlAgLV4iBOniR4dnJCYEV+eUTBIJnfynEaQ6Sd4zBMkkRBU2kxKMgjQBaEhEB/GPO T3285ZMAGiZ3tBHWdHX+mCwnRiXxwzKUpNuxJq9UCexUk22gTv2PHfpSy X-Gm-Gg: ASbGncs1ivsqiSJzIvXe3lwF9RqjkrC+gsPLaVa7AZiqkPPClxQIX9UflduQr2NzYca Q+V07MoYQ3GbNBXruSbt8VMT3FfdU0c4u/0+FalHwnL0NaagJ2fnUZtBr3ddgcP0UUB1Sw/Wb2+ zdUDUVf70WRrEKaeWg6Xbe9K8Jp6B5EsQSWT1W+jymsMzEB6RuzbfcyhFBy6aM10eZsYA1anoiS 6V48Gnn9pVTXVrfoDG/dEHX2ohmesCxbVWPfzkbDSt+hn6wXtRPRE/Nxoc7W/T4yyWDU+BdvTd+ 2WqaMiU4iNqypHIwjOjxqXLTC20ttd38XWC7jzNZm1xgdmL+1MlJaQ== X-Received: by 2002:a17:90b:2c86:b0:327:96dd:628f with SMTP id 98e67ed59e1d1-32796dd64f9mr10922209a91.28.1756497939368; Fri, 29 Aug 2025 13:05:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEgVab+QOhAR+6X6vdJhhvygp82NI/aZxt1hAmYJpSx3vTSKy/iFMJANAZWdLV9cPqWoc1BhQ== X-Received: by 2002:a17:90b:2c86:b0:327:96dd:628f with SMTP id 98e67ed59e1d1-32796dd64f9mr10922176a91.28.1756497938950; Fri, 29 Aug 2025 13:05:38 -0700 (PDT) From: Arun Menon Date: Sat, 30 Aug 2025 01:31:54 +0530 Subject: [PATCH v13 14/27] migration: push Error **errp into ram_postcopy_incoming_init() MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250830-propagate_tpm_error-v13-14-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 X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4806; i=armenon@redhat.com; h=from:subject:message-id; bh=NxHIEIcsn6ki3pjI+1SDVs7doJTeFpfWjxBGpIKPSXQ=; b=owGbwMvMwCWWVaVqcZPfqI/xtFoSQ8Ymdt+fYf6c+Ze0zV//Kt/B9/9ebUWQTV3ztaVpfPms8 v+vPbnQUcrCIMbFICumyNLwNUC2KaAwItL25XWYOaxMIEMYuDgFYCJJZxkZ2qxnV5b8CRU0a7YO 6v9f3m502JXvxO4Nl1+z571wz4rcysjwNXtttGeva0L340X1/N45wu88T1zQccm2m7LM8oCHYTI fAA== 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: 1756570214339116600 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 ram_postcopy_incoming_init() must report an error in errp, in case of failure. Reviewed-by: Fabiano Rosas Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Arun Menon --- migration/postcopy-ram.c | 9 ++++++--- migration/postcopy-ram.h | 2 +- migration/ram.c | 4 ++-- migration/ram.h | 2 +- migration/savevm.c | 2 +- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c index 45af9a361e8eacaad0fb217a5da2c5004416c1da..05617e5fbcad62226a54fe17d9f= 7d9a316baf1e4 100644 --- a/migration/postcopy-ram.c +++ b/migration/postcopy-ram.c @@ -681,6 +681,7 @@ out: */ static int init_range(RAMBlock *rb, void *opaque) { + Error **errp =3D opaque; const char *block_name =3D qemu_ram_get_idstr(rb); void *host_addr =3D qemu_ram_get_host_addr(rb); ram_addr_t offset =3D qemu_ram_get_offset(rb); @@ -701,6 +702,8 @@ static int init_range(RAMBlock *rb, void *opaque) * (Precopy will just overwrite this data, so doesn't need the discard) */ if (ram_discard_range(block_name, 0, length)) { + error_setg(errp, "failed to discard RAM block %s len=3D%zu", + block_name, length); return -1; } =20 @@ -749,9 +752,9 @@ static int cleanup_range(RAMBlock *rb, void *opaque) * postcopy later; must be called prior to any precopy. * called from arch_init's similarly named ram_postcopy_incoming_init */ -int postcopy_ram_incoming_init(MigrationIncomingState *mis) +int postcopy_ram_incoming_init(MigrationIncomingState *mis, Error **errp) { - if (foreach_not_ignored_block(init_range, NULL)) { + if (foreach_not_ignored_block(init_range, errp)) { return -1; } =20 @@ -1703,7 +1706,7 @@ bool postcopy_ram_supported_by_host(MigrationIncoming= State *mis, Error **errp) return false; } =20 -int postcopy_ram_incoming_init(MigrationIncomingState *mis) +int postcopy_ram_incoming_init(MigrationIncomingState *mis, Error **errp) { error_report("postcopy_ram_incoming_init: No OS support"); return -1; diff --git a/migration/postcopy-ram.h b/migration/postcopy-ram.h index 3852141d7e37ab18bada4b46c137fef0969d0070..ca19433b246893fa5105bcebffb= 442c58a9a4f48 100644 --- a/migration/postcopy-ram.h +++ b/migration/postcopy-ram.h @@ -30,7 +30,7 @@ int postcopy_ram_incoming_setup(MigrationIncomingState *m= is); * postcopy later; must be called prior to any precopy. * called from ram.c's similarly named ram_postcopy_incoming_init */ -int postcopy_ram_incoming_init(MigrationIncomingState *mis); +int postcopy_ram_incoming_init(MigrationIncomingState *mis, Error **errp); =20 /* * At the end of a migration where postcopy_ram_incoming_init was called. diff --git a/migration/ram.c b/migration/ram.c index 7208bc114fb5c366740db380ee6956a91b3871a0..6a0dcc04f436524a37672c41c38= f201f06773374 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -3716,9 +3716,9 @@ static int ram_load_cleanup(void *opaque) * postcopy-ram. postcopy-ram's similarly names * postcopy_ram_incoming_init does the work. */ -int ram_postcopy_incoming_init(MigrationIncomingState *mis) +int ram_postcopy_incoming_init(MigrationIncomingState *mis, Error **errp) { - return postcopy_ram_incoming_init(mis); + return postcopy_ram_incoming_init(mis, errp); } =20 /** diff --git a/migration/ram.h b/migration/ram.h index 921c39a2c5c45bc2344be80854c46e4c10c09aeb..275709a99187f9429ccb4111e05= 281ec268ba0db 100644 --- a/migration/ram.h +++ b/migration/ram.h @@ -86,7 +86,7 @@ void ram_postcopy_migrated_memory_release(MigrationState = *ms); void ram_postcopy_send_discard_bitmap(MigrationState *ms); /* For incoming postcopy discard */ int ram_discard_range(const char *block_name, uint64_t start, size_t lengt= h); -int ram_postcopy_incoming_init(MigrationIncomingState *mis); +int ram_postcopy_incoming_init(MigrationIncomingState *mis, Error **errp); int ram_load_postcopy(QEMUFile *f, int channel); =20 void ram_handle_zero(void *host, uint64_t size); diff --git a/migration/savevm.c b/migration/savevm.c index c079942b7ecb959b3b668b977174d906f73c2777..a1b606318f2ae8feff42b759ad3= 08ebbd07318b7 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1989,7 +1989,7 @@ static int loadvm_postcopy_handle_advise(MigrationInc= omingState *mis, return -1; } =20 - if (ram_postcopy_incoming_init(mis)) { + if (ram_postcopy_incoming_init(mis, NULL) < 0) { return -1; } =20 --=20 2.51.0