From: Stefan Hajnoczi Date: Wed, 5 Jun 2013 08:33:14 +0000 (+0200) Subject: blockdev: reset werror/rerror on drive_del X-Git-Tag: v1.5.1~29 X-Git-Url: https://git.proxmox.com/?p=qemu.git;a=commitdiff_plain;h=58101748657072985a6a0e23f426be5426fd76f7 blockdev: reset werror/rerror on drive_del Paolo Bonzini suggested the following test case: 1. Launch a guest and wait at the GRUB boot menu: qemu-system-x86_64 -enable-kvm -m 1024 \ -drive if=none,cache=none,file=test.img,id=foo,werror=stop,rerror=stop -device virtio-blk-pci,drive=foo,id=virtio0,addr=4 2. Hot unplug the device: (qemu) drive_del foo 3. Select the first boot menu entry Without this patch the guest pauses due to ENOMEDIUM. The guest is stuck in a continuous pause loop since the I/O request is retried and fails immediately again when the guest is resumed. With this patch the error is reported to the guest. Note that this scenario actually happens sometimes during libvirt disk hot unplug, where device_del is followed by drive_del. I/O may still be submitted to the drive after drive_del if the guest does not process the PCI hot unplug notification. Reported-by: Dafna Ron Signed-off-by: Stefan Hajnoczi Reviewed-by: Kevin Wolf (cherry picked from commit 293c51a6ee369228633a8428ab689f14c045ff98) Signed-off-by: Michael Roth --- diff --git a/blockdev.c b/blockdev.c index 7c9d8dd0a..625d04123 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1108,6 +1108,10 @@ int do_drive_del(Monitor *mon, const QDict *qdict, QObject **ret_data) */ if (bdrv_get_attached_dev(bs)) { bdrv_make_anon(bs); + + /* Further I/O must not pause the guest */ + bdrv_set_on_error(bs, BLOCKDEV_ON_ERROR_REPORT, + BLOCKDEV_ON_ERROR_REPORT); } else { drive_uninit(drive_get_by_blockdev(bs)); } diff --git a/hmp-commands.hx b/hmp-commands.hx index 9cea4151b..4f5a3fd7d 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -185,6 +185,8 @@ Remove host block device. The result is that guest generated IO is no longer submitted against the host device underlying the disk. Once a drive has been deleted, the QEMU Block layer returns -EIO which results in IO errors in the guest for applications that are reading/writing to the device. +These errors are always reported to the guest, regardless of the drive's error +actions (drive options rerror, werror). ETEXI {