From nobody Sun Sep 28 16:36:41 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=1758209297; cv=none; d=zohomail.com; s=zohoarc; b=jbRTN1EQhgWhje5+6TnCWT2v5nGh31cdxE0ICJyqFIbJWn38IX+btT2FOrHwdbZHcKkPwgTn8uwBKoYreibIDfEhb8q2R7/IuuNw2yrlAm5JGGB5XgHacj1yJusg0VqHiXSCxjpcmyTo902mwYTcu/8eDuFNPgYTh8N1WYM6ODk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1758209297; 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=EK8ZniS31eKfAuecJyHjMuA5swX2F7mkJn3tAORFulo=; b=mN2XBkIghqe2wA+D9ocBNsKXtYB8Hm5RYVC1lVqCfND+0GpJ8rsgDfSBQzjKf32C+T04hGMLRx/HU6w1WaHRm6nL+SboVcIOR9lzfkfGCcEHr0gZhDx4hwVP96YnzKP4AvfxOr5f/QTwWHzHAr64ki0Z190HM0bajN1sNp11dps= 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 1758209297437642.8076527341746; Thu, 18 Sep 2025 08:28:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uzGWi-0007pg-9o; Thu, 18 Sep 2025 11:26:28 -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 1uzGWg-0007Zm-Bk for qemu-devel@nongnu.org; Thu, 18 Sep 2025 11:26:26 -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 1uzGWW-00039I-6E for qemu-devel@nongnu.org; Thu, 18 Sep 2025 11:26:25 -0400 Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-220-RndcvfYQM4Kd_gaHtWNZQA-1; Thu, 18 Sep 2025 11:26:14 -0400 Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-77d20efe2d5so1233250b3a.3 for ; Thu, 18 Sep 2025 08:26:14 -0700 (PDT) Received: from armenon-kvm.bengluru.csb ([49.36.110.230]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-77cfc2481d7sm2675512b3a.32.2025.09.18.08.26.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Sep 2025 08:26:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1758209175; 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=EK8ZniS31eKfAuecJyHjMuA5swX2F7mkJn3tAORFulo=; b=Hm8EO/bBzV6h+YI3PqhNd9MPYlY4DR3/mKFn1CrmkPCL90KJZbe9KG5ED9PkFBVYWhehfT 2IFxeT0pgMTLAk1M5UXZxORFXXUcgttXFRTQwD/b7ygbl4ik+MKdXRCJCwu7Dx7n/wFVjH KS63kPiEWOPi9idVD1i2U+dy7iCLHXw= X-MC-Unique: RndcvfYQM4Kd_gaHtWNZQA-1 X-Mimecast-MFC-AGG-ID: RndcvfYQM4Kd_gaHtWNZQA_1758209173 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758209173; x=1758813973; 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=EK8ZniS31eKfAuecJyHjMuA5swX2F7mkJn3tAORFulo=; b=QUBVRIVaA6KFRT1Vs7MaGosU7hDDdlxCoee9XjoEwXZbHmrzhZNdKWxYf7RxjqLvps ZEd54Ew8z1AFInwt7clzNDrImOzkBwEwbM4i3MuFIP40c0zkEz5jcMPdZcBNM/rG5UE/ b5IKeJK5FQhzRNB3OdhSiI+SM1HoxiCwgYv0RuFHn2Ls7jLQ4DBrSi31lDqRxC3VMLtZ Znmmk7412qfQt05yJVCwMG3Rs8PCxCKHyv6uG4MA2T5BKbnPqFXsSTglPbULAqkKLjM2 h5JIa0DM/XHqDzyXkNZMT4raP8WHVhb5PYjdZosPEPUWTf9f1ONFB0IXuJq5N+tzZvV2 /T+Q== X-Gm-Message-State: AOJu0Yx0HL1zBkGZg2+9zWKSfg747RNOWImNEZueU8YZFdnjWi1oPMJc Bk+pFf3zptpWFHBHPLMQ9VnMD3k9Ouq8czqy8yO8/wDpS6igYjay0EZafp2qn4TaAaQcQVNYNAP VlF3HcJuVkj2KYu8bfY18Fh0VSgaCUvb6E5kdCR96togkyGOiVwUkVa0Z X-Gm-Gg: ASbGncuF+fzdaEXx3YRT5Tq2PTllV1dbYaelHrrQIsnMD/ajdCsTPn85VqJyRA03ddH tHCKVAp2RlDlPNWxp64gD/RdYZTssgwGsqXCLmJ4O5PTBuXLa3nxG6le9WkX+qBihsD+pHVfe9F xIB9iU5F4A6R9UZNtzOFXNUUTa8hXxWFJqkBPbtmBmmMNFZpKvYar5ieSiG8pzuQKxEsjX8zJDM /Hy1XY16q2ch9LXs/AbBEu0WBaVxTKHDbHZwyGTsUjYPvtCY2K2XemI8NFJaxQ4UDsvG3hGl8Ri YHlB9HdZEoh/tMAOfjlry1CQBc4srjN84T9NClv8gxxt75nbCeKWKg== X-Received: by 2002:a05:6a00:7096:b0:77c:d54b:8c86 with SMTP id d2e1a72fcca58-77cd54b9014mr4631217b3a.0.1758209173252; Thu, 18 Sep 2025 08:26:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFS0MJecLzlL9sKl0qZUacYM/7yKkS7NxjQ3nl1DAwAkINLP/TulkB4/M2hQdedZlvGaQyZ5w== X-Received: by 2002:a05:6a00:7096:b0:77c:d54b:8c86 with SMTP id d2e1a72fcca58-77cd54b9014mr4631196b3a.0.1758209172898; Thu, 18 Sep 2025 08:26:12 -0700 (PDT) From: Arun Menon Date: Thu, 18 Sep 2025 20:53:34 +0530 Subject: [PATCH v14 17/27] migration: push Error **errp into loadvm_postcopy_handle_run() MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250918-propagate_tpm_error-v14-17-36f11a6fb9d3@redhat.com> References: <20250918-propagate_tpm_error-v14-0-36f11a6fb9d3@redhat.com> In-Reply-To: <20250918-propagate_tpm_error-v14-0-36f11a6fb9d3@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=1888; i=armenon@redhat.com; h=from:subject:message-id; bh=Bc7pNWeaQQJR7xn/IMqCNxln9K0U+dn3FXOfz+z8MlM=; b=owGbwMvMwCWWVaVqcZPfqI/xtFoSQ8YZ5R+7Nt1bVjzvbN6qaWY+F5i1P8ktnzQ5yfDkBNelV 21KDh662lHKwiDGxSArpsjS8DVAtimgMCLS9uV1mDmsTCBDGLg4BWAivx8wMuycHRAgUD498bZn ysqnRf+E+ZS4Dojvn6/NpfHYp+nqmjmMDIsS3uQ3SG5+EGKQYxitcvf9sZ7jx3LztidN5dqfvvS uFCMA 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.005, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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=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: 1758209298270116600 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_run() must report an error in errp, in case of failure. Reviewed-by: Fabiano Rosas Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Arun Menon --- migration/savevm.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/migration/savevm.c b/migration/savevm.c index c681d6d21af356a97645f2a0d36e7440e3bd95c6..3ab20bd3de980ecfd79ab29697e= 3e1527ab3e73c 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2273,13 +2273,13 @@ static void loadvm_postcopy_handle_run_bh(void *opa= que) } =20 /* After all discards we can start running and asking for pages */ -static int loadvm_postcopy_handle_run(MigrationIncomingState *mis) +static int loadvm_postcopy_handle_run(MigrationIncomingState *mis, Error *= *errp) { PostcopyState ps =3D postcopy_state_get(); =20 trace_loadvm_postcopy_handle_run(); if (ps !=3D POSTCOPY_INCOMING_LISTENING) { - error_report("CMD_POSTCOPY_RUN in wrong postcopy state (%d)", ps); + error_setg(errp, "CMD_POSTCOPY_RUN in wrong postcopy state (%d)", = ps); return -1; } =20 @@ -2626,11 +2626,7 @@ static int loadvm_process_command(QEMUFile *f, Error= **errp) return loadvm_postcopy_handle_listen(mis, errp); =20 case MIG_CMD_POSTCOPY_RUN: - ret =3D loadvm_postcopy_handle_run(mis); - if (ret < 0) { - error_setg(errp, "Failed to load device state command: %d", re= t); - } - return ret; + return loadvm_postcopy_handle_run(mis, errp); =20 case MIG_CMD_POSTCOPY_RAM_DISCARD: ret =3D loadvm_postcopy_ram_handle_discard(mis, len); --=20 2.51.0