From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from AM0PR02CU008.outbound.protection.outlook.com (mail-westeuropeazon11023080.outbound.protection.outlook.com [52.101.72.80]) by lore.virtuozzo.com (Postfix) with ESMTPS id 9160280461 for ; Fri, 16 Oct 2026 15:26:16 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=A3bOKddDhsCq9Uc+i77QyFKgKFm25jWDMH5Jd8Bps+DALrYncMNilFu/tmm9RPjWdKmZe99oI4XTsqkj4L4e4aZwhT0rOLMg1cQUjC3bmLdd18+jm8upAC112TY8T4pyzjj5wA03WdzSm/rVBJtVgsRaTYw0RBppLA+Ay4BPytfvDdWuN0jnVCI1bEYwr17peh6vme4yEOqB0EQ/fmfg871fxYRCtZfHS+RJWf6c44ITceswZXkAu72vPuz2GL2e0GBJ1cicLbABrCtdSau7gv0TAKx7SW1jZBRKhox9yzgBIlFC/dYp66RZAmmsQvGM1mQC6pq/M3yIsPf6fAfwnQ== 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=AK/NKVds2ZqmhnZAhMwv7FbwWERE4J+YUfXFoe/zaM7myhKy/AC4KUNDvZSTJNK3ZTi8t6QiWh09qjDcG8mL/K7Ec8munAWPHgwP4o6/7od58e+AVP4Zdsj9b+rafyipjRn8Ljm3abmxLphqcg3RNROfRQ9ac9AR0tttsOuj4eUp+waeyIRRCv8POzKrzK8eHVopM14UlwWmSCOvryxHcVOD7NYqRPDuHseO0yvnWGHP0IxR7wcSOgLVxYYm2kydmCg/kIonRCziMPP5YstYJQXrF3cBbGlhocWecjebXWBOq0ovyjG4Ci5VUAO1dwr/1yTz3zjKvnNeJV3NkpITHQ== 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=lA36RlcjxsyZOjc3QN0yPMAYtjywbgAEnWD8pHjo4oDdhGBJbg9OIbU37txHJsxOus/8ZXhzHFB8IEtSr6Mw2Dq4fhVq3l3/CA2Q7QofbfakUGlmrzXfmJfhjEu8Q4MWFE/24q6Liwm8ktCdkrPIQ26kNhw40jXQhiCj9dx6YYAHHRLu5ZkK70PsntD+/tDxbPuDVYUEx3YxMWAjcSCFu8GCEjuc+Phv/EhqsZVMXDXQq2YhRcvubw1nbTOmBUXkLj+hlUW7pBn5YduEnWcTzUxUvhjXiAWjI6BtYjAh7+6PopHZfm5PCDP6boE6sWfoc0nrWGueY0AEpmPorVvofw== 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 DU0PR08MB8907.eurprd08.prod.outlook.com (2603:10a6:10:47f::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.546.9; Fri, 16 Oct 2026 15:26:15 +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.006; Fri, 16 Oct 2026 15:26:15 +0000 From: Andrey Drobyshev Date: Fri, 16 Oct 2026 18:26:11 +0300 Subject: [PATCH QEMU HCI-8.1 v3 13/28] migration: vmstate_save_state_v: fix double error_setg Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261016-vfio_v1-v3-13-47487cb5a8e5@virtuozzo.com> References: <20261016-vfio_v1-v3-0-47487cb5a8e5@virtuozzo.com> In-Reply-To: <20261016-vfio_v1-v3-0-47487cb5a8e5@virtuozzo.com> To: svt-core@virtuozzo.com Cc: andrey.drobyshev@virtuozzo.com X-Mailer: b4 0.16.0 X-ClientProxiedBy: VI1PR10CA0088.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:803:28::17) To VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI0PR08MB10656:EE_|DU0PR08MB8907:EE_ X-MS-Office365-Filtering-Correlation-Id: f94e998e-5a87-406a-6e4c-08df2b99cecf 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|23010399003|52116014|1800799024|366016|376014|5113699003|18002099003|22082099003|10067099003|261009223027099003|56012099006|38350700014; X-Microsoft-Antispam-Message-Info: kE3PRceI0rq+0swVkM+6RiQtDBeyrk2bO9cZhsUxq697pxlNyaI2dLi/f1c84dYFRqUSv1rwpqBkMh+t3+5OCEDhkWi+1tYxzmE7ZL/WE+83syvnur/Mq4Rd/Yx1EygMJ4Jp4gTGHMjq5dXe0ivPpuauso8VVRUk3vBUwAr1JPz0Ii03g/7KhbxLDhwGI82Hfs/GvYDQHOpC5yQZV0U5/ffifUJtV6qiGNMa9YEo5crvmgvr9CV4pJFG+z81e4di6Bvku4CFMKE0U0onXa/7gloC6P+Z9rQmLwF95ZuEJpys/YncxpCl+41E8rVhdBgPUfJ12CCrrrBeBhz7rmQCQDkkxwKM8eNAWx94jbDGaxZNFj/ilk8QfssF/af66GuHvfOQLLIx6s5xDLDbEmWwqVxfUKr9ILTZ5zmGQdMhM5rvUU2ByblXDfWxD2slsfgd/Sulr0PQWmr/htc3TMzIVrd3iXa0Ild7MjPCSq1FsmUZC2UrZQklVZ53mv67pHFBXV0WlT7lC0wwDt+hwzRkUu8Wp/cLlS3PsXb2D19kX4vJTFs5LX5VUrozCmtFpqMr9GmonW5cGXM5L7Be1oHdoaBxn+Aj3pCdQOQyhg1bEyexs5hSzpBcEXV8UulgQ+ycoWGhaPGxkOz4HqCSys8GiH9ZeGSBaINsex3m9busy4M= 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)(52116014)(1800799024)(366016)(376014)(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?R3Z4dVVCVWJ6RnJnaWtHUGg3MTFYNHhkckJMc2tLSGZSRXpiVmZ6N1lkQ3ZF?= =?utf-8?B?RFZNMGxlbmtUZ3VsbUxJV1NCZDdnMy9mS0lPaGR5RUZJWjR4dVNsckdLSmJY?= =?utf-8?B?bktWL01kNys1bTc1YUM5czFXQUN5RFJ2T3NlTjZMNmFLSjVwaHRLdWZ6UkUr?= =?utf-8?B?blFUMVJJSmt3QXE4bXBFYlRzMm83M01YWExFUkRrKzRUNGVvdXpIMVl6Q2RF?= =?utf-8?B?ZGNSMjVMZ21FUm1SQzQ3NTFoY0dDanF2bXltc2RySGhqUlBvWFJ3Q2hDWTJG?= =?utf-8?B?UTE2NlQ0ZlRLYklxRDhHUjlJbkhKclpwYlF4N2t4QXJuMXFXaDhxL1FNMERO?= =?utf-8?B?UXBwVzlibHprTmZxYXMxM3l5K2M5S1hVVzczbjhtbWpvTC9ubGJGVDVJbTZj?= =?utf-8?B?Q2pIckVGM3Z4NWN4U2NPTGYzWHc3a3h1dldtU0p1UExZeXp2cmEwUXVTVE5k?= =?utf-8?B?Z3VVWkRTTWtKTlZyL2VIOU5wYjZ5ZVloUlE3ZzhENWtOamR0VndjS1RHZ3RY?= =?utf-8?B?L2hJdzFSUTRhU1hZWG9NZkVPeXRtVTdTR3YxZGdTQ2ZsSk1RbDJpWlZNTE1r?= =?utf-8?B?K2lhYWlrano5eEhITGdSTjlBYVFicFpMZkV2N0k0cTdtWGhoa3hFaUN4c054?= =?utf-8?B?Q3FVUFpWT252cHUwQ00wRlkwTFpOVnVvbStyTUIyclNnZzdYa21xOWZ6bEE5?= =?utf-8?B?bEo4SFlFTUpteVZIUnFCQ0x5dThVRU13elZrMEUrV252am5tWVZ3VWNoemlI?= =?utf-8?B?WjhrdFZESDFXemFqbko3UkV3S08wL0xKbytZYUxMWlg5K0Y0Ui9rMFdseEVv?= =?utf-8?B?OHJ5S0FuMXZSQ2QxQnpONkFlSFI2elZqU2tQb0pQVHlERFJOc2VXYk9Xd1lC?= =?utf-8?B?NDNiMjZ4R08rTWVPOGlLZnhwZ2Z3L2xrbUNDTjVuQkVJYnBNdWVIMFZudW5Y?= =?utf-8?B?cnNUa0pJbFFVQm51RVN3eWJ3ZS8xc1MxOFU4QWMzd2NGdE04MDVrSVp2bEQ1?= =?utf-8?B?dGV4cTJQWVdXWVlTTm5FaVpiQ21FZGR5R25PQ25oNFBtcWlsekV2bFFCNHZQ?= =?utf-8?B?bnVBd3RxaGI2Y1p2RHZQNHBCb3hFNXA2YUxIc1NNRlY5MlQ2OXJ5cDRWVXNu?= =?utf-8?B?T0FuVXVpNVhlQit6VFhDbHZCSnhpRGQ3WjFqdFd3dS9Eekx4SGdpa014MEVP?= =?utf-8?B?cFJIRDBlR0R0OFJnTWhyVS9uR0c4SGZoaC9QS2Fad1pVaXlCR2ZYaEZ1Q1hs?= =?utf-8?B?SDI5RWxheXZFWXk1SDZvVWdKTjlXM0lNbkdIbms0WUpITW8zV0hkY1B1ZFc0?= =?utf-8?B?ZkJtV2ZxVEd0UGZ5M3phWFdvTmgxQmk2M0k1RG11V0lreUJxdUE4WlBnK2Ry?= =?utf-8?B?L2RRRkZVSVk4SGMvblNhaXVIc1lENVlkNGtPc3lPdWxYRWlHQlEvWmVsR2U4?= =?utf-8?B?dnhWYm9vUUNFa2hLdzBIM2hkMlFCcE9mdUg2ZlFRVVdpOVNYRUl4d0JtUDI0?= =?utf-8?B?OHBlb1pXT2l5MFBiSVVzazRXZlVBZC90OEh2VWRhUGplOWE1RERwbDE2QS95?= =?utf-8?B?RitKd1NMRXBXWHQxWXRpN0xuZlFHbGJMcE1OdGdKUXVURDlKNjJwNFRwWE9N?= =?utf-8?B?MlhCQ0p4blBiNmR1TVh3SDd6YjdWdVp2WTVDaVhZcXdKUml3WHVCRUdReE5a?= =?utf-8?B?ajEyR1ZuMDkyMFkwUi9TbUVwZkJVRW9yeHgvTHBLdytUVlNaaEdpd3NEOHpF?= =?utf-8?B?b0M1R29adzVtcC9xYXZBV21hdVJqOWY0SUlRczFFZnZVZmhhVHQraEUvcDA0?= =?utf-8?B?RVRJNitJSEVVdjBrWENNdmN0bURLZHBxcWVZZmZZTFcxaEFiNnU5RWVXY3pv?= =?utf-8?B?V3NhQ3BFcVc0Ym56aDNyN0RnZ2FZbmlFNDlJNXFxb2xFVElUSjBMUEY0dHNi?= =?utf-8?B?VE1KV09hRFBEdFFhSWhORXZZckJBbm8yMlh4SG03YjhERFR1NGN2dHRZMkVn?= =?utf-8?B?cjJWT3BFYzJXOUk1U1FVcElFRGdrbGdQekVuY2EwWTEzUEM0bVBrbmc4QkUz?= =?utf-8?B?OXYyWWp1dHZiVDhBYktNa0VhNVM2eXRSL2Fod0NSMkxad0hMUSs5WkVZVzFS?= =?utf-8?B?THE3dUliUk5IOXBOd2RIbGJhTFpxWmI2NGpRRmFYQU9JV2J0eThlNnFMVlJu?= =?utf-8?B?bXJHSEk1RTVsc2phUmRmazc1MHBidWlUWGVFZzJtT0lCamtLcEtndmVENVc3?= =?utf-8?B?SG5sdzljUUx5eDY2MXpaU3Y4ZlBsRXVCTU04L2dHTCtOL3lWN2FIOG54SThq?= =?utf-8?B?Wisxd1M0QjVtQ2lYcXJtWWJlTmpsWVBIb3VOa1I3NTlUY1VOdFdFNzFmTVpl?= =?utf-8?Q?TP9Dp4zJ4+llaPMI=3D?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: f94e998e-5a87-406a-6e4c-08df2b99cecf X-MS-Exchange-CrossTenant-AuthSource: VI0PR08MB10656.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Oct 2026 15:26:11.1727 (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: U6Ax8hUZpgV1ztUwnhHl1ZNlpL145CsrJazg5upY9OIQDG176KTMOgZnjiMimcVZ6gJ3OdG4/BrypWzrgSiwrSiCB61Hj+N51T0+vkmHY2c= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR08MB8907 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