From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from OSPPR02CU001.outbound.protection.outlook.com (mail-norwayeastazon11023097.outbound.protection.outlook.com [40.107.159.97]) by lore.virtuozzo.com (Postfix) with ESMTPS id 11E5A80B97 for ; Tue, 20 Oct 2026 16:31:00 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=AGrcnNHWn3Y0O5xHMknmYmcDAD2ZDlkaKBMG1UkY6N6UDm9CKOAzVkE3L0AmOuJR7N6L9FyO5YB0q7q0d2cSUZFihVoqVaE0I/eMlVFbuitOxORVZWDVJj/CK9Wb4z6WKRb0gnSu+WcNZWpoa8iz9heu7bFGhHmZyKFQFKX8Hkz/5K7bV33IZsK1t9oW0WeerTQDpq4AQK6M7URfyyUI60W6uV71R77E44AgyV1BZ9wtGpRqcmFYgqbHnvrS+GQElfF2VWQ5hzT/XcvJqG9858RDhkzW39T9jqWOtzhwSyKMqjp/MVjehJDNYbbKw5bYNCHe7vopIczu0CFhNJbdzg== 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=UW/6kRo86O/vpMw7+r3xIkennIUdmJIOaG4kEsmv5cmbudkAUF7LXPP/oBXAcBz0mupH+aCtYOMUaw/NP88hXlwQZtldUhrX9YCbAweusO4F0xXE8vds9bxXVhmjr6wt9Pa4wbT4+jBDDHz6mFhEgQ6JRFkc9cUfRBS+r30zscDQrUkdGRRBc4tOgYCKHd58T7lsV2p3eS3occtsysf7t2m3MwMF2LThoUypgxUSr4YeZD/lWfxHN7qTigPbKhoNzOlQET+m6r0gwpfNMEO5pZCKDNRSVw66oTg/ttjRrt7cANNXWRE4ez0otnqLrzV+HF8zknj1rjd7ayBq5BRkNg== 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=mwWcd+uC2S8/ibZb+dMV7cm1syoUMNLWZ/ymuvvVA4lFL5Rmglr7oPcBGhduaMBOpCXovyAC3qcFNmQhOgYLMk7w69hB08gMNtDVxAKgdbzAbSs42ECVy0X5XqU32jy41St9frsxAbQzlv1pVSE91T+zlQ5RuOmNNmpJexOXsBfIVMakNfw9dbQPrXAWsmiU3gC4Dcnr1mNZOwjs6aDhYqXCVMKul3mQVgGBZdh8cfNEYT3UYZxGUpoQPBQPnAjd9y4/PFXWSS9qY+++XZTiEttRe5/ef2wG3rHnsGPpdsu6q9s4yheUf4vfVHmxyK18xJimhw2JWfpnloHnLk4g2Q== 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 AS4PR08MB7553.eurprd08.prod.outlook.com (2603:10a6:20b:4fb::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.546.15; Tue, 20 Oct 2026 16:30:58 +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.012; Tue, 20 Oct 2026 16:30:58 +0000 From: Andrey Drobyshev Date: Tue, 20 Oct 2026 19:30:55 +0300 Subject: [PATCH QEMU HCI-8.1 v4 15/31] migration: vmstate_save_state_v: fix double error_setg Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261020-vfio_v1-v4-15-83a5668230e5@virtuozzo.com> References: <20261020-vfio_v1-v4-0-83a5668230e5@virtuozzo.com> In-Reply-To: <20261020-vfio_v1-v4-0-83a5668230e5@virtuozzo.com> To: svt-core@virtuozzo.com Cc: Andrey Drobyshev X-Mailer: b4 0.16.0 X-ClientProxiedBy: VIUP296CA0056.AUTP296.PROD.OUTLOOK.COM (2603:10a6:800:34b::14) To VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI0PR08MB10656:EE_|AS4PR08MB7553:EE_ X-MS-Office365-Filtering-Correlation-Id: cdb69c54-b1e1-4e6a-4dbd-08df2ec78427 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|1800799024|376014|52116014|366016|5113699003|10067099003|22082099003|18002099003|261009223027099003|56012099006|38350700014; X-Microsoft-Antispam-Message-Info: oN7lmUhIkmgyvakYARMoPoCYtuboVeW8YPYqbXfkB/WLgs795fTnmclVJ9EHdLqbjYcMxJY6Ekld6mDJ0Z9PRZTYWZ3FNKiT4nSKpUaY+OipQRqSA4vyDnajNHNkxHWbVNW5raShUgG2g3GuVrf49kAoLLgrGM0wW3HSDuUTPe8Qzd06yPMByHNHHYfSLuHZ/mfTqyE+9kZIM/mpogy6vXuy0/8V19NL2IkDYQlY8qim+3secspwOJl7RUnEvDS+v71aBmC9j9DQUKsE5PlG/4HwUOITkrpn3qbQsIgIFs97Fhd+P8unF1eVnZjq8wO2Pobg8p6XiIj+X6JVc8uncIZgBUM4FmNtAzv5pEjKw02wkddnvnkwBzeTSn/XTgsmna8VnYlw38goT/9MFi4y1WZYEYex8mbgh8lN0yisMbXUJ9swIc7hbOS6mDqt6d2NxRvcys/IwLGu8Bt2KS8I3mDb59tM3gv8jWPPFGCfQDp9BULpn2r5o13ErlDZSLzhu61nPhZqpYbLFQfV/FpO0te+zYMH8KlCIM17Hl8GUvvexMOPZhHnPuLkddOXyN1Gfe6ztCrOTj1+hT8M61xzUH4Eju3061GA6aBzdDeEJV0lm3K+5D7SIDidbJPfBMNRLzWAHdsQ/0CDR/ayJDa+SS5Hjplq0RYPMplgs7kVoFM= 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)(1800799024)(376014)(52116014)(366016)(5113699003)(10067099003)(22082099003)(18002099003)(261009223027099003)(56012099006)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MWF6c0QrTUNPMUxVbzhCelAxcTdjbGNRay9mUDVZS0YxMHFSRVlRSXFKTEVV?= =?utf-8?B?Y3Jkc2crSjBEOFZ6WXBXYUgxODNpYytXYVRjbVd3TVRNbkFlUWZaNWU3dVNP?= =?utf-8?B?QjZTcG1SNzBaR1VZRzRpeUxjTCtSRkRxL2hSYUlhMy9YdjVKMlNOV3dRaWtP?= =?utf-8?B?ZWlZZ3RHR0MycFc2NnRMWmpmdjNYeUxMNlVJdXFaNnp0YVdZU2hqZis3SUU1?= =?utf-8?B?cm55bDJkLzRJWVp5ckR2S3FydlJPN01CRzdFbnN2ZitXeFBpT2J6OWNpd0sv?= =?utf-8?B?d1BHWnRUY0xqelg5RGRYdTRQU1FjM2NwTDNrUXFhL3piZmpsRFNYV2F4RUVS?= =?utf-8?B?c3NZV3QvVm1qd1B6RFZKWEY2Z284dTFxQkVNdUNxc0VOekZHZkhBeU1jZk82?= =?utf-8?B?QnhITFRieUFhQVZBSHR5SVpVSzM4RzJVc3Q1TiswSUZaaTFwT3g5R1ZRK243?= =?utf-8?B?YmNXUUcyOVJaZ3lTV2E1NERrQ3Jmb3JHUXl3T0ZadXlwSUpIZXIySllmMXo4?= =?utf-8?B?QS9VL2hJMUUxTEJSbVdHY3I1TGNmZDYrWnZlMTZkazlMbG1zbVF0dkFTWS9S?= =?utf-8?B?UGh6cEN4Uk9GK040ZnVpQUV2TmMzTWdxcmZvNkoxSlZ4bUdjZE5nN09tTUND?= =?utf-8?B?a25IYm0wbThCYUI2VjE3ZmdieEJJc1BRV2R3aS9scnRCSUpNSTJXc0ptQzlC?= =?utf-8?B?WUNDL3l4MC84aHJJYnJsbk43N1hObGcrY1AveG9HOVRrYXFyOU5DMFllcDhi?= =?utf-8?B?d3RJNGp6cXBzOUdrUFBzOUZnd29BaVlDSEpzRFovY29qV3I0ZGxwVGtUNHRY?= =?utf-8?B?T2ZtVm5ERTNnSm9vQk0xaXBJS3RrNXdPSU9DcnBjYUtsTzZmcUFwWFQxV2RN?= =?utf-8?B?N0l1TjNYL0EvWG52UkhzcFdpTWdoN1UwM3F1cjNNSXk0RmR2dUJWTGQ3d0dm?= =?utf-8?B?cmdnZFhFcjA4aFVlY1hXV1cxeldVaG1FQzQ4ZzlqclcvRUd6V04yNmRSdGpC?= =?utf-8?B?Tzd4b08xcmxGMS9OSmhrbkFBRHZpNThjdS8xMnJpcjRxN0dPZU1ZSmttNEhR?= =?utf-8?B?RVhlMVRqeGJWRUM2ZldKRUFxWWRFQ3A4TVhicEFHcEpFZ0hhUGxSc1FxbEt2?= =?utf-8?B?cWVXSkd0K0pveXYyMkw1Si9rQy8vdTRvUmFsNldIWDNnZnN2QWlTckNjWVBN?= =?utf-8?B?NHBjWW1jMW42NVlBamdVamwvNUFxNU1NeXhZM1dlcXJxQ0VzRXZ6UWF2bWY1?= =?utf-8?B?eU5ZaWcrVnVNdFBPVFRzVVc0SnB2OTlGVlNZOHJRVWlZNTVRaUxWd1UzS0E5?= =?utf-8?B?eXNaL0ZzTlQ3aDFHNlJYQUppczNpMmhkczdoSWR6YXA4YSsydllOWkhtVkhy?= =?utf-8?B?RFVyVHJsRm91SnlYTGVhMFdkUTZGWGIxVi9JKzlpb2tOT3lrazNPU09kS3Qz?= =?utf-8?B?WS9MZUNVZlJGblFrY3JEOFRBT0NuQzJET0FhbHBlSmplYm95VmtNbi80ZlVz?= =?utf-8?B?cUlCRkxwZXpobU04Q0MvRUhGSjhLMWM1eTY5Mm9kZjhobS94UUVEWHBNa1Bi?= =?utf-8?B?YzlCRGxObllmNFNUQ0tNbUhaUTVPT1IwR1pyeUowSW5oNEtTdTNabUllNnVL?= =?utf-8?B?NmNuZVdMeE1nVE1oOHVDcnZiRVFRa1NUK3ViZ2FZQVhNYVVyNi9IeThaOEQv?= =?utf-8?B?c3o3SWN6VHM3dDQzbUFqWWNOdjBYdVRtMHpJaldjTFZxZzVQL1YzN2hMd3gz?= =?utf-8?B?UWlOcTBqa2FIUGFlZ3c0U0hOVXBzZHJjWGlOUHVxczVWWkdKMGVaNU05RnY1?= =?utf-8?B?ME52bjMyVjVVL3pRTlNQTlZSa3p4d29INU8rVmNHUlh4NzBKOFVzRFlsZ29Z?= =?utf-8?B?OWtOK3JSTzRvc2d2bHYzVEhrYUVZcHBBWEVrVmFaQWpMd3A4d0EyV3dwOXRi?= =?utf-8?B?V3FtUDdKR0VBMlU1T01QdmJYTW9nRGtia055YmQ3ZktSRWlNNkZIdGtBSDFU?= =?utf-8?B?Z1Q1VS9BSXhOZm1HdnAwK3ZMZ3A1S29CNUYwSTgycVNEdjNGdTd0RnoxZmZq?= =?utf-8?B?Qmc1T2I4ZWZPVGRpTUVYYXZjNUlsb2F1blRjeURlUyt3NkoxQ3p4MHh1WVJa?= =?utf-8?B?YzJoRXhZR2tmR28vZ01yNmdGdnM0NVlncDhGUTBZQ0JWM25uSk5nb0dmVUY0?= =?utf-8?B?a0kzRU1vY1FuNjJMNDJ1VjJRRWFtR29IS0lCWGtkZm5weEsvbW5VcjhYbkp2?= =?utf-8?B?WWlGSDBpV0J6bk5vd0htaCt3dWZPWk1HRE5OL3FtRDJpVDBwQVVnSnZxVCts?= =?utf-8?B?Y0FhS1ZXNXN0NWlXb0JHYzdyTWdmQkpXc0JvMUtERytZd2QwZDR1UFJVaGJp?= =?utf-8?Q?rvAbn+qGMlop0XoY=3D?= X-Auto-Response-Suppress: DR, OOF, AutoReply X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: cdb69c54-b1e1-4e6a-4dbd-08df2ec78427 X-MS-Exchange-CrossTenant-AuthSource: VI0PR08MB10656.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2026 16:30:56.1068 (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: QmlypZFMdqPLx7zq6aiohd3zN7/LAlFcFFpOwSg57IhvecH85us8jfJH1mOjvmCz3Xie6Ava9tywz1/klqyH9PypUe3V0JmJRefcJMZ2PLE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR08MB7553 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