From nobody Mon Oct 27 11:41:46 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=none dis=none) header.from=yandex-team.ru ARC-Seal: i=1; a=rsa-sha256; t=1761424042; cv=none; d=zohomail.com; s=zohoarc; b=FsvdXJw2slZ5esNQbVb2nhV/P4FB+KVZA/2durlPDlx6FBNhb6kHAs4gFZiOHa9ejhgOVwYaQyv2XJH+0v/OMWhIk6d+eSf6Bu7pB5mcCw7Y9sLZ0BWk1xgvzz50iZeec5x9ngHQ9EpmDLsDW7/OK06h2wZtNgzPXdlHOIXTBs4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761424042; 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=nMKXPLexIvTyO4V0WpgqcHfj9w4OzLl3Yl1HJlZOTa4=; b=BKLopdkdpk/Zcs08+hra9z7P3cOOcLeR3q63HGTJf/JPVpqX4IErcSyNvAIHhje6qc5T9/J/RtFP68ISYuxb86zEKlVW9+7FPhFonZ/vI2/uVeGpF5aOK5Sy+emzxMGhk2zpKA3KSptRvJa4pIrMI9IAiV+FeKkKWKhDIQUgLqk= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761424042148257.8894125469401; Sat, 25 Oct 2025 13:27:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vCkqt-0004tE-SK; Sat, 25 Oct 2025 16:27:03 -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 1vCkqs-0004qm-2J for qemu-devel@nongnu.org; Sat, 25 Oct 2025 16:27:02 -0400 Received: from forwardcorp1b.mail.yandex.net ([178.154.239.136]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vCkqp-0004X6-Py for qemu-devel@nongnu.org; Sat, 25 Oct 2025 16:27:01 -0400 Received: from mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net (mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net [IPv6:2a02:6b8:c10:49f:0:640:b99a:0]) by forwardcorp1b.mail.yandex.net (Yandex) with ESMTPS id 89743808B4; Sat, 25 Oct 2025 23:26:54 +0300 (MSK) Received: from vsementsov-lin.. (unknown [2a02:6bf:8080:538::1:38]) by mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id pQh1fa1bDqM0-ke5TkjwW; Sat, 25 Oct 2025 23:26:54 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1761424014; bh=nMKXPLexIvTyO4V0WpgqcHfj9w4OzLl3Yl1HJlZOTa4=; h=Cc:Message-ID:References:Date:In-Reply-To:Subject:To:From; b=wD+dDZF7hNzoCatseksgMBOz+QMDqUDadggfsv4dDyTS6nIjgA0qOAzYaMQKcS+v1 aPNTe74QXfoO5gsxWlzYMihxYUS5RSXrBYdNsB4Rb71/Gr7G77T5vJMPd6yAeq2nSp TGR0b2AK+bvTSknSy9/0x7j7hZW3GtKbCSpU7Cpc= Authentication-Results: mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net; dkim=pass header.i=@yandex-team.ru From: Vladimir Sementsov-Ogievskiy To: peterx@redhat.com Cc: stefanb@linux.vnet.ibm.com, farosas@suse.de, qemu-devel@nongnu.org, armbru@redhat.com, berrange@redhat.com, vsementsov@yandex-team.ru, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 1/4] migration: vmstate_save_state_v(): fix error path Date: Sat, 25 Oct 2025 23:26:46 +0300 Message-ID: <20251025202649.1122420-2-vsementsov@yandex-team.ru> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20251025202649.1122420-1-vsementsov@yandex-team.ru> References: <20251025202649.1122420-1-vsementsov@yandex-team.ru> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=178.154.239.136; envelope-from=vsementsov@yandex-team.ru; helo=forwardcorp1b.mail.yandex.net 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=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 @yandex-team.ru) X-ZM-MESSAGEID: 1761424044992158500 In case of pre_save_errp, on error, we continue processing fields, unlike case of pre_save, where we return immediately. Behavior for pre_save_errp case is wrong, we must return here, like for pre_save. Fixes: 40de712a89 "migration: Add error-parameterized function variants in VMSD struct" Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- migration/vmstate.c | 1 + 1 file changed, 1 insertion(+) diff --git a/migration/vmstate.c b/migration/vmstate.c index 81eadde553..fd066f910e 100644 --- a/migration/vmstate.c +++ b/migration/vmstate.c @@ -443,6 +443,7 @@ int vmstate_save_state_v(QEMUFile *f, const VMStateDesc= ription *vmsd, if (ret < 0) { error_prepend(errp, "pre-save for %s failed, ret: %d: ", vmsd->name, ret); + return ret; } } else if (vmsd->pre_save) { ret =3D vmsd->pre_save(opaque); --=20 2.48.1 From nobody Mon Oct 27 11:41:46 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=none dis=none) header.from=yandex-team.ru ARC-Seal: i=1; a=rsa-sha256; t=1761424082; cv=none; d=zohomail.com; s=zohoarc; b=n3PqQWzynx0uHG4xFpYXMeOj+Vlh+p8jle4aRMEakqZNuzVz7T+nKmFOrCVmK/Mn6Wr+aGxe/MXZHKFV5FEkkvvrzu55D5c+374HqSvPMJe8UujQV16VgUpMdBrlnmDKo2aEgMP74wuMweJZGENvoOmQ1VKT5hlXXTMn7E1WmT4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761424082; h=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=BNvSwyaRHN7VmEP0n/ZLbmkke10ix+maxXmnT9gEJCs=; b=biveHRe1R8kvnrya6bqF6x8fRhupyoXj3+dStbcqs2ftgYxMkYBUqPKgEoGyJXalWAiAo3ChNnj/A3hu16/wgIzODwFSkgKCR/dLFnPZFvp3isAjx0ykcdgPDXzV8UJxH3DYvePKlk0D+Dip0l+5hDRLBCK0QaTavVjTHYRyp6s= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761424081880658.7224745093669; Sat, 25 Oct 2025 13:28:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vCkqv-0004uL-AQ; Sat, 25 Oct 2025 16:27:05 -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 1vCkqt-0004t9-Cu for qemu-devel@nongnu.org; Sat, 25 Oct 2025 16:27:03 -0400 Received: from forwardcorp1b.mail.yandex.net ([2a02:6b8:c02:900:1:45:d181:df01]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vCkqp-0004XG-Py for qemu-devel@nongnu.org; Sat, 25 Oct 2025 16:27:03 -0400 Received: from mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net (mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net [IPv6:2a02:6b8:c10:49f:0:640:b99a:0]) by forwardcorp1b.mail.yandex.net (Yandex) with ESMTPS id 47E3B808B7; Sat, 25 Oct 2025 23:26:55 +0300 (MSK) Received: from vsementsov-lin.. (unknown [2a02:6bf:8080:538::1:38]) by mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id pQh1fa1bDqM0-1nBaao80; Sat, 25 Oct 2025 23:26:54 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1761424014; bh=BNvSwyaRHN7VmEP0n/ZLbmkke10ix+maxXmnT9gEJCs=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=CffV2sN78XN/2W2cgw5m1zVPGGmCiSr3VBcHgDqBGosWTVgd0CJPki2PLYU7lCCES Fyo3CDJZEusDU9X6AETcnGOMvqbOoAI05uuGpmFrvIjnDs0Dl6Tm1lbzBdXPUHpYPa M+FHNTcFOR+Y/wTxlKHytBF9y0TOOwBHc0Od/B2U= Authentication-Results: mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net; dkim=pass header.i=@yandex-team.ru From: Vladimir Sementsov-Ogievskiy To: peterx@redhat.com Cc: stefanb@linux.vnet.ibm.com, farosas@suse.de, qemu-devel@nongnu.org, armbru@redhat.com, berrange@redhat.com, vsementsov@yandex-team.ru Subject: [PATCH v3 2/4] tmp_emulator: fix unset errp on error path Date: Sat, 25 Oct 2025 23:26:47 +0300 Message-ID: <20251025202649.1122420-3-vsementsov@yandex-team.ru> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20251025202649.1122420-1-vsementsov@yandex-team.ru> References: <20251025202649.1122420-1-vsementsov@yandex-team.ru> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2a02:6b8:c02:900:1:45:d181:df01; envelope-from=vsementsov@yandex-team.ru; helo=forwardcorp1b.mail.yandex.net 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=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 @yandex-team.ru) X-ZM-MESSAGEID: 1761424085084154100 Content-Type: text/plain; charset="utf-8" Note, that called tpm_emulator_startup_tpm_resume() does error_report() failure paths, which could be turned into error_setg() to passthough an error. But, not on all error paths. Not saying about tpm_emulator_startup_tpm_resume() return -1 on failure and we mix it with -errno from tpm_emulator_set_state_blobs(). So, it all needs deeper refactoring, which is out of scope of this small fix. Fixes: 42e556fa3f7ac "backends/tpm: Propagate vTPM error on migration failure" Signed-off-by: Vladimir Sementsov-Ogievskiy --- backends/tpm/tpm_emulator.c | 1 + 1 file changed, 1 insertion(+) diff --git a/backends/tpm/tpm_emulator.c b/backends/tpm/tpm_emulator.c index dacfca5ab7..aa69eb606f 100644 --- a/backends/tpm/tpm_emulator.c +++ b/backends/tpm/tpm_emulator.c @@ -961,6 +961,7 @@ static int tpm_emulator_post_load(void *opaque, int ver= sion_id, Error **errp) } =20 if (tpm_emulator_startup_tpm_resume(tb, 0, true) < 0) { + error_setg(errp, "Failed to resume tpm"); return -EIO; } =20 --=20 2.48.1 From nobody Mon Oct 27 11:41:46 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=none dis=none) header.from=yandex-team.ru ARC-Seal: i=1; a=rsa-sha256; t=1761424078; cv=none; d=zohomail.com; s=zohoarc; b=HX4cyL5G82YUedTe03QHHf2FejIRmIbf0qBBgr44b2/EIdyb3Tk9h60bWtyVeJSGDsskhJudA/lJZRfxESgGPvLTWUu22R0CRfDfeIZEePDl5ecjbPiDKGFqbyzttd4ZI+wVPHeBE3FRawVIBH6nsnibugnXRC0hv0V8Eo6WALs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761424078; h=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=Io+fqMa5HQiuYJALzzF8n6n+ARXY+Y+vMVtMhxwdCww=; b=bX0/4ZegrCKbEpky+VaKszyAFL+ebfv3ImBhHSpiImW2h7T+pPdMdIFjHz/sBI0KBgU6NI5CUbl3rRyCuJuz9lrGlOGE/GYnPDuKJpmLj5AaBwADfFy8JlR5k6mU53wJnsKcVfjwm2aaDhU2Si1DK5TRLIDTpq2Ze+ajWSUJR/s= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761424077834400.6377659261411; Sat, 25 Oct 2025 13:27:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vCkqu-0004tl-7p; Sat, 25 Oct 2025 16:27:04 -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 1vCkqs-0004qv-7M for qemu-devel@nongnu.org; Sat, 25 Oct 2025 16:27:02 -0400 Received: from forwardcorp1b.mail.yandex.net ([2a02:6b8:c02:900:1:45:d181:df01]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vCkqp-0004XH-9V for qemu-devel@nongnu.org; Sat, 25 Oct 2025 16:27:01 -0400 Received: from mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net (mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net [IPv6:2a02:6b8:c10:49f:0:640:b99a:0]) by forwardcorp1b.mail.yandex.net (Yandex) with ESMTPS id 2681C808BD; Sat, 25 Oct 2025 23:26:56 +0300 (MSK) Received: from vsementsov-lin.. (unknown [2a02:6bf:8080:538::1:38]) by mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id pQh1fa1bDqM0-BRBh3c6X; Sat, 25 Oct 2025 23:26:55 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1761424015; bh=Io+fqMa5HQiuYJALzzF8n6n+ARXY+Y+vMVtMhxwdCww=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=uyRaA8PtMS9Vil7EeVx0omqr4rMxpEuoHPT3Q2JeYVqSoK3sVHyUGQNJ79eJSZ6Z/ z/OXQ2NYmrhETUGGBjgMx2C1zf/rMOyJ9WiZustJO1scIsQkk5Tm9ovJltqT2+cbVP OmBfHUnjYK7aI0R3IaDA4cE93j6UYShpty9Rj4ng= Authentication-Results: mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net; dkim=pass header.i=@yandex-team.ru From: Vladimir Sementsov-Ogievskiy To: peterx@redhat.com Cc: stefanb@linux.vnet.ibm.com, farosas@suse.de, qemu-devel@nongnu.org, armbru@redhat.com, berrange@redhat.com, vsementsov@yandex-team.ru Subject: [PATCH v3 3/4] migration/vmstate: stop reporting error number for new _errp APIs Date: Sat, 25 Oct 2025 23:26:48 +0300 Message-ID: <20251025202649.1122420-4-vsementsov@yandex-team.ru> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20251025202649.1122420-1-vsementsov@yandex-team.ru> References: <20251025202649.1122420-1-vsementsov@yandex-team.ru> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2a02:6b8:c02:900:1:45:d181:df01; envelope-from=vsementsov@yandex-team.ru; helo=forwardcorp1b.mail.yandex.net 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=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 @yandex-team.ru) X-ZM-MESSAGEID: 1761424082522158500 Content-Type: text/plain; charset="utf-8" First, the handlers should put all needed information into errp, we should not append error number here. Second, the only realization of new _errp API is tpm_emulator_post_load(), which on some failure paths returns -errno, but on the others simply -1. So printing this additional number may be misleading. tpm_emulator.c needs a lot more work to report good error message on all error paths. Signed-off-by: Vladimir Sementsov-Ogievskiy --- migration/vmstate.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/migration/vmstate.c b/migration/vmstate.c index fd066f910e..677e56c84a 100644 --- a/migration/vmstate.c +++ b/migration/vmstate.c @@ -157,9 +157,9 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescri= ption *vmsd, ret =3D vmsd->pre_load_errp(opaque, errp); if (ret < 0) { error_prepend(errp, "pre load hook failed for: '%s', " - "version_id: %d, minimum version_id: %d, " - "ret: %d: ", vmsd->name, vmsd->version_id, - vmsd->minimum_version_id, ret); + "version_id: %d, minimum version_id: %d: ", + vmsd->name, vmsd->version_id, + vmsd->minimum_version_id); return ret; } } else if (vmsd->pre_load) { @@ -259,8 +259,8 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescri= ption *vmsd, ret =3D vmsd->post_load_errp(opaque, version_id, errp); if (ret < 0) { error_prepend(errp, "post load hook failed for: %s, version_id= : " - "%d, minimum_version: %d, ret: %d: ", vmsd->name, - vmsd->version_id, vmsd->minimum_version_id, ret); + "%d, minimum_version: %d: ", vmsd->name, + vmsd->version_id, vmsd->minimum_version_id); } } else if (vmsd->post_load) { ret =3D vmsd->post_load(opaque, version_id); @@ -441,8 +441,7 @@ int vmstate_save_state_v(QEMUFile *f, const VMStateDesc= ription *vmsd, ret =3D vmsd->pre_save_errp(opaque, errp); trace_vmstate_save_state_pre_save_res(vmsd->name, ret); if (ret < 0) { - error_prepend(errp, "pre-save for %s failed, ret: %d: ", - vmsd->name, ret); + error_prepend(errp, "pre-save for %s failed: ", vmsd->name); return ret; } } else if (vmsd->pre_save) { --=20 2.48.1 From nobody Mon Oct 27 11:41:46 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=none dis=none) header.from=yandex-team.ru ARC-Seal: i=1; a=rsa-sha256; t=1761424064; cv=none; d=zohomail.com; s=zohoarc; b=Dj6t+TFxZ90ZUYk/yFUxL8E/s83yGOuwuY7748gllYzPHf7SWbPwwtZeGz4bmUvMddzAKOh189SJUKQy6r7XDK3CDPHUDBxvWJtH21kEYV2da0UBAZvRpkQNsqwanQfk0O7c5RPXBef/eTrCWpffQvxMqX5IAJiVzoMA5C6N244= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761424064; h=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=E6A8oDeYyKOyMzqUtOiIB7DmzHOKDuMk4iKB1rL9yps=; b=N/oHazhA6gewYY0hRlPMD5WzSVpWn2CJUsIfF49kwQVBafLVAo7UHOWWOqmiTHIG+sJ1FjkqZMcZ0cko8xYRoMA6+V9BNRThYgnfXahsirXxfEhTta3sVr1MOKlV7wl2bOjQGlQjY/9NWJho/FxFg2o1T+6BzlTqrJ18PlMNh+o= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761424064344470.7371326337284; Sat, 25 Oct 2025 13:27:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vCkqu-0004uI-QB; Sat, 25 Oct 2025 16:27:04 -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 1vCkqt-0004tZ-RW for qemu-devel@nongnu.org; Sat, 25 Oct 2025 16:27:03 -0400 Received: from forwardcorp1b.mail.yandex.net ([2a02:6b8:c02:900:1:45:d181:df01]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vCkqp-0004XJ-C5 for qemu-devel@nongnu.org; Sat, 25 Oct 2025 16:27:03 -0400 Received: from mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net (mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net [IPv6:2a02:6b8:c10:49f:0:640:b99a:0]) by forwardcorp1b.mail.yandex.net (Yandex) with ESMTPS id ED820808BE; Sat, 25 Oct 2025 23:26:56 +0300 (MSK) Received: from vsementsov-lin.. (unknown [2a02:6bf:8080:538::1:38]) by mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id pQh1fa1bDqM0-6cTUuwdn; Sat, 25 Oct 2025 23:26:56 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1761424016; bh=E6A8oDeYyKOyMzqUtOiIB7DmzHOKDuMk4iKB1rL9yps=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=UZaoiCeFzkic5sirrLGQlho0tpMAD7LKuniOJZAl/cVHG5H7dpSU0zM1p4w5QkJaN Fx7KqeciEZQPn4Jo1LFSxL7pu4mxJGeGl+IXpVH2uCexocjjkDihxbNHPMGCzRTiRq q5iDSS9y4SdWvEKUBmazuNG9fyosuduBZVcU1H78= Authentication-Results: mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net; dkim=pass header.i=@yandex-team.ru From: Vladimir Sementsov-Ogievskiy To: peterx@redhat.com Cc: stefanb@linux.vnet.ibm.com, farosas@suse.de, qemu-devel@nongnu.org, armbru@redhat.com, berrange@redhat.com, vsementsov@yandex-team.ru Subject: [PATCH v3 4/4] migration: vmsd errp handlers: return bool Date: Sat, 25 Oct 2025 23:26:49 +0300 Message-ID: <20251025202649.1122420-5-vsementsov@yandex-team.ru> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20251025202649.1122420-1-vsementsov@yandex-team.ru> References: <20251025202649.1122420-1-vsementsov@yandex-team.ru> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2a02:6b8:c02:900:1:45:d181:df01; envelope-from=vsementsov@yandex-team.ru; helo=forwardcorp1b.mail.yandex.net 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=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 @yandex-team.ru) X-ZM-MESSAGEID: 1761424070006154100 Content-Type: text/plain; charset="utf-8" Switch the new API to simple bool-returning interface, as return value is not used otherwise than check is function failed or not. No logic depend on concrete errno values. Signed-off-by: Vladimir Sementsov-Ogievskiy --- backends/tpm/tpm_emulator.c | 10 ++++------ docs/devel/migration/main.rst | 6 +++--- include/migration/vmstate.h | 6 +++--- migration/vmstate.c | 14 ++++++-------- 4 files changed, 16 insertions(+), 20 deletions(-) diff --git a/backends/tpm/tpm_emulator.c b/backends/tpm/tpm_emulator.c index aa69eb606f..6cc9aa199c 100644 --- a/backends/tpm/tpm_emulator.c +++ b/backends/tpm/tpm_emulator.c @@ -947,25 +947,23 @@ static void tpm_emulator_vm_state_change(void *opaque= , bool running, =20 /* * Load the TPM state blobs into the TPM. - * - * Returns negative errno codes in case of error. */ -static int tpm_emulator_post_load(void *opaque, int version_id, Error **er= rp) +static bool tpm_emulator_post_load(void *opaque, int version_id, Error **e= rrp) { TPMBackend *tb =3D opaque; int ret; =20 ret =3D tpm_emulator_set_state_blobs(tb, errp); if (ret < 0) { - return ret; + return false; } =20 if (tpm_emulator_startup_tpm_resume(tb, 0, true) < 0) { error_setg(errp, "Failed to resume tpm"); - return -EIO; + return false; } =20 - return 0; + return true; } =20 static const VMStateDescription vmstate_tpm_emulator =3D { diff --git a/docs/devel/migration/main.rst b/docs/devel/migration/main.rst index 1afe7b9689..234d280249 100644 --- a/docs/devel/migration/main.rst +++ b/docs/devel/migration/main.rst @@ -446,15 +446,15 @@ The functions to do that are inside a vmstate definit= ion, and are called: =20 Following are the errp variants of these functions. =20 -- ``int (*pre_load_errp)(void *opaque, Error **errp);`` +- ``bool (*pre_load_errp)(void *opaque, Error **errp);`` =20 This function is called before we load the state of one device. =20 -- ``int (*post_load_errp)(void *opaque, int version_id, Error **errp);`` +- ``bool (*post_load_errp)(void *opaque, int version_id, Error **errp);`` =20 This function is called after we load the state of one device. =20 -- ``int (*pre_save_errp)(void *opaque, Error **errp);`` +- ``bool (*pre_save_errp)(void *opaque, Error **errp);`` =20 This function is called before we save the state of one device. =20 diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index 63ccaee07a..dbe330dd5f 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -218,11 +218,11 @@ struct VMStateDescription { int minimum_version_id; MigrationPriority priority; int (*pre_load)(void *opaque); - int (*pre_load_errp)(void *opaque, Error **errp); + bool (*pre_load_errp)(void *opaque, Error **errp); int (*post_load)(void *opaque, int version_id); - int (*post_load_errp)(void *opaque, int version_id, Error **errp); + bool (*post_load_errp)(void *opaque, int version_id, Error **errp); int (*pre_save)(void *opaque); - int (*pre_save_errp)(void *opaque, Error **errp); + bool (*pre_save_errp)(void *opaque, Error **errp); int (*post_save)(void *opaque); bool (*needed)(void *opaque); bool (*dev_unplug_pending)(void *opaque); diff --git a/migration/vmstate.c b/migration/vmstate.c index 677e56c84a..adaaf91b3f 100644 --- a/migration/vmstate.c +++ b/migration/vmstate.c @@ -154,13 +154,12 @@ int vmstate_load_state(QEMUFile *f, const VMStateDesc= ription *vmsd, return -EINVAL; } if (vmsd->pre_load_errp) { - ret =3D vmsd->pre_load_errp(opaque, errp); - if (ret < 0) { + if (!vmsd->pre_load_errp(opaque, errp)) { error_prepend(errp, "pre load hook failed for: '%s', " "version_id: %d, minimum version_id: %d: ", vmsd->name, vmsd->version_id, vmsd->minimum_version_id); - return ret; + return -EINVAL; } } else if (vmsd->pre_load) { ret =3D vmsd->pre_load(opaque); @@ -256,11 +255,11 @@ int vmstate_load_state(QEMUFile *f, const VMStateDesc= ription *vmsd, return ret; } if (vmsd->post_load_errp) { - ret =3D vmsd->post_load_errp(opaque, version_id, errp); - if (ret < 0) { + if (!vmsd->post_load_errp(opaque, version_id, errp)) { error_prepend(errp, "post load hook failed for: %s, version_id= : " "%d, minimum_version: %d: ", vmsd->name, vmsd->version_id, vmsd->minimum_version_id); + ret =3D -EINVAL; } } else if (vmsd->post_load) { ret =3D vmsd->post_load(opaque, version_id); @@ -438,11 +437,10 @@ int vmstate_save_state_v(QEMUFile *f, const VMStateDe= scription *vmsd, trace_vmstate_save_state_top(vmsd->name); =20 if (vmsd->pre_save_errp) { - ret =3D vmsd->pre_save_errp(opaque, errp); trace_vmstate_save_state_pre_save_res(vmsd->name, ret); - if (ret < 0) { + if (!vmsd->pre_save_errp(opaque, errp)) { error_prepend(errp, "pre-save for %s failed: ", vmsd->name); - return ret; + return -EINVAL; } } else if (vmsd->pre_save) { ret =3D vmsd->pre_save(opaque); --=20 2.48.1