From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from OSPPR02CU001.outbound.protection.outlook.com (mail-norwayeastazon11023081.outbound.protection.outlook.com [40.107.159.81]) by lore.virtuozzo.com (Postfix) with ESMTPS id 0D88A8122E for ; Tue, 3 Nov 2026 13:57:46 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=VBUifEvcwWlDbfUx1PitqVGuYvxhS7hQehTW22DUYLzD5+jlXEx1FOgfAows4R08YG9erCspDNPgj1uznN/Qyv1U8ANUKTKFsbDhUYQRXK/YRbqvOQwshIBfYsiL9Vj1ZV4blByoHKkyiSkdM4eMNCakYnx5YRnGLn3U3kml+AdAV/hGtixiUjq2Fj6a5JhEGwThU/RGeSnY+1llotLFB3tLEH3fhFT20odAPh5PN0om+i3SwbXRjt9fcn1QtXWlmhDUjTWFcYDaNGHn3Mp8vJ4T9ziGxmt+TfyrSRAff0sZntnwTkqA+wfZU8Ua8fnEGMPwkdmt8oS9+j1KcxqDqw== 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=GbDIoSS5iMjb0IciQLsO4Ae17d5mPKD+lAKkcfige9hNZEd8OZoLzmMIK/KNyxnjEPs3BPCQJ//8+iCFpcN6iCEmU63ZtKMFQHEPxshStT8iXTqsGDGvwEllEfhQIN8IlRCdMCoRb+2s4oCQQK3P01ALu3nmlXF0Hz8exyr4W0k3kg5I5dqllKl+QQSQ7KtrG84m35qeFJBGdnrHBus1Dn4jsp3HveorTsGsvd1PKJDTiN/dIO4A9J3iSZ/dn5FlEXihVJ4H196W2LD1f4BMq/wVlDgm+AdZwMRca+EKaR9oQpm020U1wh4HeWOxxLwB5lC1rZho6IFhPj4zj7hGXA== 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=gshy7uTWuS66gtcPAt2OvEzxt6kw9FxyEcjeV/5X9DmhnwC+uj9fawOfVdv0awfHSKUdRy7VaO0RfFZyMd6bgu/wcStuuFKMgLhejvs6KUkXf7Rhe6Q/E7AAH5uiZgi3uXcX3jA8x4TUHxMvG6PymsBxzp6IZmmIH1JOQZiuxL4xjo8TURjIm0t216oPqDpSkgmlIi5015Ej5lcvlFhWO0aZOW4qFgXwPUj7Jn553OAIDeHd8E+Qw6ImaNjBezXE1M83zpzzAnziQSJqnMdneVGYDzdNXIORWQHE6CZSp+YhLibTlWQPa59uZhePIgJVzMTnnBOfYFdSOd9HWSna9A== 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 GVXPR08MB11741.eurprd08.prod.outlook.com (2603:10a6:150:312::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.569.12; Tue, 3 Nov 2026 13:57:43 +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.0569.011; Tue, 3 Nov 2026 13:57:43 +0000 From: Andrey Drobyshev Date: Tue, 03 Nov 2026 15:57:33 +0200 Subject: [PATCH QEMU HCI-8.1 v7 18/35] migration: vmstate_save_state_v: fix double error_setg Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261103-vfio_v1-v7-18-4467fdccbbe6@virtuozzo.com> References: <20261103-vfio_v1-v7-0-4467fdccbbe6@virtuozzo.com> In-Reply-To: <20261103-vfio_v1-v7-0-4467fdccbbe6@virtuozzo.com> To: svt-core@virtuozzo.com Cc: andrey.drobyshev@virtuozzo.com X-Mailer: b4 0.16.0 X-ClientProxiedBy: VI4PEPF00000153.AUTP296.PROD.OUTLOOK.COM (2603:10a6:808:1::86f) To VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI0PR08MB10656:EE_|GVXPR08MB11741:EE_ X-MS-Office365-Filtering-Correlation-Id: 83da93c1-7e85-4850-4a84-08df39b2678a X-LD-Processed: 0bc7f26d-0264-416e-a6fc-8352af79c58f,ExtAddr List-Id: svt-core@virtuozzo.com X-MS-Exchange-Transport-Rules-Loop: 1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|23010399003|1800799024|376014|366016|261021123027099003|38350700014|261021121427099003|56012099006|261028144727099003|261026140227099003|261022105027099003|261009223027099003|10067099003|18002099003|22082099003|261102123227099003|5113699003; X-Microsoft-Antispam-Message-Info: SCkIHsHSdQ3cHhnAQP+lcP7toOCu72lRTKCkVvdk4jLo0ccAD8jkSQq0QTPi8kx2WzoJQcaNn9mgJXvXXhuMXz1nKZtv41GJwMVz1r7k9vMRwepJgMkLFjK8LxEXakBnLKOCe6jj3pIFWBlPjlc9RbHW/x/HnefQQaVM8qpFNAtJ/Zne5OzNxHDxC/15o+VpTcjOLNn+BAHpVpl+U+4XKpyb8Wt4ZOOz+XjHcBMUDtSYTcaaMCxLGLdDrH2DxH7Ulm/qEHQYAIgJGk/qdWuyLjJgkybCp7LG4x3ZsEtxobNi0NGdBBNE1352E94ud4kccRw/HgDKSLB9eRwL5nBpJKYsfsIi51LFPK9BUbSzGDb7LYcOEZNxJoZNFHdVKwRZnDIqh5OqTDbiYsvA35JgqqUcxehR7Y4xcF5WK9TtcF+CFfThSST/mLR6tkYBv9f8/IGlWbv686q/mNPjwzcHLIgfRZf3oNQGTE8+nw+mhfxN6jlygnlRadt6HgadNaDCmCrQil4ANOOc+OX4K7FnRYDuCCwaAvxTSXaw3Aljbn7DBdPL1mbInBZfSfqBp1sQd+YKCiEwyFHn9/3AzHhgpce2VBbm0EbBPjyufxVDJLSgXPThIQhoOSkzlXlnTTPwv8xMPHIxxKXScRH+SeHst5kD36W2yQnNcDmhoxs378Hr+g4iRWJ1+QuqbJ+0GW0V 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)(52116014)(23010399003)(1800799024)(376014)(366016)(261021123027099003)(38350700014)(261021121427099003)(56012099006)(261028144727099003)(261026140227099003)(261022105027099003)(261009223027099003)(10067099003)(18002099003)(22082099003)(261102123227099003)(5113699003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?YkpkMS9WaHZNcXovaUtYd3lMM2tCdmFTVWk3OHprN0E5MnIwOEpWWUhRNVBD?= =?utf-8?B?cG85OStRckZZVVZvVXhRUkNocm9zRFVIV1ZESThScWFqbFBJL3NEVUZxNzdD?= =?utf-8?B?K29kaXhhUG5vRkF3ZVd4T1NVVkcyaUQxVmtiOHBlYnpyYjNTN2xqQmFMc3Er?= =?utf-8?B?dVdjNzJpVWh0dTVZWExJMytFMXpicnlmMWNqQncvVFIvZW5kSzZrME13YW5N?= =?utf-8?B?d0VOSXNHYmFWS2U4Z1NqWGpTeFU1Z2traFJPdnRSSUVHSGtEVVhzSkhDQUc4?= =?utf-8?B?bE56UGU0YVZsOU5mWDZTSDN3N2JHWGpCQ1J2WXl1bFFIZlVuVVM4Mm5GQmV4?= =?utf-8?B?QzcrSmJFTFZnOTFuYjlQTlkxK0pZTGVFSXJ0UXhoMVJ3MGhML0VGSU94UmZv?= =?utf-8?B?eHVNSkl4T3d4NXdaSTBRV2pSMit1bXhJbm5HUTJVU2pXb3BCV2U5cnFGam5I?= =?utf-8?B?VlUxV2hHVWV3QXg4dWNKTHBXd1hXYTd6RTN5V09oQ2VGRzdQemJsbytIb1ZK?= =?utf-8?B?Uy9mZVQyZk9lTzlBd3hNT0ZaODdkSlRDWEtzVmc2NzNpMGhJTlZja0tuMjlu?= =?utf-8?B?ZWdlekEyYUFaVkR3RFJxT3dUckRPNVhDSHBSdHl4RWpOODFOLzBYQ0NMeFlp?= =?utf-8?B?Y20yK0ZWUFR6MCtVQmxKSVd5OGJRK1ZLZGViL3VHc2FDK3JrM3JwZGk3QVJx?= =?utf-8?B?Uzc3cTFKMVFQelBSdjlSaGk1WTR4b3RvcXMraG1Nak0yd3F4U0dhR0lUMzRR?= =?utf-8?B?M21teXVwcjZVTlZmek1hQllJdmZBNnIzN2t3SWdQVnNOZW43elNqVVhYQzVL?= =?utf-8?B?NFJWNERHT3Y4VXdDc0ZPSFZjWXZ6SzhVbUYvU1pvb2lodDUrUERiL0syd3RS?= =?utf-8?B?bGZ4c2VRMFZMZ1U5ampxdFU4cGk4emJRNXUvL1ZYQlA4TVBiVlNIaDE4V2Fk?= =?utf-8?B?NlZramUrUWZqRVVmd2t1UWN4QThqR2NKUEdwNE9tZUJ0eElkK0JVWjBJaENE?= =?utf-8?B?QnN4VnJ0VWRNYVNCMTdZVGNxNTlXaUdFaVNSTTVVYUlxeVhoT0hhZkZ0QnZP?= =?utf-8?B?cHlIUjd1TXhkcVpBTlZVSFZRUFZENXZYZVZhWFBqVE13OHF4SzFVVUtuNHZY?= =?utf-8?B?U3AyNzhoUzRaN2UwWkRDaGxEcVlIV01XUGFCYjJla2hnUFFTQ01wMlFXeVAz?= =?utf-8?B?Nk5DRE1UZjRwVjdhME5KNTFZcS9CV2dJYUFtKyt2dGk2VUdZaUdDb2Q4TlB2?= =?utf-8?B?MzRGdlZUUXI0UkhaKyt6akZEWFBWWkorTklTTHFEeEp2QmRzdjdSRjJtbE80?= =?utf-8?B?ZHBEelpmcE5QSjhqcHQwR2ZLOUk0VStvQkVmQStVamo1WXo4QU5BR2RUdSt4?= =?utf-8?B?b1FnQ2hxUHU4YThZeTVtc1R2VHB1RGhQRGNoalgvbjhXWlVGcEYvV3pJdGFj?= =?utf-8?B?NHpuSW8vQ0U2Q1FnZitRckk0UUtxcDV2MUhXMklaa0dsYjVEamo5NlMxclFP?= =?utf-8?B?WGsxZW1sRzdYTW11dm9waUl1SzVCb0w2SjdFRStKSytrQmI3cHhWd3o5em9z?= =?utf-8?B?ejFxbEppaURMM1pEbk8zUmJEUE5uQUkxYWtGdEhZNExVVFI1WUVDbUVnV05u?= =?utf-8?B?MjhrRE04YmRETXNzZXZCVjBOMkI0dllYWk82VEp6R3c0RUVGazNQTG1XK0Iv?= =?utf-8?B?Vmd6NFhLRWQzYzZmMDFCQzQ0Z2tXWlRyWGM2SWdHanYyVW9hNjRiTDQ4RVBh?= =?utf-8?B?b1NZYlNIUm1GT1JKbkFBYXFJRFNkWmcydzU5V2MwZmpFMXFaNjZWbkRTMnMz?= =?utf-8?B?NXhBNm5iZ3Voekd0U3hOMm0rVEd2QkN1MlNwa3p5S2tLVUl6aWNEZVI2Mnhy?= =?utf-8?B?bHl2WTRsRnVkTE1lc0lrMkkzL2dZVW13Yk9lWEY4dXpxV3N6bk9UWDQ5QVlm?= =?utf-8?B?dGM5T25WM0FGeTE4U1JwSEJxRTYxbmhBOUpwQm5HK1MxeGk5T0IxdFpJM3I2?= =?utf-8?B?VjlPRmpHTGhGK3FRU2FHYXoxb2lScTh2WjJjNFZWbW0zL0V6MWVOVnVXQ1o1?= =?utf-8?B?Vm5NNWI2N2hyb2kzd1FoN0RqZElQTHpFV2hyOGxMYzVQZFpYMkNrditaVlhY?= =?utf-8?B?dmZ0RkF1TVR5blprVk5HQ3MwdVNEMnBuWnA4SDF5N3pEQnBWV21MQU1YU3dp?= =?utf-8?B?cENnNm1XQXlhQ1ROOVNiM1p6KzBsUlg2MjBJWG1yUkNGWHVCTkM4cGR1Zzdw?= =?utf-8?B?dUhlQ09vSW56eS83bUI2bFh6V3Rkb1FoM0hkMFJ2RUdUS0I4T1cvcXZ6VHkv?= =?utf-8?B?L2hqaFZzNHhkMEFFdjU0dC93K25ZV1hXbzF4c0dkWndDRU1EeVcvNEhCRWVC?= =?utf-8?Q?w4z16A62ugnEAN5k=3D?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 83da93c1-7e85-4850-4a84-08df39b2678a X-MS-Exchange-CrossTenant-AuthSource: VI0PR08MB10656.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Nov 2026 13:57:31.5498 (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: 6su7H/OJndzpGvNCD3AC+ZMFFVAUlM0R0ZxjJvKsikf4PXvyDuWsDuPYfVkUMvzkuRKF+bGKGrIh9z8g9O8FlFELoqEA/1uzABpRlBZX5pY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR08MB11741 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