From nobody Fri Nov 14 19:47:05 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=1760976255; cv=none; d=zohomail.com; s=zohoarc; b=l6tIoVwP/VtRdY6k0pM+zGzOToLG6HyhBZoRp1I4+zy4EavY9wQe3tEHdSXqFEcigsOycQBPZbNUR+l+P+0W7aYSytxFkAB5hyX9ZMsSXIuR9WBPQ3LRjAMSDNOVW/XkXMEu7nI7z6QmX+W25KAYit+lJ7hktcbUO46y8hjystk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760976255; 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=hYKc9yrAcV081Z3xfDU4TEAE2MrK6johrTP3i0DPIIU=; b=gkD+9G3wEfguTp2omH1/f3F9KY/5Byik9jaYnkl2ukT6xGjh2/h9VjJPMSA6B6NQ2RMp9gL65xDS+l26OJVUOTO2DG+JCy31DDDAHEDcQFdp4/dOoRqJ21Guge2hRGdq20HxGRWpvKwe3D4XRx94ZoyCnyr/fYZjWCjTMZw5jK0= 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 1760976255217316.5922930635768; Mon, 20 Oct 2025 09:04:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vAsMc-000583-1r; Mon, 20 Oct 2025 12:04:02 -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 1vAsMX-00054B-47 for qemu-devel@nongnu.org; Mon, 20 Oct 2025 12:03:57 -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 1vAsMT-0007Zv-GL for qemu-devel@nongnu.org; Mon, 20 Oct 2025 12:03:55 -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 AA89A80A0B; Mon, 20 Oct 2025 19:03:48 +0300 (MSK) Received: from vsementsov-lin.. (unknown [2a02:6bf:8080:a51::1:37]) by mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id k3YMa23Nr8c0-SLLqz2aT; Mon, 20 Oct 2025 19:03:48 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1760976228; bh=hYKc9yrAcV081Z3xfDU4TEAE2MrK6johrTP3i0DPIIU=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=huJI63K/HtntqQsCyqY5XTzs8g5BP+q9eUzWy8RlUL3fqYWVZLKI8qbkWrHnBumHz p17Bt9Ndpnhvkdcijq0S9FPcbmjPAImcsIDiglF5MMgus7x3sjVmH+u08XsY8zbTXJ W4q+y343bUUYScd5+GveWXZlRzvx4RywcmFdIv2M= 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, Vladimir Sementsov-Ogievskiy Subject: [PATCH v2 1/2] migration: vmstate_save_state_v(): fix error path Date: Mon, 20 Oct 2025 19:03:43 +0300 Message-ID: <20251020160344.2401137-2-vsementsov@yandex-team.ru> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20251020160344.2401137-1-vsementsov@yandex-team.ru> References: <20251020160344.2401137-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: 1760976258765154100 Content-Type: text/plain; charset="utf-8" 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