From nobody Sun Dec 14 08:04:34 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=1754637705; cv=none; d=zohomail.com; s=zohoarc; b=kLZUWyUfvvl5TfSiC3LyQ1MLmwY+/2iLdGO2FZr9lSn8S58kWM6J84Kc9/Uka81I0PX2WoNlf5lfyQZZG7hCapU45MZaqwTl0Xn2zu4d/j04fVLcdGLBtR860XsEvxKpRAjNPeSfrSibRJwF0BbRxUOAbbhRo9Qb6nTAdhGVyH4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754637705; 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=GeeC3t4cXCVe4GY2cImcQMLvhFUnSsPhLhudMTgdDFY=; b=jgEUOfZQ2ZCjWBIHX/97hr/LdxotMs6kDoUIQIesAhIZXeorCt6mnMZb3cfYd5Ye1g11B1b4SpHC/Gsw59lL9lNBie4BZ8YYdeAq6GFM8fEHGyA/L9krdPeYl3ZBQoMsQBzMKB8Kdv80V20OrGaxstdRsaSVIRx6cyrUGz2s7ro= 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 1754637705292849.5307238681635; Fri, 8 Aug 2025 00:21:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ukHMT-0002FE-N4; Fri, 08 Aug 2025 03:17: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 1ukHLZ-0007Fl-76 for qemu-devel@nongnu.org; Fri, 08 Aug 2025 03:17:02 -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 1ukHLX-0007PY-7U for qemu-devel@nongnu.org; Fri, 08 Aug 2025 03:17:00 -0400 Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-646-mA2DN2hmPwyKV_hRwJBtFw-1; Fri, 08 Aug 2025 03:16:55 -0400 Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-24011ceafc8so16018935ad.3 for ; Fri, 08 Aug 2025 00:16:55 -0700 (PDT) Received: from armenon-kvm.bengluru.csb ([49.36.101.237]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-241e899d347sm199659385ad.140.2025.08.08.00.16.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Aug 2025 00:16:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1754637418; 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=GeeC3t4cXCVe4GY2cImcQMLvhFUnSsPhLhudMTgdDFY=; b=gY0N5Mh0HdhtfWLWdG50BZlX9CeYDr1/8QtN6n6t8115uUEmEd9N0dGflrg+51nUduQQEF 69BC1BRe1n148tpoTuq+kQSt1DV+NddLJbimcseAnIrmEX0QZNnhGnSymSE8OtD6yCfirJ GHPsB0Q5A+2dt3ZFr4tqSUBrxWf5H4w= X-MC-Unique: mA2DN2hmPwyKV_hRwJBtFw-1 X-Mimecast-MFC-AGG-ID: mA2DN2hmPwyKV_hRwJBtFw_1754637415 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754637415; x=1755242215; 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=GeeC3t4cXCVe4GY2cImcQMLvhFUnSsPhLhudMTgdDFY=; b=FeSWoJjcyjhD2aGyTZwiIqhihMBPJot5LA29HQoKam+F9rTRaAVFQ8I8c8Ow+6UyuC zpwvuU1ss+2nu1TrpdXFeVU6Mfr7DjyXqZQt7leX+xzGrIgO8OYT0pnKEPwOM058KWvD rWeFiOnOxjm0mp1NAMTsnbjVyJ5dOgeT3qH0BUHV3NtS4IGBtI12cxpSQEHhnn1Sxgd1 wxcQXjWXguCBkX4n84ryTlYLiR4Q6otCLntdnuB0Z3Xxj6nOCsA3hxI0wXZGUdS+jcWJ RTBYop6dXbv9jg6dynBrYOISvGDo14Tn5nCuyjdVDfPAq2Nx7+lA4KF4lS0+e8xcBkOP grsQ== X-Gm-Message-State: AOJu0YyhK3qfZc17d717NY82z5LBfmnTzSgILYfZhMAQ/eX7JW4MBF6B bnfoAqOuUe8IsZxXIP0Qc8WCD2k6atnC86GWnzzYXTIexcSjHkYD6+pgjElX/y9ot4xKuNkF4JZ s814mVyqa5APkeVPekDV6P4gYeaAOaSnvfei9112Zy87Sz392zYfhjkvP X-Gm-Gg: ASbGnctTp3pLz65i8c75XVEg1BopzTWapdKUnAovx1adXesKXf8NgfCbHTozPtsaiL2 fbGPz4k/uJntK2jip5EEjAIDUjIDFCFH6bClZh4jfkc0dAYfIG2iNVPXJiASmziK17C2eW2LQqE UxgpjuUPBxWwlk+HsQocypECmDhK2iTxDnTbfCrzdW40SKg15FD/MwBBMJBjvrmHB/4FjYaj40B lcBe4SlbT3bN7dvHEjUdIbw1a/mgp1bTBd8stmKfqpPhGKBiP8ICXt6vDe7F8w3eoxjWXjGijN0 cLV9tOVTb3Nht8l5buX6wl7qzxvQzwbmoGXwaoUja9kO35v67fUj8g== X-Received: by 2002:a17:903:41c7:b0:242:b315:ddaf with SMTP id d9443c01a7336-242c1fdc0a3mr34539085ad.7.1754637414818; Fri, 08 Aug 2025 00:16:54 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGxtBkDZ69Svpemiyv8oORXgonpZzt8jubH4urFiqXxL+xMTvKKYpvMbbPR8oBxUkGRzFIFrg== X-Received: by 2002:a17:903:41c7:b0:242:b315:ddaf with SMTP id d9443c01a7336-242c1fdc0a3mr34538705ad.7.1754637414389; Fri, 08 Aug 2025 00:16:54 -0700 (PDT) From: Arun Menon Date: Fri, 08 Aug 2025 12:43:41 +0530 Subject: [PATCH v10 15/27] migration: push Error **errp into loadvm_postcopy_handle_advise() MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250808-propagate_tpm_error-v10-15-3e81a1d419b2@redhat.com> References: <20250808-propagate_tpm_error-v10-0-3e81a1d419b2@redhat.com> In-Reply-To: <20250808-propagate_tpm_error-v10-0-3e81a1d419b2@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=4792; i=armenon@redhat.com; h=from:subject:message-id; bh=Mtu+Ybq+gxv/VQ3achH/Q1vShwUDXfGo7Wkn116W0K0=; b=owGbwMvMwCWWVaVqcZPfqI/xtFoSQ8bUxVe/CKarbs/KLPzvcTegKDWt28PgX8G/+B1zb7BE/ n+Yv7e7o5SFQYyLQVZMkaXha4BsU0BhRKTty+swc1iZQIYwcHEKwEQmvGH4Xzox7WWW3KRkEyHB frfrXOF2bz3F2CMfZ9XdUXxZ9iiGjeF/5Ny3baskTCYznWR5YD5LWnXdqtbEZU7i9aLXOBesC1v EDwA= 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: 1754637708445124100 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_advise() must report an error in errp, in case of failure. Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Arun Menon --- migration/savevm.c | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/migration/savevm.c b/migration/savevm.c index 1f502f1cb15c951a0845dd27a4dee34fcea3f753..69c482b6fef5afca9ca02f9ac86= 339ffe1524e2a 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1912,39 +1912,39 @@ enum LoadVMExitCodes { * quickly. */ static int loadvm_postcopy_handle_advise(MigrationIncomingState *mis, - uint16_t len) + uint16_t len, Error **errp) { PostcopyState ps =3D postcopy_state_set(POSTCOPY_INCOMING_ADVISE); uint64_t remote_pagesize_summary, local_pagesize_summary, remote_tps; size_t page_size =3D qemu_target_page_size(); - Error *local_err =3D NULL; =20 trace_loadvm_postcopy_handle_advise(); if (ps !=3D POSTCOPY_INCOMING_NONE) { - error_report("CMD_POSTCOPY_ADVISE in wrong postcopy state (%d)", p= s); + error_setg(errp, "CMD_POSTCOPY_ADVISE in wrong postcopy state (%d)= ", + ps); return -1; } =20 switch (len) { case 0: if (migrate_postcopy_ram()) { - error_report("RAM postcopy is enabled but have 0 byte advise"); + error_setg(errp, "RAM postcopy is enabled but have 0 byte advi= se"); return -EINVAL; } return 0; case 8 + 8: if (!migrate_postcopy_ram()) { - error_report("RAM postcopy is disabled but have 16 byte advise= "); + error_setg(errp, + "RAM postcopy is disabled but have 16 byte advise"); return -EINVAL; } break; default: - error_report("CMD_POSTCOPY_ADVISE invalid length (%d)", len); + error_setg(errp, "CMD_POSTCOPY_ADVISE invalid length (%d)", len); return -EINVAL; } =20 - if (!postcopy_ram_supported_by_host(mis, &local_err)) { - error_report_err(local_err); + if (!postcopy_ram_supported_by_host(mis, errp)) { postcopy_state_set(POSTCOPY_INCOMING_NONE); return -1; } @@ -1967,9 +1967,10 @@ static int loadvm_postcopy_handle_advise(MigrationIn= comingState *mis, * also fails when passed to an older qemu that doesn't * do huge pages. */ - error_report("Postcopy needs matching RAM page sizes (s=3D%" PRIx64 - " d=3D%" PRIx= 64 ")", - remote_pagesize_summary, local_pagesize_summary); + error_setg(errp, + "Postcopy needs matching RAM page sizes " + "(s=3D%" PRIx64 " d=3D%" PRIx64 ")", + remote_pagesize_summary, local_pagesize_summary); return -1; } =20 @@ -1979,17 +1980,18 @@ static int loadvm_postcopy_handle_advise(MigrationI= ncomingState *mis, * Again, some differences could be dealt with, but for now keep it * simple. */ - error_report("Postcopy needs matching target page sizes (s=3D%d d= =3D%zd)", - (int)remote_tps, page_size); + error_setg(errp, + "Postcopy needs matching target page sizes (s=3D%d d=3D= %zd)", + (int)remote_tps, page_size); return -1; } =20 - if (postcopy_notify(POSTCOPY_NOTIFY_INBOUND_ADVISE, &local_err)) { - error_report_err(local_err); + if (postcopy_notify(POSTCOPY_NOTIFY_INBOUND_ADVISE, errp)) { return -1; } =20 - if (ram_postcopy_incoming_init(mis, NULL) < 0) { + if (ram_postcopy_incoming_init(mis, errp) < 0) { + error_prepend(errp, "Postcopy RAM incoming init failed: "); return -1; } =20 @@ -2619,11 +2621,7 @@ static int loadvm_process_command(QEMUFile *f, Error= **errp) return loadvm_handle_cmd_packaged(mis, errp); =20 case MIG_CMD_POSTCOPY_ADVISE: - ret =3D loadvm_postcopy_handle_advise(mis, len); - if (ret < 0) { - error_setg(errp, "Failed to load device state command: %d", re= t); - } - return ret; + return loadvm_postcopy_handle_advise(mis, len, errp); =20 case MIG_CMD_POSTCOPY_LISTEN: ret =3D loadvm_postcopy_handle_listen(mis); --=20 2.50.1