From nobody Tue Dec 16 03:47:10 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=1754418920; cv=none; d=zohomail.com; s=zohoarc; b=Gdfx067EVxeLfU2awZ7wqOfS5TMuyluOv9fPYFXpTKQdVmT63EbK0IbBrBpvFHw1nI1tGAa2nrgFJlnWNDYKpIR70kwKyPTI+bzFBMRWfNuIPFYhdVDLC03sGkfbkL17bLJjm8HdDfL0EXEvDRMp9S/w+JlTlomG2Nh2htKyLys= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754418920; 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=9xwc2FwWO2Qq0lCvlkRmEK9CuJ0XRl1/MHwMUkwTgQU=; b=jdm2xBF8NFsVaqq42ntFeF7Rtg1QeY6LRLUyOhg+SFy1PA5qoKSNFuAxToUsNXcEWMH2FvIX+tXYDZ4K/XXyoYurn+hQg5FELshvcvvDGsOSylrR1nXqJnb3nzA5hl+UmPpyT7NkU+QLOdVtaMSbHqKt3jqsK+Nc6dTjJd+6Noo= 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 1754418920892966.675761801087; Tue, 5 Aug 2025 11:35:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ujMUn-00032S-8d; Tue, 05 Aug 2025 14:34:45 -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 1ujMQS-0000WD-RZ for qemu-devel@nongnu.org; Tue, 05 Aug 2025 14:30:21 -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 1ujMQO-0004UF-Lk for qemu-devel@nongnu.org; Tue, 05 Aug 2025 14:30:15 -0400 Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-624-Mmg29AbFOoiSF_7vFDpzRw-1; Tue, 05 Aug 2025 14:30:10 -0400 Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-23824a9bc29so82748385ad.3 for ; Tue, 05 Aug 2025 11:30:09 -0700 (PDT) Received: from armenon-kvm.bengluru.csb ([49.36.99.3]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-241d1f0e585sm139200115ad.40.2025.08.05.11.29.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Aug 2025 11:30:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1754418611; 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=9xwc2FwWO2Qq0lCvlkRmEK9CuJ0XRl1/MHwMUkwTgQU=; b=GUl3NL6hTLqamUvhpQFnCJ0z/JdfQXSP5K8YXbUvpIpAIhSYpD6eQXJMvQ14Kwuc6Q4iCO 2Be1Vj6wX+4EJFdsWlomVT2FEmPhQJKmUXdBZAC4aXk0jLzxRRJIeMs4Fpq4Kt5rl9B0qW wjvI9OH4cXjD/PTHSasVbI+gJTM4NoY= X-MC-Unique: Mmg29AbFOoiSF_7vFDpzRw-1 X-Mimecast-MFC-AGG-ID: Mmg29AbFOoiSF_7vFDpzRw_1754418609 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754418609; x=1755023409; 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=9xwc2FwWO2Qq0lCvlkRmEK9CuJ0XRl1/MHwMUkwTgQU=; b=q7lqD8z1sOlRgwJl/31/XQthc95pUNMcZb37SXBwtLfnc5fBy9xi2MLYjQ34XDkLDW dzvIZh2KdkKzfDDcvrrOr16CSZ/gE5tTDO6RIy6XaZqbe2j/lACQv16ZjWyTmans6AsX RFKoMAmKJIKUAcgS+2pgAhRQNd/nUGaBVmLm8L8+71Vr+Gat9phw+RctXFF4OC6sMKfA WTa1B/4AhbJHJKk+GZf9xp1gM017BBkcfLLehEcMrExOHGLUMSRUkm0q62sEAVK0cmP8 mBZLs7VmFp29/C/LMBUdPOWdg4R07wSjGZ0ZWjBa6jPxlqJ5g4r7xQvFEpN48eSqLqpV 5rmw== X-Gm-Message-State: AOJu0Yz0sjfD0AeN7jfFLKb7+UQMEZNtx3bGyq7gKCh1/PHVOw/nuOwQ Ta4FSTi+/DKofJvVVqmCqSy1sC8pbKb1W6/QbrYGi5pDFzUqfLCqSJ9r91SIO1Qe3XJpLeAPrjE nXrMUYesfCNt+5hYCDC+pWy3mnUpSg1l7VbTNqb+6M0MMz7wqi033mgcI X-Gm-Gg: ASbGncv7k/ir8dRJ3BuydzXGv4kNqh4qxG6q2yFqNULU1YhvS1u9X9ncY7DczMEJln4 cZSjkyzEqQa+/jvC3GRC1+Vj4k1UWbMjJZaSTJhyp8Vn9fpyHXc9h0t6wCRDfZ+8GvXe0TKJW/3 S0KtdMbevp6TCXeQbRUvcdZPxyUJ03r/WevCPsacVYpB/Hg7EfW1wAJUvDSga/bTyK/vuiSfjxj CelY/ntrCVRuIAxoQwP/yrpv/w45DEQNNvgHwz59hx66PQyDFDhee9VE6gmG4huhKgaH4xR4JfT PV5NqVvzNAKYtUPZuoXuHhxLULLFI9MgbJcNZzCw94dchGKcGA== X-Received: by 2002:a17:902:cf4a:b0:240:35c4:cde0 with SMTP id d9443c01a7336-2429f52c6fcmr1116695ad.36.1754418608837; Tue, 05 Aug 2025 11:30:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFpbkPDUEt7oXWenX1XZcwuXcOxtS2T7Q/kc1XbJbZUDzqCuaQA8yE7rFaTxse+cckVO8qB5Q== X-Received: by 2002:a17:902:cf4a:b0:240:35c4:cde0 with SMTP id d9443c01a7336-2429f52c6fcmr1116185ad.36.1754418608439; Tue, 05 Aug 2025 11:30:08 -0700 (PDT) From: Arun Menon Date: Tue, 05 Aug 2025 23:55:22 +0530 Subject: [PATCH v9 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: <20250805-propagate_tpm_error-v9-15-123450810db7@redhat.com> References: <20250805-propagate_tpm_error-v9-0-123450810db7@redhat.com> In-Reply-To: <20250805-propagate_tpm_error-v9-0-123450810db7@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 , 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=HdEfUVsSmhp/9GMRET+AwaK+qTt4/yU5FJwZk3ggYJI=; b=owGbwMvMwCWWVaVqcZPfqI/xtFoSQ8YkX5nz07vz3b1rzJg+C+8pdJ24Vfkx/5++D7svah1iD t8a/di/o5SFQYyLQVZMkaXha4BsU0BhRKTty+swc1iZQIYwcHEKwEQ8kxn+B70ptJiX8Vpwqu2v Pbc1lJecufI56e60tiNeX63nrhVeU87w35P/mt6jZt63wgcuWYm7TH5vsfWB4v0F/KsMq8zsE1b /YQMA 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_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable 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: 1754418922671124100 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 bed03ad69008ef742f595f368896866d13713d16..09b9da6c58dda6e062a9a22bafd= 3487d38295f22 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 @@ -2617,11 +2619,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