From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from GVXPR05CU001.outbound.protection.outlook.com (mail-swedencentralazon11023080.outbound.protection.outlook.com [52.101.83.80]) by lore.virtuozzo.com (Postfix) with ESMTPS id 7676B8045D for ; Fri, 23 Oct 2026 16:54:44 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=RZB1rOxfQ9gsB9rt6WCO1j0ZgrcKHd9cQ2NczmThdXSoRa9veeWSxICDsD2ZbcFREbDYa+0p3bcTZgzVWJddNTf10Udyix3S0RIfpe5WzSXvyRY0NPKvVZUyUdZZIRSK8xTcglOZNZ5S3XzbSwI8pxnC1eOdmF+5ZiCmJJ8wnrkoMsKWO3tCAGaZ2m3LjfRihnZted4ypvk9OpBmH2zL/HZJLspBFo0oPG6pjEN2EbC74EeNSEBODJ8/I9b+0zkI8wv4+Se9AEOTBkeoOMLO8cgqo7Cw63kVdQiuxnMGPNfCtwJB/MIpjT/m/+1Z1SzpERmEePuxC1L1znBe0ZSl/w== 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=cMv0sJw/6uQWJRt8Mf5DbnSONyeUI9/TL2oV/du4WHNrkRT4oTxP7jp1OruwPh5humjDoFm6ELgapALbqLmh11OPEsLoJS7sPEBGqWJva3ycdE48zrwsSwzgh4/WH31g152IN2jqelIDCMewIAxQ1adC5wS3+uBB+OlE9+5+YNKygPGqBbJ2xhNhusrgxpKTcwQ8EftWsw3yezCMo8Tmax7FouSzjZypRnKwNIZa0mV3dRA3PoUrxtbYREaq0b5mQ9mN0kMe8sU1Ri94ECncT3lmKskh4ktmwV9yQ/moxc6oIIi+5uRL9znZUyWvHva8NTYF8x8U0kOap62jH9covQ== 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=F3m1dDjiNVFr7RNPAWlCqEA6CZscIeRKRnY9Mwtk5BJQQzW6FVNzB1KzU961CCJ5YNl9ttW7ibN8PETIVMbFpGgJB0FZJDfy/PxSeFxeMHryPH5sPR7pocDCHP+z2TBBC8kQ9At+/vcg81CUM1t/nSCaXkTaIQdSFM3xyl9ebFyhjr6/dFSNq1QufxtMOEeo0IuiTSWO5io6G4zpbaLFCG9bDlJECMwP4CEWm1rCBn95h1Bbnq7RLYp1O65jtsCLXkC/VQkzPVVAS8XDmdgHmrpI50FTA2eCBXbsffZHt+g2wqpmVotg2r7bRY20Q1UP97cYL4eDEe1afHWuj9Sg/Q== 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 DU4PR08MB11747.eurprd08.prod.outlook.com (2603:10a6:10:646::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.546.19; Fri, 23 Oct 2026 16:54: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.0546.017; Fri, 23 Oct 2026 16:54:43 +0000 From: Andrey Drobyshev Date: Fri, 23 Oct 2026 19:53:54 +0300 Subject: [PATCH QEMU HCI-8.1 v5 17/36] migration: vmstate_save_state_v: fix double error_setg Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261023-vfio_v1-v5-17-ba0bf3c6d122@virtuozzo.com> References: <20261023-vfio_v1-v5-0-ba0bf3c6d122@virtuozzo.com> In-Reply-To: <20261023-vfio_v1-v5-0-ba0bf3c6d122@virtuozzo.com> To: svt-core@virtuozzo.com Cc: Andrey Drobyshev X-Mailer: b4 0.16.0 X-ClientProxiedBy: VI1PR0902CA0027.eurprd09.prod.outlook.com (2603:10a6:802:1::16) To VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI0PR08MB10656:EE_|DU4PR08MB11747:EE_ X-MS-Office365-Filtering-Correlation-Id: f8ba9881-2cdf-4818-3fe3-08df3126503c 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|366016|1800799024|23010399003|376014|52116014|5113699003|22082099003|18002099003|38350700014|10067099003|261009223027099003|261022105027099003|261021121427099003|261021123027099003|56012099006; X-Microsoft-Antispam-Message-Info: maUvv5bD7astaQ6WTCJx1mtX8OA+GLkHRuooxU5TLV7EgXkvAFsHvoKj3Pe3fIEzk63WOuFtbCld7dqzvLavDbkFB8w5ngCTcaOp5+mxw6pNsh6Wh1XXanlFuZDoysqlQQwHXutsty6V0mXiubnvy3QyGXKcNbvPIoVU32uQqgtQo0C2mpEFGCDKCWJzEa8SvW8uRpD9utIPam1HqeCpMKqK7hksG+S/7XzdfiauQN5BDdESAVoKeuoeg3xO4KhJIcxEEAFogiqxkS8GIBNR5pTBX/QHF5zXCRJGe1gK/v9u7VYr0qCL7oVGuH4efTruvAP7Md/bj2IXjX2oX9+uB7yClBAhObIrFEV69cfprs5ILaKRMIwIWafBdWH6TAx7d3FrCqHLTjA/VkzrY6NeiHgYak9g9yw4sUZYWr2n6ahFuVATQXhDXPBK6e/LHp5hiBqk3X1xyWDsr5TuQj5HsPvT+5Pt+fVbGaFjbs9Vi01XsZIkoTmRnDQDpDEvSIvcDe2LWsC4NgqLX/+BLnYqD7Mx1OxhkFEaXBfeKE4afcgBCnexPXlCzVQKLtYBpGoKOFmOdtEI7iJAg0hToaQINjRscowv9YCZXGnRJTqMGTZ+aWh9oo9WrIA0o+NoMlHjXpi0Ap6/MiJDvpq1q/86H49NDYSSBCht0nETjFm1gXQ= 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)(366016)(1800799024)(23010399003)(376014)(52116014)(5113699003)(22082099003)(18002099003)(38350700014)(10067099003)(261009223027099003)(261022105027099003)(261021121427099003)(261021123027099003)(56012099006);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?dk8zVklwS05KSkF4VjlyNThGUXhwOGpaYUpxVlpXZEdFbUV0OWdFLzhrR0d3?= =?utf-8?B?YTJpUlBDbHAyYWMvTHozSUFtVDFQaWE2TURheWlHbk41VGs4bWJhRXFzbjM0?= =?utf-8?B?MXJpaGlPTW1MQmo1Q29PT05hTG9GOG9FRG1YWFpXM0ZXRit5RlJ1c1lEM0ZH?= =?utf-8?B?SHFUbHlobFVITUFvaEFJMklGQlhIZm92Z3hNdmRURVNUWjA5cGNidnZ0Z0Rn?= =?utf-8?B?MStsUVRkeis1VldmVnpPU3dIWkt0eUxTeklWRVFJRUhoZWV4M1BIVkY1blNu?= =?utf-8?B?UU84UHFiM0RSa0E1V3F2YjFSL0dMK1dKaEQ1TVVrLzJBMlhwdEE1R1ozR0hw?= =?utf-8?B?SDJqRjY2TmxWSW04c2pGVDQyZmkwcW1Id1NORzIyUGRtKzI2T1dwT2hmdGZa?= =?utf-8?B?ZEU0bnBRbUs4SkY5T3MyN1pPYzBHM0llSXIxU2VZK2p4b3JRc1gwMThEdkRl?= =?utf-8?B?Z2lhZXYyUnhjTm9CdU4rVm8xdXhJOEpzVkFGampyREdDTnBNWFdhSzF4K0ND?= =?utf-8?B?MTFkbG9Kc3FjUm4xdFJxcmlxZlhCZzFxcHhaaEI2ZExwOEZqS3lkK3BuYjNI?= =?utf-8?B?STZUK2pzRjV5aXRJUE14SmR6WUNOMW5yR0xNK2l4Rm9DQ0ZlcUNseDhUcXpm?= =?utf-8?B?c2trYjBOZVhYNzFicHIyWld5TW9RV0pXWmtpbnhkTy9wOGFPUEtTQVdlT01D?= =?utf-8?B?bUFLenBDQ0RpS1dSNlc2N0MwbUJReHdySEQ5NzZsQkRKelhlcXZaMHNXVEZh?= =?utf-8?B?dTVmL245SGNnUUE0LzNXa0w5ODlVNFpEbG9aTmdkNmtOd0o2TU1KRUVPM0FR?= =?utf-8?B?V0tuc2NoNUVTYUhHOWc1VVBWNzdsNWZEM3FyVVFmdVNQQ2JnUWRjUWFmNnRk?= =?utf-8?B?amVBTmJPdzRmYWVEMTlBdGk0b1NVT2lsUEZYaDVMR29tN2p3SEFzUmlPWjRs?= =?utf-8?B?Kzl3SjlLRUV6NTNTRGhZOHpha0RBRFgySWxJbjQ3WWhNNUJCSEhZZ2Z3THN5?= =?utf-8?B?cWd5QUw4enJtUUxGVEx5NVBjZ0ErZ1VIUmpSMHI4K0NITks4dTdKNXVtZ1Zp?= =?utf-8?B?aEFwQjhmcXRjSHBpQnh6bWxaWTFYY0VxNEd1Y2l0a0ZWZlh1K3V2NGN3bGls?= =?utf-8?B?ak1XOTlaNmtrRVhSVUJWcWRkcFF1RTdoZW05b1hINDFuNG1Mb1RwSktVSU1z?= =?utf-8?B?ZXZzdTNHUEVDWHUzWitQOTU3UkRveU1scUYxN05zWlU3QUJvSzh4T0dGZmZ1?= =?utf-8?B?U2VLZ0dtN0lNaXp5UklwMm10cWFPOGtGTloyd2dRYk5IU3IwUm44alJjejVi?= =?utf-8?B?bzlWWEZqYTVvL1kyZWNxSHFVeENnUHU4Um1SdTZYM3I3T1dUbG51SHd3KzUw?= =?utf-8?B?ZWhCUVJwbEJrMngyTjk1K0R1M0RmejBXd2FIdTdnUlBBMGRPUEg2NTdOSWRU?= =?utf-8?B?cDcxVlp1ZWI1NHJmS09QbEFNWTRCeVp3TkNRdUhmejJJaXlIRWdIcTlCWUh5?= =?utf-8?B?bmYrZktMcFlwNHZFdUwyd29WZThvSHBEanhsRUttdWM1TU9yUnBqVHk4Wldt?= =?utf-8?B?Ky9vRWFpT0VJS3ZkUFJkS2FMUzJmQ3dTNHIyT0NFZ3I1cDJOQ2hLTFg2eE5K?= =?utf-8?B?bkRKemo5UUlCTjNCbFRuV0NSL09MSE15ZTZ4anhPelZ6WlVoRkZDeFcxYlMw?= =?utf-8?B?WkhGV1QyV24zc3c3MEp4ZXFlcDByK3JjeW5QUGhuL0NrRUltbWVFZEpLcU9B?= =?utf-8?B?NGNTa2tMdXpyQnlOekt2S0N1NzZOeVZHTXZhVXAyMnJKTkNxUnl3Z0JzUEtv?= =?utf-8?B?SWFNK2VXOGNCLzRBd3VoRGJKNGJnSXcyQVlzaHJnazE5eWV1WUxLYTRQNW1R?= =?utf-8?B?U2p6dXlpWnp2UVd2dHZqcFJLMGtjekRjWW9qa2RWZHV0ZVJFRWxuUzhYRGFt?= =?utf-8?B?bGxTUWNLQU44eU1RTTdrbkN6UjF4V1ZZVGlxLzROUG9mYlRmRWZ0djR4SG5C?= =?utf-8?B?Y2M4QktGUzgyYlV4MXYzWlYyN2prVFlLazZvMlg0MGd2VEFqWnRid20xeUlN?= =?utf-8?B?a21OTUh5RVZ4TnBhUnZyM1JtZVRjMXZ4UVlBUjhqUlJRSGR5MmNxeGk3Mjlj?= =?utf-8?B?ZVphYUs4OU5MVkx6c3Z5alFPZUN2RkkrQUN2UUo1VDR0WUl0d2xqeXBXTisv?= =?utf-8?B?Y0kybnNuRndGSTVmTmVkSk1RVkVWeUZWWS9iekIzUkxRb2FBZlNJOTNYOEln?= =?utf-8?B?elZ4eGllSFdiQnMvODA5bTU0ZXo2bExNSFl1SFFYV3FKS29mYVFXUEhxZzZW?= =?utf-8?B?VGttNys0dUdRR0xxSDlsU3AwbGJYUnJqL0hXZlNmSWdsOEE1Unhla3NURTJZ?= =?utf-8?Q?1TpMm9jNdq/bmxGw=3D?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: f8ba9881-2cdf-4818-3fe3-08df3126503c X-MS-Exchange-CrossTenant-AuthSource: VI0PR08MB10656.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Oct 2026 16:54:33.8679 (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: 7JCzRWg6bbHo05V40x9sTTmqiL0O+VFTWihtof9Tl4Ynk1j2cChnYHFFCxBpnqKcbqqnYUPh7+XAVqLc4kwEUbklprdRxHMj7MGX0zUPr9M= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU4PR08MB11747 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