From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from AM0PR02CU008.outbound.protection.outlook.com (mail-westeuropeazon11023097.outbound.protection.outlook.com [52.101.72.97]) by lore.virtuozzo.com (Postfix) with ESMTPS id DC219803F6 for ; Tue, 17 Nov 2026 18:12:23 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=gxfJR8W8T/42caiP+ipWJo7QvmrLIEJmhv2gmrI9pVhZzLWczPnq7CoGN8MEy6nRBqCeWCeSEyBryXASnuUpbJ2dNbiyF8vQcnuUtVPY5lQxi5WrSpa2SIZNBjhc5iNYklGelLh18XGy93MlQ3hFZN5VUQkF9db+/zGFoTw+q4qaVK1gD/w6deajeqAgzeNlQI98ARK0NrRO6qWH2YrIEjBzuR4eOe1/qSLaqsJP80wHhyw26OEBSropCY1vDueH8USDE43O6OEZHE10te04suSolE4FGVP54qe6JED0x2hRlUKhC+q1VZm3qRhyEMFvnYPb6b5OzzN5rdl5tINS3A== 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=B0NE9NP9TQVf0AB/BF5OdoofNlb+cIQZMU5hPNJgOvU=; b=WYOM90+ac232tvO+9DNs1i032rwJpPWcWchVPh7YOHk6MUALOI/3MJlJzJ2iViXbs09+u6aqnllFu3Gz+awD4KW6o123VYxCLjcvk4tblpccTifWGBY+Up+39Oif0rkDJKJ9+dA356sscoWNAfAbjiBEZr6DbzMpNNdUqPTR5IDSLYuM+w9I7+6V9wVJZQEnuC3T3kpPNuUK4jvlgZlZVK8I2bpBHz1cr0aK1XxCmj8+7cQQp+hInqJi9u3I5zPbn35XWsatf+wzLgebwIWZUH2vrmaRU7MrTP2+VgfFyMWooYrWCJ8W46we4jNpSYUjBcP+yHP3mxo30EEHm5T4uA== 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=B0NE9NP9TQVf0AB/BF5OdoofNlb+cIQZMU5hPNJgOvU=; b=E+JkpSWRV+mUA40JhRH6/nFNsXvIprktXzYKWVNmSqIFgWnDtSmrK5NlsydgQtMmFn5B5BNM2QtlJ4zucSE/89PhBl6aHzjrb7rzFuMFFExuyhxVBedQMTRZslz+e55Zt3POe0b7D7v4i+23jpSW1Cr02b00T4VizrU95exh9hT1gZt10ouoinea4inEJTvKNgIfeSw0fdTrUnu2zhWGu1FgT4HJ6HphgLDePQkhOs0TUWMWNf3urCo4BrliK/k00RI1HRwUb62uB3S1on7Wc2vre2czF7HCfTDYysYxz39siPeHC8UuNeY5+BvgvcJwTihc6HNxR7YiaZR2+DjQbg== 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 GVXPR08MB11323.eurprd08.prod.outlook.com (2603:10a6:150:2c2::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.615.14; Tue, 17 Nov 2026 18:12:20 +0000 Received: from VI0PR08MB10656.eurprd08.prod.outlook.com ([fe80::4e37:b189:ddcd:3dd8]) by VI0PR08MB10656.eurprd08.prod.outlook.com ([fe80::4e37:b189:ddcd:3dd8%4]) with mapi id 15.21.0615.013; Tue, 17 Nov 2026 18:12:20 +0000 Message-ID: <04daead2-b57d-4fdd-88aa-ea58598f1f6a@virtuozzo.com> Date: Tue, 17 Nov 2026 20:12:20 +0200 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH hci-8.1 2/2] vhost-blk: pause the VM on an IO_ERROR uevent from dm-qcow2 #VSTOR-152175 To: Alexander Ivanov , andrey.zhadchenko@virtuozzo.com Cc: svt-core@virtuozzo.com References: <20261117105003.3082044-1-alexander.ivanov@virtuozzo.com> <20261117105003.3082044-3-alexander.ivanov@virtuozzo.com> Content-Language: en-US From: Andrey Drobyshev In-Reply-To: <20261117105003.3082044-3-alexander.ivanov@virtuozzo.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR4P281CA0377.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:f7::13) To VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI0PR08MB10656:EE_|GVXPR08MB11323:EE_ X-MS-Office365-Filtering-Correlation-Id: 95409c25-a061-4be3-e82f-08df44d65241 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|366016|1800799024|376014|10067099003|56012099006|4143699003|261026121527099003|261026140227099003|261028144727099003|261021135927099003|261021123027099003|261022075727099003|261021121427099003|261022105027099003|261102123227099003|261009223027099003|18002099003|5113699003|22082099003|6133799003; X-Microsoft-Antispam-Message-Info: De/yfJAzQUvPRcd34A4wdrZmVy3spAHexZqFdE8GaJXpQjF6ZD9lBFKJnM3IUAlpqpPezBPyJuvBWoAwjOc7BketoqdyqcCtB4Su5nreY6mUkcG9uE972HZtXgDGx86qEuCsxh6UEjp89OgZYgFD+z2J7PGMUM+hIcShsHhn4+CBhcaT/QMBXpfI2rTrU6FieavrfDur/6BwetV+9zzlRTiL0MvcE16IsMF7usK5PnN42qfR338LnjJt3PAy8OUN9+x8nlPBX8HJcNMU/nwE7vpQJmqMToCT+Jyan1+v2OBZN96WmQ0oZJ8wycIvHpR4kG3GH31yQ6mD4YZ4iJINMwoR03qZfAtL/VxFFidhYYOJnl/GH0W/yi5nsEcGya+Gu9pUKU0BvCZ6J1hQd13R9yHdj55UkFkHszm1MLxVA1mZ9fUbOUP4oR6kw/0fUHjnTtMv7DAayz+3V7e1yCA9vSyZRrsepF4+JgkLeJr84vvM/ZVvEUFpfWTFmT841le3e1U/hrqA8hhVTdN7z8D5xtWkW3HnHkvdTWlxZxWIUdrpXBI9WdmnYOXx4nvLEZiYOwQUpzoVvlY4LKpUgC9xCKC0AfyxfBupVoASzrqBpvOpVjfgxUvqyP77bulmN9wp 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)(366016)(1800799024)(376014)(10067099003)(56012099006)(4143699003)(261026121527099003)(261026140227099003)(261028144727099003)(261021135927099003)(261021123027099003)(261022075727099003)(261021121427099003)(261022105027099003)(261102123227099003)(261009223027099003)(18002099003)(5113699003)(22082099003)(6133799003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?VEt2L1BOTXduV3AwYWRwNUFZVjZXeEVmKzR4aXkvOVh6cjBPMExYdEFSYzZM?= =?utf-8?B?ME9vdG1RNkFTNWZ4U09GTm9qaXRld1BKSEFkU3JCUnhqcWU3QXNqZ0NyZWdR?= =?utf-8?B?UlBPVTllLzJIeVorODFQQU90OVkzTG9XQlF0dldQaHl3SWl6dU5PNWVIdnhq?= =?utf-8?B?eU01cEdFeXRWTGxUeEhzQ3lHSGYzc1BtYXVyYWV6MXdPSk9RWmsranFSYW0v?= =?utf-8?B?dEI5bUVzL0lydG9EeFVUSlVTUHFINjRsWFY1NEZGVWIzM3ROOWNwenp3Y0Yz?= =?utf-8?B?bVRZZ0Z3VGs2U0YzS3EyaFhlRWFCTC9kR295bzVrdFZkZlFOSllUZkRPTTZL?= =?utf-8?B?S25neGozSzFGTTduTjhRblVYSmxkRy9PVGNINERobFh5VDBYaEg3dVZjVU5G?= =?utf-8?B?VHIwMlo5KzFoZ0pnRnpZb2tITGdiNXZuaXc2TEJ2QktjMkQwTVRpbEw2Uzcw?= =?utf-8?B?Y0xJSDhiNk9tREJVRVhBMUZEOEcwKzdkVmhRVjlLT1Z6ajNWNE1LajJRSTRP?= =?utf-8?B?VzQveThFVTBnNVM5Nmo1MDh4a1plakNkQXR0WHNid09oK2t5OHo3dCtud3N4?= =?utf-8?B?eE81bHlrNWVsbjkwajFUSitCZ28rblpONkY1K2pWWVRlVGZVckp4ZlpUYlJL?= =?utf-8?B?eWR5WEwzMzgwSlNlU2VkdUliaTNNcHgvQ2hUSGFlRjJsOGtmQWtOc1JCZEtJ?= =?utf-8?B?TXlPV05ucUsxaldxMXlpbjdIQXNtZ2MySEdpZUZHZ1VLbDlhWFE0V3hsN1Fp?= =?utf-8?B?UHAwdXdSbGMyMkJxVjJpbWlDZTV3RzZFdzM2TXNXZkd3cDRPQmN1ejFsQTBY?= =?utf-8?B?N29Xa0hSSTV4WVlJTk5pV3JKaG1jMk04WnhMK1g1QXNMVnRoV3d1NzE2Z1BS?= =?utf-8?B?VitRb0NySTBGMkR5dHZESGhWaUk5U3RubGR5dC9PdTY0VVJIZ1NXVmpGcWtN?= =?utf-8?B?eGtsQ0hCNWtSS0pQZFBVbTZDRTFaZ2k2TnVHbzlBakU2NjB2VUZ0UDA3dVo1?= =?utf-8?B?RzZMKzliTDJXNWwvYXlNYjY3QmdMSjBmSHpCeFk5NVhKSjNFbmk2MHlkbG5n?= =?utf-8?B?Qm1WTWFab0k5RGJ1Y3N5UFR0YVVTVnpmTzBTQnJvRjNwbEFJZFFXNUd2OEhT?= =?utf-8?B?bUlZaGFKZmF4OEtONllpc1FsblBvSlZxdVVobm9mdjJIaUhJUWxCeHg4SnBN?= =?utf-8?B?SGhUV2VGOWRPYTVoTTJnVEtrcnFjK2ViZHhiVTQzTjhWcGZBY2tROFloR3dB?= =?utf-8?B?QU9mNmxsZjJwc0RkNUtGM0wvN0ZwWDZQWWNjN2lVR1pVZ3JxTi9Ja3RHWHpF?= =?utf-8?B?VGJJMGxkK2NxbEU5V2cyZ21YMDdEd1djckJmeUxiODNNbTQ1TVNib25CUzgr?= =?utf-8?B?c2tOMG1HQkJhOTh1TGwwZzd0MmJPdHkzOGxjdmpkdlNOVEtUc1dwWXhpRzRo?= =?utf-8?B?NnJvVmo4RlE0eTB2aHZibkIwQzBlR3pPdmNrUHQyTXNoVTRQY3F2eE9tK3d2?= =?utf-8?B?di80di9Eb29NT3NJbHBPdjdzYUVMRGJnMlM2N1NVbVBYUmdoTThZTVQzUzNs?= =?utf-8?B?Ri8zcmFUdFpWVDlLSjc4TGtZajZvRS9JVi9lbDJvbWlaQTJleVErYjV0Zy9x?= =?utf-8?B?RDNFRzQ0RWYrTmVKWk5qaWY5M1Q0U1ppN2h6NklzbC95SGpMcmNjaDh3d3Qv?= =?utf-8?B?SUNlOGdqdkMycFNVSXFtV0lEYTAwS2VqMVZYQ2RaaFVsVmszSmJCUUp3UWx5?= =?utf-8?B?ZUlwS1ZPNzNManZCVDFQN0ZLd2hmMGNkM1R4UVZ0aEk0NCsxOWJoWkdraGtX?= =?utf-8?B?QUVzVW90RFhUb2hqc0szZjlFcUdwYnUrWG9zbW5Hd1hXeFFQRXA3TzVaVzlW?= =?utf-8?B?OUJiS04xTVErWUJQUGFsT3dEZ2I3VGFVaE42MXRrSHp2c1ZLYlJ1WSs4c2dS?= =?utf-8?B?ZmpXQ1o2R1NNZ3EwZWRWaCt4YlluU2dEZ2NaV2NocGRwUFIvTXZ2ZEQxYm92?= =?utf-8?B?WWxOTXJuNmVjYXE0Snp1SCtiU09OZy9IYzIvd2hXK0pFbjg2RlpUNkJHUUw4?= =?utf-8?B?MC82VnRScTZJTDE2R0k0ZHlVTjZuNml4RjhNaUFGSTNGOWNmbEhLYWU3MHAw?= =?utf-8?B?YkpaRFdkYTBKY0p3OHRkeDlFYzFlWUVBZ095QktoYTZxa2ZEM2tvVXYyQ3Za?= =?utf-8?B?bU9TdW5QQjRwYmsycUg2SmE5VGRYY3dSRzk0VVNEcVlCbW1CVTk2WG9iZ3VM?= =?utf-8?B?UFBvYy9hdXdxQ0w4YTc5bzVKLzhUVXo1eXdaMGxLZ3JmdWlXRGl0bE8wTkZW?= =?utf-8?B?Z0VCcS9IbGZzNEZmZGhlR1hpM1RWNURyN0dYUWVvcDNjTzdPTmtKU0lZSjB6?= =?utf-8?Q?rUMe51s4swqCsdk4=3D?= X-Auto-Response-Suppress: DR, OOF, AutoReply X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 95409c25-a061-4be3-e82f-08df44d65241 X-MS-Exchange-CrossTenant-AuthSource: VI0PR08MB10656.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Nov 2026 18:12:20.4817 (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: qZ72swm8VGddCXbA7U893DoFwAXOu7ESdFsTEnh6GRjAfWP1UnCxti8aOYdLtd6CfqyAkuSreKdr8iBmRtmekF53TpkSP2b/zFcIcPD7Q1Q= X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR08MB11323 On 11/17/26 12:50 PM, Alexander Ivanov wrote: > vhost-blk completes requests to the guest in the kernel, so werror and > rerror had no effect: dm-qcow2 held the failed write under the enospc > or stop policy, but the VM kept running with the request stuck. > > dm-qcow2 reports a held request with a change uevent carrying > IO_ERROR=1, IO_ERROR_OP=read|write and IO_ERROR_ERRNO=. Parse it > on the uevent socket and, if the policy of the device says so, stop > the VM with the io-error reason and emit BLOCK_IO_ERROR, as the block > layer does for other devices. The device field is the id of the proxy, > which is the disk alias libvirt looks the disk up by. > > The VM stops with RUN_STATE_IO_ERROR, on which vhost-blk keeps running, > so the held requests survive the pause. libvirt resubmits them before > cont. dm-qcow2 repeats the event on every failed retry, so ignore it > unless the VM is running. > > Migration and savevm from IO_ERROR do not notify the VM state handlers, > so vhost-blk would keep running and its vring state would be saved > stale. The held requests cannot be migrated either, so block migration > until the VM runs again, and fail it in pre_save for a migration that > was already running when the error came. > > Reject the stop policy without the ueventfd property: without the > socket QEMU never learns about the held request. > > https://virtuozzo.atlassian.net/browse/VSTOR-152175 > > Signed-off-by: Alexander Ivanov > --- > hw/block/vhost-blk.c | 93 +++++++++++++++++++++++++++++++++-- > include/hw/virtio/vhost-blk.h | 2 + > 2 files changed, 92 insertions(+), 3 deletions(-) > > diff --git a/hw/block/vhost-blk.c b/hw/block/vhost-blk.c > index 354111a1b41..6775a561eab 100644 > --- a/hw/block/vhost-blk.c > +++ b/hw/block/vhost-blk.c > @@ -32,6 +32,7 @@ > #include "migration/blocker.h" > #include "migration/cpr.h" > #include "system/runstate.h" > +#include "qapi/qapi-events-block-core.h" > > static int vhost_blk_start(VirtIODevice *vdev) > { > @@ -205,6 +206,10 @@ static void vhost_blk_vm_state(void *opaque, bool running, RunState state) > vhost_blk_stop(vdev); > vhost_blk_reset(vdev); > } else if (state == RUN_STATE_RUNNING) { > + VHostBlk *s = VHOST_BLK(vdev); > + > + s->io_error_held = false; > + migrate_del_blocker(&s->io_error_blocker); > vhost_blk_start(vdev); > } > } > @@ -293,6 +298,45 @@ static void vhost_blk_block_cpr(VHostBlk *s) > } > } > > +static void vhost_blk_io_error(VHostBlk *s, bool is_read, int error) > +{ > + DeviceState *dev = DEVICE(s); > + DeviceState *proxy = dev->parent_bus ? dev->parent_bus->parent : NULL; > + BlockdevOnError on_err = is_read ? s->conf.conf.rerror > + : s->conf.conf.werror; > + g_autofree char *path = NULL; > + > + if (on_err != BLOCKDEV_ON_ERROR_STOP && > + (on_err != BLOCKDEV_ON_ERROR_ENOSPC || error != ENOSPC)) { > + return; > + } IIUC libvirt gets rerror/werror policies from XML, then sets them in dm-qcow2 table and provides to QEMU via conf settings. If so, they can't mismatch. Therefore: 1. Returning on this mismatch is wrong. This way requests stay parked in the kernel, nobody's told and libvirt never sends resubmit. 2. This mismatch shouldn't happen in the 1st place, so let's at least add warn_report() on it. > + > + /* dm-qcow2 repeats the event on every failed retry of a held request */ > + if (!runstate_is_running()) { > + return; > + } What if a VM is stopped for another reason (e.g. IO error on another disk)? We return here and don't set the migration blocker. Maybe instead return on: > if (!s->vhost_started || runstate_check(RUN_STATE_SUSPENDED)) > + > + path = object_get_canonical_path(OBJECT(dev)); > + > + s->io_error_held = true; > + if (!s->io_error_blocker) { > + error_setg(&s->io_error_blocker, > + "vhost-blk: '%s' has requests held in the kernel after " > + "an I/O error", path); > + migrate_add_blocker_internal(&s->io_error_blocker, NULL); > + } And then here after the mig blocker is already set, once again check: > if (!runstate_is_running()) { > return; > } So that we don't request stop of an already stopped VM. Andrey > + qemu_system_vmstop_request_prepare(); > + qapi_event_send_block_io_error(path, > + proxy && proxy->id ? proxy->id : "", > + NULL, > + is_read ? IO_OPERATION_TYPE_READ > + : IO_OPERATION_TYPE_WRITE, > + BLOCK_ERROR_ACTION_STOP, true, > + error == ENOSPC, strerror(error), 0, 0); > + qemu_system_vmstop_request(RUN_STATE_IO_ERROR); > +} > + > /* > * The uevent socket is created, bound and filtered by the management > * layer and passed to us via the "ueventfd" property. > @@ -310,6 +354,9 @@ static void vhost_blk_uevent_read(void *opaque) > bool action_change = false; > bool subsystem_block = false; > bool resize = false; > + bool io_error = false; > + bool io_error_read = false; > + int io_error_errno = EIO; > char *field; > char *end; > ssize_t len; > @@ -351,6 +398,17 @@ static void vhost_blk_uevent_read(void *opaque) > subsystem_block = true; > } else if (!strcmp(field, "RESIZE=1")) { > resize = true; > + } else if (!strcmp(field, "IO_ERROR=1")) { > + io_error = true; > + } else if (!strcmp(field, "IO_ERROR_OP=read")) { > + io_error_read = true; > + } else if (g_str_has_prefix(field, "IO_ERROR_ERRNO=")) { > + int value; > + > + if (!qemu_strtoi(field + strlen("IO_ERROR_ERRNO="), NULL, 10, > + &value) && value > 0) { > + io_error_errno = value; > + } > } else if (g_str_has_prefix(field, "MAJOR=")) { > uint64_t value; > > @@ -373,11 +431,18 @@ static void vhost_blk_uevent_read(void *opaque) > field += field_len + 1; > } > > - if (action_change && subsystem_block && resize && > - event_major == major(s->backend_rdev) && > - event_minor == minor(s->backend_rdev)) { > + if (!action_change || !subsystem_block || > + event_major != major(s->backend_rdev) || > + event_minor != minor(s->backend_rdev)) { > + continue; > + } > + > + if (resize) { > qemu_bh_schedule(s->resize_bh); > } > + if (io_error) { > + vhost_blk_io_error(s, io_error_read, io_error_errno); > + } > } > } > > @@ -635,6 +700,14 @@ static void vhost_blk_device_realize(DeviceState *dev, Error **errp) > return; > } > > + if (!conf->ueventfd && > + (conf->conf.werror == BLOCKDEV_ON_ERROR_STOP || > + conf->conf.rerror == BLOCKDEV_ON_ERROR_STOP)) { > + error_setg(errp, "vhost-blk: 'stop' error policy requires the " > + "'ueventfd' property"); > + return; > + } > + > if (!vhost_blk_open_backend(s, errp)) { > return; > } > @@ -709,6 +782,7 @@ static void vhost_blk_device_unrealize(DeviceState *dev) > VHostBlk *s = VHOST_BLK(dev); > > vhost_blk_uevent_detach(s); > + migrate_del_blocker(&s->io_error_blocker); > qemu_del_vm_change_state_handler(s->mighand); > vhost_blk_set_status(vdev, 0); > vhost_dev_cleanup(&s->dev); > @@ -816,10 +890,23 @@ static const Property vhost_blk_properties[] = { > DEFINE_BLOCK_ERROR_PROPERTIES(VHostBlk, conf.conf), > }; > > +static int vhost_blk_pre_save(void *opaque) > +{ > + VHostBlk *s = opaque; > + > + if (s->io_error_held) { > + error_report("vhost-blk: requests are held in the kernel after an " > + "I/O error, resubmit or fail them first"); > + return -EBUSY; > + } > + return 0; > +} > + > static const VMStateDescription vmstate_vhost_blk = { > .name = "vhost-blk", > .minimum_version_id = 1, > .version_id = 1, > + .pre_save = vhost_blk_pre_save, > .fields = (VMStateField[]) { > VMSTATE_VIRTIO_DEVICE, > VMSTATE_END_OF_LIST() > diff --git a/include/hw/virtio/vhost-blk.h b/include/hw/virtio/vhost-blk.h > index 059f1ebc701..935b35f6d6b 100644 > --- a/include/hw/virtio/vhost-blk.h > +++ b/include/hw/virtio/vhost-blk.h > @@ -48,6 +48,8 @@ typedef struct VHostBlk { > uint64_t backend_rdev; > QEMUBH *resize_bh; > Error *cpr_blocker; > + Error *io_error_blocker; > + bool io_error_held; > } VHostBlk; > > #endif