From nobody Mon Oct 27 14:14:19 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