From nobody Fri Nov 14 18:22: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=none dis=none) header.from=yandex-team.ru ARC-Seal: i=1; a=rsa-sha256; t=1761671530; cv=none; d=zohomail.com; s=zohoarc; b=Ppo9zHIf1NTZF4QQ43OddloNnY6KoZ9Trmi/pc9hh8DoLewDJvSZKlYcuzQCnHG38l2pyOrFNGjpflmkfePtWQ81tp52qfomq7Nx1B+G5im1guTUtWzOgcGFK3uO6pxWN71txQA1JV9Uzc77go6RqW+YAA75Jvg+mBzB7aGOKe4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761671530; 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=AjICt9/cEE3YqmTiIWl7ZmpWnbhzekTFatGOzt5GHVQ=; b=BAwe7siAzj3ErQV6tFnnXZyMESH4nvCy1cSpYVIGbfnRv2fwsYGQlpNMta4LNH3yJu//mj1L2lqIxfRALVwLoT7uB33Rw+sTWi9JsdRu12Zjh8f+n+PqXLvDZccjFj3Ams203hmsgOzzQPhn8SJcBh3HEDsHunXu+GxtU6EFAbo= 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 1761671530250294.71417575109956; Tue, 28 Oct 2025 10:12:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vDnCt-0001EQ-0Q; Tue, 28 Oct 2025 13:10: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 1vDnCp-0001Do-Rx for qemu-devel@nongnu.org; Tue, 28 Oct 2025 13:09:59 -0400 Received: from forwardcorp1d.mail.yandex.net ([2a02:6b8:c41:1300: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 1vDnCW-0000JE-Hl for qemu-devel@nongnu.org; Tue, 28 Oct 2025 13:09:48 -0400 Received: from mail-nwsmtp-smtp-corp-main-68.klg.yp-c.yandex.net (mail-nwsmtp-smtp-corp-main-68.klg.yp-c.yandex.net [IPv6:2a02:6b8:c42:94a9:0:640:a3fa:0]) by forwardcorp1d.mail.yandex.net (Yandex) with ESMTPS id 48A30811BC; Tue, 28 Oct 2025 20:09:32 +0300 (MSK) Received: from vsementsov-lin.. (unknown [2a02:6bf:8080:582::1:19]) by mail-nwsmtp-smtp-corp-main-68.klg.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id U9hrmt1IrqM0-DAmRuBwF; Tue, 28 Oct 2025 20:09:31 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1761671371; bh=AjICt9/cEE3YqmTiIWl7ZmpWnbhzekTFatGOzt5GHVQ=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=l+gt/MPli/Vbh6WjXAlWn1SJ4ehOUFSxJMa0M50SaSGRQCMTGCjyPT3b8tqG0dEBV UYeT8wrxcUn2J6aGajnyFunN9eIIsg5ECIOersb36ycTtZNXDX8agp4gEfU9cBso5D Ge2DVN5WLtL74ofAIT/ydHKlS+3TiykwfoUgN/+o= Authentication-Results: mail-nwsmtp-smtp-corp-main-68.klg.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, armenon@redhat.com Subject: [PATCH v4 3/4] migration/vmstate: stop reporting error number for new _errp APIs Date: Tue, 28 Oct 2025 20:09:25 +0300 Message-ID: <20251028170926.77219-1-vsementsov@yandex-team.ru> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20251028130738.29037-1-vsementsov@yandex-team.ru> References: <20251028130738.29037-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:c41:1300:1:45:d181:df01; envelope-from=vsementsov@yandex-team.ru; helo=forwardcorp1d.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: 1761671536981158500 Content-Type: text/plain; charset="utf-8" The handlers .pre_load_errp, .post_load_errp and .pre_save_errp should put all needed information into errp, we should not append error number here. Note, that there are some more error messages with numeric error codes in this file. We leave them for another day, our current goal is to prepare for the following commit, which will update interface of _errp() APIs. 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