diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2010-06-01 19:12:19 -0300 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2010-06-22 14:38:01 +0200 |
| commit | 3b5276b5ec52f461f23e62d4560686f10d27605e (patch) | |
| tree | 48268dacc7f26118741a843c167fb8e6de7c1451 /hw/virtio-9p-debug.c | |
| parent | 1e297c323590d3deae46e566956cc4351e2aa5da (diff) | |
| download | focaccia-qemu-3b5276b5ec52f461f23e62d4560686f10d27605e.tar.gz focaccia-qemu-3b5276b5ec52f461f23e62d4560686f10d27605e.zip | |
monitor: allow device to be ejected if no disk is inserted
This changes the monitor eject_device() function to not check for bdrv_is_inserted(). Example run where the bug manifests itself: (output of 'info block' is stripped to include only the CD-ROM device) (qemu) info block ide1-cd0: type=cdrom removable=1 locked=0 [not inserted] (qemu) change ide1-cd0 /dev/cdrom host_cdrom (qemu) info block ide1-cd0: type=cdrom removable=1 locked=0 file=/dev/cdrom ro=1 drv=host_cdrom encrypted=0 (qemu) eject ide1-cd0 (qemu) info block ide1-cd0: type=cdrom removable=1 locked=0 file=/dev/cdrom ro=1 drv=host_cdrom encrypted=0 # at this point, a disk was inserted on the host CD-ROM drive (qemu) info block ide1-cd0: type=cdrom removable=1 locked=0 file=/dev/cdrom ro=1 drv=host_cdrom encrypted=0 (qemu) eject ide1-cd0 (qemu) info block ide1-cd0: type=cdrom removable=1 locked=0 [not inserted] (qemu) The first eject command didn't work because the is_inserted() check failed. I have no clue why the code had the is_inserted() check, as it doesn't matter if there is a disk present at the host drive, when the user wants the virtual device to be disconnected from the host device. The is_inserted() check has another side effect: a memory leak if the "change" command is used multiple times, as do_change() calls eject_device() before re-opening the block device, but bdrv_close() is never called. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw/virtio-9p-debug.c')
0 files changed, 0 insertions, 0 deletions