From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from DU2PR03CU002.outbound.protection.outlook.com (mail-northeuropeazon11021107.outbound.protection.outlook.com [52.101.65.107]) by lore.virtuozzo.com (Postfix) with ESMTPS id 1710781065 for ; Fri, 30 Oct 2026 14:45:52 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=EJra1inQB7eUflJvW7qsDFpURSuClvFjcGbSFzKyjwNNAK8EtPP0BaIVA6zxdj9QrV2zu1DZasgK6jrG64LKXnvLWmwHLrfXDC41ofejLo2GAIQJjlF90UtDqEKT/i8Xk3s4i5LAXRhucd4mr4r3S/sUWBnzqE0BtrSGaUEKEC2LgIywhVdwSCllnoQ5hXMsoTKnEW+2ozdu1dSr8V3b6UpPMRxfeXMz/CuJpXqr+EYCHgEYQm2F0eZdhUWAAzf8/ICFQbpTht9aA3lbeL9J0NjwId5Ndgc6oSDaatcxjz4lEOiQo2lKe+Imn4Z4dvb375+0pyXpUjo2/MnoQrh6FA== 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=pRsIOJEtNe2Y0PIGybZSvUjSaZe2PFm8ncGrjvynqUfzaSdd+bH976VuJHDwkCTjJOHEteC7WZyK9LYqjXXAp7hZvxuWt8i3zIEyDysy+8O3bHV918SA7o1jeE24aqCGhL7Rr7WvDis1PkVR/GZZwFROChH2i5ARl33p6bRJxtWdCdVqDsiQXHYTJz3WSE0GdQEvynVrNgztX6cONYKXCDEgaa57IBJOYYhPsjXbcFCTjI8yPKwOopQkphSiUqVUekexcvqaXA+56xdTZs27KE3WA+7CGUj/TUrAU8g6VHfUyuSsO6h6WunRpUCCtuyMGUtTQa23LfAAnNT2CCaVvg== 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=caNBpJYKk3Ul/VTQwLCgFCu7YjILSNqxiLIzjM55k7+84PM1+4kgJODYo3pqodXjUQKiwyWII63PCwfkS/JhjO+Dq+TNLWNyAVr81P9BFrx3BpQ2KyDDtp3sKa0BtFabim+SkObUsR5ul2GZ9NCwZvrkm48ELiHzE8XgzW6JqiQjWH2FziH1MMFBW6tBXyAMNWsTm4P2E0l9qji4iA452yxijzy76bzb7pFsmDZgMCroFi66AQepE7m36Z28mBItE5vdji8NrWrA+w0GHrzAY53/zZjXk2jBVnMbLaTnSPwAw1KcEevV5JQWMJZJbtxB1DUKSXfvNFNVwel0hnIb5g== 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 AS1PR08MB7451.eurprd08.prod.outlook.com (2603:10a6:20b:4dd::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.569.9; Fri, 30 Oct 2026 14:45:50 +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.008; Fri, 30 Oct 2026 14:45:50 +0000 From: Andrey Drobyshev Date: Fri, 30 Oct 2026 16:45:48 +0200 Subject: [PATCH QEMU HCI-8.1 v6 17/34] migration: vmstate_save_state_v: fix double error_setg Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261030-vfio_v1-v6-17-45de246bc92e@virtuozzo.com> References: <20261030-vfio_v1-v6-0-45de246bc92e@virtuozzo.com> In-Reply-To: <20261030-vfio_v1-v6-0-45de246bc92e@virtuozzo.com> To: svt-core@virtuozzo.com Cc: andrey.drobyshev@virtuozzo.com X-Mailer: b4 0.16.0 X-ClientProxiedBy: VI1PR0502CA0031.eurprd05.prod.outlook.com (2603:10a6:803:1::44) To VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI0PR08MB10656:EE_|AS1PR08MB7451:EE_ X-MS-Office365-Filtering-Correlation-Id: 1d3f87f3-9418-4f3a-b976-08df36947beb 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|52116014|376014|23010399003|1800799024|5113699003|22082099003|18002099003|38350700014|56012099006|10067099003|261021123027099003|261028144727099003|261021121427099003|261022105027099003|261009223027099003|261026140227099003; X-Microsoft-Antispam-Message-Info: O4nrNwjqeBzNsRfziP/OnIcd7OZxBxY3IDWRxd283TngrIDV6N6JLVVMVHJNWgLvPO+4c7RLqmbO3Z2bkO//tk/wBzU3GB6E8ConC9uKi4TQt8jkD7IBmlgQVGETrgjfptdCxKGJ2GV/mRIWO8tW0/kpivCU2cpmRGr3X/tK4C2MOqlnvJIXNzXhol/cxBB3DJz3zx0Yir+JUMYre9qPWuDJmBbVgTi9tbc21vnSiJ7Iw4xw5pAFc8Ub+G2oGuIFQmmzhYMlq9W1Uu+1vqXLTXisU8s7L7jG4iZ6T8w8/QGxqWpc1aiUlXsntgRS/T17L/+lrJVfnHRtpZ0UfUB9quzOl6b32P0Mdkx2LM456cVNZkTQgZGQYslHfYD7B7HOjAcSCT3qMAd0odfgsj0sxtndiumAwq0QwxLNMr9+34tvWeuqafQNzbsbJaHgAcCY9PCtKPL87D+WBtkgo7JM4ajK1wiX8GY/EaGbHj5QKzQROA20q6iuMXUc7sBiE+Hb1mTPxsj1KT62Z5Dl+5fc2T7nWmps7NACQ8b1/FZ8HZ5jkkR6qE+yw5lab98vvegz0N8AfPFSdPH0EsjtQ5Mt0ISemLQlIlgghh0n5MfHBAnmJYFZrLQQvCGBouJtteFOFIJKRoy4NWB7Zq8ylgkHWEG7hPCqaJ6dz5AmQhhdnYQ= 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)(52116014)(376014)(23010399003)(1800799024)(5113699003)(22082099003)(18002099003)(38350700014)(56012099006)(10067099003)(261021123027099003)(261028144727099003)(261021121427099003)(261022105027099003)(261009223027099003)(261026140227099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Sy9YVDZUWUtiWWRVekJRWWFibVBOaE14cTdyY2NhQ2NVeDFHdjU4NnJwNk9n?= =?utf-8?B?T21KQXpmNmY1d2NoSi9OWlVnRnRHRlBNUUp6dWNqVFhISFVkMENuNGJURlVM?= =?utf-8?B?amhiY0hpVkNmUVNvUDFGMlZ4T3FkVkdFNUZ3UjNYYkdJaks2K3g3SCs5Zk5D?= =?utf-8?B?SjdjNkRKbFMwemlwbzhoRmthQllTd1p5aEM3SFhtdHBvc1M1Q3Q4Mk9ILytD?= =?utf-8?B?VFdvWVUxVldTaVBJeUZ6anVXV3Zad2ZoQWFXUjhrYmpNZnQ1S1E2bXdvRVpt?= =?utf-8?B?VzdQZGw2NnByK0lSM2U3aUNiR3ZpRGdlVkRSQ1hRTjlTVk9UL00zVjg2QnY1?= =?utf-8?B?TktKMmwzTGdHQklaZFdqbmxCbFRpb3pXdnVPd3dTS1NBMDBtT09NYTNhUC9F?= =?utf-8?B?UEI2d2NVa0YyTEwraHpWbDZIMGtDUnNiMUE3MHR1aDk4aVdhaTAwbmdHY0Zu?= =?utf-8?B?MkFYUThiV2s0ZWJ6allqRnd2ekIyVGJDckNuWEl2dGhhQUxQaDYzYnNkVmxY?= =?utf-8?B?ZWtaNXVpMnM0am5SM0l0aVNWSXJCa243clhIbUo0SyszMDRyMXN5RXBqWHBw?= =?utf-8?B?aWNmUDA0eWcydDZSdWh5SXZMb3FRUThmMi9Gell5M20yWGVDcEg0Y3J5VU03?= =?utf-8?B?TXIxZTE4RTQyQll2blZyOHREc284T3pQN3o2aUJ4SC93VEszR3hpN3VNaWFV?= =?utf-8?B?bTRDQXc3YlZaSjVsbWtIYXMydnlPOVR0cGxpSTV5RUpwelJibUdlck4rYXR4?= =?utf-8?B?K1AwYm93bmVEUC9ZMnc0eExYZEJONFdWenlkOC9HcGEzU1pSbldsd25rcU1l?= =?utf-8?B?OWhzb0ZodkloUmdObUVNK2lPZVJFWGh3T1VxSTBCektiRzNVbmlJWlU2NEVt?= =?utf-8?B?RW9vMk1XRVRpOGVuTWtxSTYxMUMxdUFPR0c0dzNyZWRKclNOa0s5U3p6cUdL?= =?utf-8?B?bGV6VmM3NmZmeE1RcEkvOEpMd3pSQVlCM2VCZ0VwYWkvakZzUnkvVVVMckhz?= =?utf-8?B?QkQ0cmtweHpNMVV3QzJRbGNwdXhIR2lmNXEzRFczM0pvNEJNZ3dLNjFvVWhG?= =?utf-8?B?SW1oWW9iOXVJK3Ayd3lNREh6ZFNjMkV1ay95WW5TZHI3b3hCeWY3cExMSEFF?= =?utf-8?B?WmhZRW9za1dLbElJRXdvL09JVFlKbElBek5xc001WjdsQklhVEhVdGZvazBp?= =?utf-8?B?R2wvSElhTUpUOWYxamhIK01ZSC9SOC9WMTU1Mkl5NEVia0ErMUsrTDhHM1Bi?= =?utf-8?B?RC9nR1RpWU9DT1hzSGl0bDdKOUFmdWRTM1JyMVcvdGhjZVE4bkZSTzl6OWpK?= =?utf-8?B?cVNicDRnbjRjdTh2cWlFTUNGWGhRdk5tclhkMnNROGlNS2ovZVU2VUFpWHIz?= =?utf-8?B?cmI4S1lPSk1peWJka2Q1R2pVUnZabm1JMTRoTUdSMm5DaEJ2ZUdmV1lOQ2Vt?= =?utf-8?B?RDFVQXFCM0hKOEh6UnlFVUMwcmx5TzNkcllRVk9NMCsyVXNDQllGbk5iM3Z3?= =?utf-8?B?MGdSemplNlhZWnBxRkxNTzUzMVE4dmhCRVdyamZLcDdNYnBVTjEzN3hCVHpF?= =?utf-8?B?U1Z6dC9QeUdqT0FUejZ6RW1oU2g2WUQ0UE9NZmxmSmFMU3BKWmxVSmVscjkv?= =?utf-8?B?bmU4T2l5enlEQnBjY0J5Y093dUFLTkNOREpUdlhyeFN1ZU5RSzVsektNT0xK?= =?utf-8?B?WklGaEVvS3R3SzQwdG9qajEwVldYK0hGUC9UYW5uaitrODBPOXhCbW51R0ZH?= =?utf-8?B?N3lyYUloQ2VHY2ZzZkFJcXJucndNbnRhVmUwSE9CcGxZbDZXWWdZWTJkdGNJ?= =?utf-8?B?Z3Q1WUVGWG1GVnBIYWc0SzRkbHVINmRBYW5Tbk5hOTcydHU2ZjdPTUtCNE9a?= =?utf-8?B?Tk9KWk5ZQTl6ckNoZm1uZnNBS0RuZ1JHbCs0Q1dQZE5JejBEa0VaTUhFZGlq?= =?utf-8?B?UnVhRmp1Ymw5QTU2TDB2OFVvdVBLVUhaOUR6S1kyUXU2UmxNU2kyYzArVUhn?= =?utf-8?B?dkgzbENPTWtFcUFzcGcvNitibnI3QVdlOWZPNGRZejJkUFNLaUR4d1YyWjd5?= =?utf-8?B?WTJyaWFVOFpYWThLYm40SGlYejZBamphMmt6UEFuck9USjdnVllpNmx6TWhF?= =?utf-8?B?dTIrWnZoZFErSUtkdWpvakEyVHhROC9VazlOeS9TdWkwekxqeWdFbG1sQXNP?= =?utf-8?B?Z2o1N3U0ZVc0bTN3NVN5VTJlUXFLcmVTdTRXSEFNWG42S3hkbW9qVjc2Wmcw?= =?utf-8?B?aWF2Um9uNzJwUE44VER1cnlPNHpwakxFSTdGQWl1Ri84alZ0OHNRZnpTSVRB?= =?utf-8?B?TkJZUWdVWFRiS2xCbWVJblAvSmdQNVBMMDBlR0dsUTNQQ2ZNa1BWWHlocFZp?= =?utf-8?Q?02bEICpDLr2VcSek=3D?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1d3f87f3-9418-4f3a-b976-08df36947beb X-MS-Exchange-CrossTenant-AuthSource: VI0PR08MB10656.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Oct 2026 14:45:47.3516 (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: bhZEGJp+A0H3oGz8JmXut1uiHXMMVGygnuLQ61cVk/d5tmvrT+2PsLJuEgi6j7reHYD/Zr2vQF/+jeatVL4lLeamKvXY9mPGM0klbZ7/T2g= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS1PR08MB7451 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