From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from OSPPR02CU001.outbound.protection.outlook.com (mail-norwayeastazon11023107.outbound.protection.outlook.com [40.107.159.107]) by lore.virtuozzo.com (Postfix) with ESMTPS id 6C66880A83 for ; Tue, 13 Oct 2026 15:28:15 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=FYWrtve3F69Gn8e9+518wekFeqHeWZaizsH9ZBkWayyNuLYF+gBdbxanDLeEPW4yN5HpagLUac3gnclwcUcYrubXKky3TVOgOI40cmxjw8qrjLsZ9iWdDlbP+g4ahJFHjAdVnKNCnsQkGUslItEEdHNtOgYB+CxvvjnCru3KnCyFLLGxaCM6MCsCZs4gAO8+4iY90F4j5V+1dxa5fT1ePUs9WhZF731wOsaZW5wxHqG39/uwPCYY7QtDdCULQIbgS7QC+6tzyL6QU9m7olPhfeKtkOLktmPOksbUqwGu6eHfrO7DGo1G102FjwTtVTYTjp6CM9x+svLzfpnctBEHkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=SKbe+Ecoa6UXuHcoCjrLao6DOC3nXtAdSn8ItqVbkb0=; b=nwfoH3MPO7H2JtPtXR5wKekrFCjhpProF+FLSuCI2FHbzUfD8LZ5p6oBKgEp344Iwy+kH/TMx8IWRj5b0fzmAIuaw8TYp5/yk/lsje3EqCI+n9TwVcm2LSR2+Z36+YfvNsr8IpwsWraoBmjyuGmeIXRmJQWE+Ctncxtf3vOPEeKsB4TsJwXcSdn/xLAdBZG2tU8Y40yVgkRDEC+2/tr2Xn0MbA2Gsou8auGtoaaRh2wBd6TQJr+rhNHiUtg98Hai9amXdsEVcwTUeIuQyRkyKy2zL6G9WtA/xtlCqHezds/Eq5qpZbGq7jDr+ZrUK8IZ+2GEezDXex9e+3ABn7alQg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SKbe+Ecoa6UXuHcoCjrLao6DOC3nXtAdSn8ItqVbkb0=; b=E4zjYUp5Fna+9GzuVnMmznHrXTbjB7YoHv+G1QP7pQTc32s/oWcgV5FYzQDJmlTq90ODcTBqhxszRvmOo5QbD8l6ftFEzdTvl2JG6sKePtC2yiRkH54+al0WXAeYarYSlSouXvtWpZG+7ylTgBgDQrjATziu5HPmvghqlzVxwA9xmRiDKfbVRFKTj6gACdUQkSFJptd+v+9Ys1IYoK+hvH/4Gr6HnaxazHaDykB/I3aw5+/pIWtYZVTEW+eEh3rdqzQ9h8+64AXt0mqp0GI7eErE6lQ7PLRo23NaC7bgHt4rJQDRZiuovaZozw3nVpPP7orR9ueZLceq4FR21hxRwg== Authentication-Results: mx.microsoft.com 1; dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=virtuozzo.com; Received: from VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) by WA4PR08MB366192.eurprd08.prod.outlook.com (2603:10a6:1d0:30::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.522.12; Tue, 13 Oct 2026 15:28:13 +0000 Received: from VI0PR08MB10656.eurprd08.prod.outlook.com ([fe80::4e37:b189:ddcd:3dd8]) by VI0PR08MB10656.eurprd08.prod.outlook.com ([fe80::4e37:b189:ddcd:3dd8%7]) with mapi id 15.21.0522.008; Tue, 13 Oct 2026 15:28:13 +0000 From: Andrey Drobyshev Date: Tue, 13 Oct 2026 18:28:14 +0300 Subject: [PATCH QEMU HCI-8.1 v2 10/24] migration: vmstate_save_state_v: fix double error_setg Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261013-vfio_v1-v2-10-433455c0a294@virtuozzo.com> References: <20261013-vfio_v1-v2-0-433455c0a294@virtuozzo.com> In-Reply-To: <20261013-vfio_v1-v2-0-433455c0a294@virtuozzo.com> To: svt-core@virtuozzo.com Cc: andrey.drobyshev@virtuozzo.com X-Mailer: b4 0.16.0 X-ClientProxiedBy: VI5PEPF00000939.AUTP296.PROD.OUTLOOK.COM (2603:10a6:808:1::833) To VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI0PR08MB10656:EE_|WA4PR08MB366192:EE_ X-MS-Office365-Filtering-Correlation-Id: cdef035b-71e6-46e4-02f4-08df293e9855 X-LD-Processed: 0bc7f26d-0264-416e-a6fc-8352af79c58f,ExtAddr List-Id: svt-core@virtuozzo.com X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|23010399003|376014|1800799024|366016|52116014|5113699003|18002099003|22082099003|10067099003|261009223027099003|56012099006|38350700014; X-Microsoft-Antispam-Message-Info: LtECWHDSKxPAqYGSIynPZfxHVYwUDYuVS7Gb3Hh6GUjAqGVRsRrh+jtzEbs2RPAfiAZL3xjL24hJq6xlal9ODIZICgRBKhV9lXmxY5m7EBmdrLsUCEcQS12cAVSK3isrTcbuaQsSIObe/J6J9RkCZ0GzRrpSMM4ZdSG72HJHmMnczn28UhTfa3tvoMOKdlUhK43dBJLF7WdT5eqZwaSlmq4kwRzlouBKtrGuSO/bMloVUhyOCkdOnf9Rn4Lh3gdnmQdaFcKL+JzzWlW0KDXFzV8fnqIqzVd1zY5MqFkFjB3Jtu7IEkI4Vl6c7bDea5cqn9aImyo0BnK5tRnWeG50OJe1zz1ynyFfIIVO2hhxiQ9hgridkdtfgCLGcftRvJ/LWFvR0fOoQ9te5/pIpWOgACGrCFrV4qn233OXnKWtXFROEzA93wSmcouNTZiyRtE6sHrLP8+rps1vJcSy7CnntzFaFrgz38pkDiePO9PzyDzYOkTgUQfsSuvnrRPOJ6gpFJ1AeVlmmIg4363RHzTubVKtMHganxqr7Y0f+pvaVvuopThJT+zc4gRYWWaUZTfQQqlIQZiKxi6LVVYvFAEJniiCzX4SCwioO3pYZKLQbGDOzU7FmFxrcp+VWIsteSaiDaisrXT5unbzSLLkr4sGZJzip7mOInQ4tWBy3oc2ae8= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI0PR08MB10656.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(23010399003)(376014)(1800799024)(366016)(52116014)(5113699003)(18002099003)(22082099003)(10067099003)(261009223027099003)(56012099006)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?aE9pbkxqNGwxdm5DTW1kdVY5L2I0SWx0Nk5Ra1BZSmlCZnJzekF1ZTNPSk1Q?= =?utf-8?B?SDdRczZKRnJORjMwL0R4SjBpaURqdVVTRjc3MFpXcW1WRUoyWkVseHlOUEFh?= =?utf-8?B?eUFDUldHS2NYcTZ5NVdSTDlVRmtNdTVwNERKZHZmemRFMXBTQjlmMllmTXBy?= =?utf-8?B?OFI4NVFVb0lxSnUwcHNhdUF4SVY4d0dsaFpSeDczV29hZ1hmamxRVFJOSlUx?= =?utf-8?B?YitnSVljdUp4QkhpQnRNdHQ5S3IxMkJOWDJteVBVY2dFeW56Q292MWxFVk80?= =?utf-8?B?R0s4aHVnS0lqTktLc1VkQXVhWUhNeUMyS2NsM0k1cnMvcDMwdW1hRVVWNFgy?= =?utf-8?B?MXV1bWNnTFVUMGlsQkl4QVZVb2RRUnVVbkpPL0NhVGhTdzQ3V094SzBKL00x?= =?utf-8?B?c2c2VE1SQyt2dVZqdElrVWZlY0N4THpRd2grTGw2M3c4UnRRV1Bjb3c0dVR4?= =?utf-8?B?bzVrSGwwL2pzTnh3aWtsMzhIQXRlS3VoNFJJT2lNdmNpN0dEaWZNc1g1SlVO?= =?utf-8?B?OUhNYkd5cTFVSElxMHRvdWgwek03dHg0N2VNeWdBcEdTaWF5SXpUUnRYbFR5?= =?utf-8?B?ZGJOc1pOTjJjWmZ2TjlMaFNnME5RalFkbHZRTmFPRlZEOS9ONXplcjdtT2pV?= =?utf-8?B?R3ZMRFpBUkZkdlJqeTZUOXFBNnc4V1NGSkxwZ2twUGJMdHA1UGFMQ0hvdUx4?= =?utf-8?B?em1MYVY0L2psU1RWRjQraDJ6TFVpVUo3YlZoaVoyYXVMOXRsaE5HeWlSbU8v?= =?utf-8?B?MkRKUC81d3AvR1lzNEZMMXZneW44SjNNMmdvbjFZdHZTeGRaNUZuWVZoUWNY?= =?utf-8?B?Z2NqQkt0ZzdiMklFalRXdW9tS1lFbHY2c2dQN0QwUlFVVmdIakpMdktCUFVB?= =?utf-8?B?VGMxQVZtcStzb3FBanREeE9WdVVqR2krZVZ0MDVZb3RYRVNtQjhZREpOaHQ5?= =?utf-8?B?TE9ic3ZMelJzdDFKT0hYWGp6dXk4Sm9BOElzS0o1aUR6ZHM2WDU2dVpnSXZo?= =?utf-8?B?SEhHSXMvejdoK1FjL1UzN056OW5BV0NyOVkvOUo1SCtVUmtoZmxTeXYwbE4x?= =?utf-8?B?c2FIM09jelZDQmdldWRSUElGb1VaY2NYZTlwektFVFE5TGZUNVlNMkxPUFhB?= =?utf-8?B?SCtHVUdSdE1xdUVXZS95Tjc5UUt4d1g0TGw0S2M3OGlLYmVBem1PQVp3TSt4?= =?utf-8?B?Z1pNbmNxcnI1eU1VVERsb0dZSHZFT1VWZXpZeGxVN1QwV2FEcFVPZHRWL01k?= =?utf-8?B?eGkzOExKQTZrMlRFZC9NamF5NHNmckR1M0dvb2lPOEl5cDIrMGZiakdYOHFy?= =?utf-8?B?V25ZQWhsSEtreVpsWXNxQ1Z1b0FFQ0hoRE8wVm9YeStqaHZpN2RrazZCcnM3?= =?utf-8?B?Mk5GV3pQVzN3WHNvMTR4NzNhVTl6N21mTVJMMC8yT3JMWWhoelZnUWVCek9s?= =?utf-8?B?K0JqdHMwWmtVVXYycXdOcTBXeFdDL1R4UjB4T25tUUJMTldIUmlyNVNFZTFi?= =?utf-8?B?QVgyeDFlSU1TNXhYRUhRNDFGaktjc1lsL3k1bGRJRXFIcEdRUVpqTmp0YTdE?= =?utf-8?B?Rkk0VFZBaEZuZlJxb3FTZDNnTFVrTGt1eUo3S1Rib1F6dnpBRmlHOFJPTEl5?= =?utf-8?B?cWNzRzZOdXBOc1JZUERjUjVLZ3BIamZveXNMM0g3MG1YODhUU1pHV2xCeDB5?= =?utf-8?B?K3JPeHpPV0ppWXFUZU5qdFZROFZhSG0xNHNWM2pwR3lIdzVZNk9vMTZKMVUv?= =?utf-8?B?bFJFQm9hVlhQNGp2SHhOR1lXQjYvU3FGSDhISjRzOUU4OG1zM3VHc2pxSWd1?= =?utf-8?B?R0FoSTZrRzA5SHFaSDUwT0V6ZnF5N3ZOYWlSb0RnZFpHeCtwWVpZdW04ekIr?= =?utf-8?B?d3hzdzNUdFdKV1VobjFjWHhnNG9tOVkzakNJRDVYUDh2RGpGWUR6eThxSHg4?= =?utf-8?B?WTk3dDB2N1ZPWFZXT2JPbnFoc0dNS2h1OTlmYUtTR2ZxUWZvTVhjbFh0ZVov?= =?utf-8?B?OHJwMVFjUVRWdUhieEliZWl3TzI5VW8yVUVoa1NLNWdNMlJJVkdtcmQ0ei84?= =?utf-8?B?ZHpyZWRPd1BMaHBJMmpFMGQ3NmQ0VXROc0szUTZONWlCYTZFa1Fma1ZrQmE5?= =?utf-8?B?ZlB0OXhCR3A3NDl5aEFaU0tGRGF0eWdKVlFOZDI4Nko0M2k4Q1pNVFpRMjA5?= =?utf-8?B?MmFOd2Vzbjh6K3Aram90c0ZFV05ZUmJ6STZyOWJFaUFlR2taQVJKd0pxczFH?= =?utf-8?B?Sk8veDE2dDNYeit2cmdDb2JnZHdLWFZUZ201bmlZSDJaMEJIYVBEMXFzb0wv?= =?utf-8?B?SzNhWGtCN1g1RGFMUDlBeVg5ZWUzdzJzaEpPUFdFK3dTTng5UnhJR0VrQ09F?= =?utf-8?Q?0KxhkrADhycd5sdk=3D?= X-Auto-Response-Suppress: DR, OOF, AutoReply X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: cdef035b-71e6-46e4-02f4-08df293e9855 X-MS-Exchange-CrossTenant-AuthSource: VI0PR08MB10656.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Oct 2026 15:28:13.1507 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: XqA+9+ZbDSMWcfotryjMM9ma3IIOYtxd79fbLBrzHkKLbTAFzrAnFWMCL7oCszKZZMpC8HK3wppOwOKz6zxUyEt0nryYJwwmabxpRBjhW7k= X-MS-Exchange-Transport-CrossTenantHeadersStamped: WA4PR08MB366192 From: Vladimir Sementsov-Ogievskiy We may call error_setg twice on same errp if inner vmstate_save_state_v() or vmstate_save_state() call fails. Next we will crash on assertion in error_setv(). andrey.drobyshev: This commit is cherry-picked as-is, with no modifications, from the upstream commit d41ce10d0f5a. Fixes: 848a0503422d043 "migration: Update error description outside migration.c" Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Fabiano Rosas Reviewed-by: Peter Xu Link: https://lore.kernel.org/qemu-devel/20260304212303.667141-2-vsementsov@yandex-team.ru Signed-off-by: Fabiano Rosas --- migration/vmstate.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/migration/vmstate.c b/migration/vmstate.c index aea41c09946..04903131257 100644 --- a/migration/vmstate.c +++ b/migration/vmstate.c @@ -523,6 +523,9 @@ int vmstate_save_state_v(QEMUFile *f, const VMStateDescription *vmsd, } else { ret = inner_field->info->put(f, curr_elem, size, inner_field, vmdesc_loop); + if (ret < 0) { + error_setg(errp, "put failed"); + } } written_bytes = qemu_file_transferred(f) - old_offset; @@ -535,8 +538,8 @@ int vmstate_save_state_v(QEMUFile *f, const VMStateDescription *vmsd, } if (ret) { - error_setg(errp, "Save of field %s/%s failed", - vmsd->name, field->name); + error_prepend(errp, "Save of field %s/%s failed: ", + vmsd->name, field->name); if (vmsd->post_save) { vmsd->post_save(opaque); } -- 2.47.1