diff options
| author | Markus Armbruster <armbru@redhat.com> | 2011-08-03 15:08:12 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2011-09-06 11:24:07 +0200 |
| commit | f9e8fda4796c0e8aebfc1e7ddf9bed6865adab02 (patch) | |
| tree | 64e9c308930a309811802b4fa9173774a4f82799 /hw/ide/piix.c | |
| parent | 07b70bfbb3f3aea9ce7a3a1da78cbfa8ae6bbce6 (diff) | |
| download | qemu-f9e8fda4796c0e8aebfc1e7ddf9bed6865adab02.zip qemu-f9e8fda4796c0e8aebfc1e7ddf9bed6865adab02.tar.gz qemu-f9e8fda4796c0e8aebfc1e7ddf9bed6865adab02.tar.bz2 | |
xen: Clean up pci_piix3_xen_ide_unplug()'s test for "not a CD"
pci_piix3_xen_ide_unplug() unplugs only disks, not CD-ROMs. It peeks
into the DriveInfo's BlockDriverState to distinguish between the two.
Unclean; use DriveInfo member media_cd, like xen_config_dev_blk().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw/ide/piix.c')
| -rw-r--r-- | hw/ide/piix.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/ide/piix.c b/hw/ide/piix.c index b9cdcd6..88d3181 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -27,7 +27,6 @@ #include <hw/pci.h> #include <hw/isa.h> #include "block.h" -#include "block_int.h" #include "sysemu.h" #include "dma.h" @@ -176,7 +175,7 @@ static int pci_piix3_xen_ide_unplug(DeviceState *dev) for (; i < 3; i++) { di = drive_get_by_index(IF_IDE, i); - if (di != NULL && di->bdrv != NULL && !di->bdrv->removable) { + if (di != NULL && !di->media_cd) { DeviceState *ds = bdrv_get_attached_dev(di->bdrv); if (ds) { bdrv_detach_dev(di->bdrv, ds); |