diff options
| author | Markus Armbruster <armbru@redhat.com> | 2011-09-06 18:58:52 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2011-09-12 15:17:21 +0200 |
| commit | 9e6a4c9177bc95aa04438458d75442e80db9ad33 (patch) | |
| tree | eee4af4845c084f5a78fe0cea533565b9c85198f /hw | |
| parent | 2c6942fa7b332a95286071b92d233853e1000948 (diff) | |
| download | qemu-9e6a4c9177bc95aa04438458d75442e80db9ad33.zip qemu-9e6a4c9177bc95aa04438458d75442e80db9ad33.tar.gz qemu-9e6a4c9177bc95aa04438458d75442e80db9ad33.tar.bz2 | |
block: Drop BlockDriverState member removable
It's a confused mess (see previous commit). No users remain.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/fdc.c | 1 | ||||
| -rw-r--r-- | hw/ide/core.c | 1 | ||||
| -rw-r--r-- | hw/scsi-disk.c | 1 | ||||
| -rw-r--r-- | hw/scsi-generic.c | 1 | ||||
| -rw-r--r-- | hw/virtio-blk.c | 1 |
5 files changed, 0 insertions, 5 deletions
@@ -1813,7 +1813,6 @@ static int fdctrl_connect_drives(FDCtrl *fdctrl) fd_revalidate(drive); if (drive->bs) { drive->media_changed = 1; - bdrv_set_removable(drive->bs, 1); bdrv_set_dev_ops(drive->bs, &fdctrl_block_ops, drive); } } diff --git a/hw/ide/core.c b/hw/ide/core.c index 18d3c62..716addc 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -1864,7 +1864,6 @@ int ide_init_drive(IDEState *s, BlockDriverState *bs, IDEDriveKind kind, } ide_reset(s); - bdrv_set_removable(bs, s->drive_kind == IDE_CD); return 0; } diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index d6e838c..0f0cddc 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -1233,7 +1233,6 @@ static int scsi_initfn(SCSIDevice *dev, uint8_t scsi_type) s->qdev.type = scsi_type; qemu_add_vm_change_state_handler(scsi_dma_restart_cb, s); - bdrv_set_removable(s->bs, scsi_type == TYPE_ROM); add_boot_device_path(s->qdev.conf.bootindex, &dev->qdev, ",0"); return 0; } diff --git a/hw/scsi-generic.c b/hw/scsi-generic.c index cb5d4f1..5ce01af 100644 --- a/hw/scsi-generic.c +++ b/hw/scsi-generic.c @@ -450,7 +450,6 @@ static int scsi_generic_initfn(SCSIDevice *dev) } } DPRINTF("block size %d\n", s->qdev.blocksize); - bdrv_set_removable(s->bs, 0); return 0; } diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c index d5d4757..6d1a7cf 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -599,7 +599,6 @@ VirtIODevice *virtio_blk_init(DeviceState *dev, BlockConf *conf, s->qdev = dev; register_savevm(dev, "virtio-blk", virtio_blk_id++, 2, virtio_blk_save, virtio_blk_load, s); - bdrv_set_removable(s->bs, 0); bdrv_set_dev_ops(s->bs, &virtio_block_ops, s); s->bs->buffer_alignment = conf->logical_block_size; |