Commit f9e8fda4 authored by Markus Armbruster's avatar Markus Armbruster Committed by Kevin Wolf
Browse files

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: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 07b70bfb

hw/ide/piix.c

+1 −2
Original line number Diff line number Diff line
@@ -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);