[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 46/55] block: Drop BlockDriverState member removable
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 46/55] block: Drop BlockDriverState member removable |
Date: |
Wed, 20 Jul 2011 18:24:20 +0200 |
It's a confused mess (see previous commit). No users remain.
Signed-off-by: Markus Armbruster <address@hidden>
---
block.c | 8 --------
block.h | 1 -
block_int.h | 1 -
blockdev.c | 5 -----
hw/fdc.c | 1 -
hw/ide/core.c | 1 -
hw/scsi-disk.c | 1 -
hw/scsi-generic.c | 1 -
hw/virtio-blk.c | 1 -
9 files changed, 0 insertions(+), 20 deletions(-)
diff --git a/block.c b/block.c
index b394f17..925861f 100644
--- a/block.c
+++ b/block.c
@@ -1483,14 +1483,6 @@ BlockErrorAction bdrv_get_on_error(BlockDriverState *bs,
int is_read)
return is_read ? bs->on_read_error : bs->on_write_error;
}
-void bdrv_set_removable(BlockDriverState *bs, int removable)
-{
- bs->removable = removable;
- if (removable && bs == bs_snapshots) {
- bs_snapshots = NULL;
- }
-}
-
int bdrv_is_read_only(BlockDriverState *bs)
{
return bs->read_only;
diff --git a/block.h b/block.h
index f6fa3d0..b56dae6 100644
--- a/block.h
+++ b/block.h
@@ -208,7 +208,6 @@ int bdrv_get_translation_hint(BlockDriverState *bs);
void bdrv_set_on_error(BlockDriverState *bs, BlockErrorAction on_read_error,
BlockErrorAction on_write_error);
BlockErrorAction bdrv_get_on_error(BlockDriverState *bs, int is_read);
-void bdrv_set_removable(BlockDriverState *bs, int removable);
int bdrv_is_read_only(BlockDriverState *bs);
int bdrv_is_sg(BlockDriverState *bs);
int bdrv_enable_write_cache(BlockDriverState *bs);
diff --git a/block_int.h b/block_int.h
index d8688b8..4bc91cb 100644
--- a/block_int.h
+++ b/block_int.h
@@ -146,7 +146,6 @@ struct BlockDriverState {
int read_only; /* if true, the media is read only */
int keep_read_only; /* if true, the media was requested to stay read only
*/
int open_flags; /* flags used to open the file, re-used for re-open */
- int removable; /* if true, the media can be removed */
int encrypted; /* if true, the media is encrypted */
int valid_key; /* if true, a valid encryption key has been set */
int sg; /* if true, the device is a /dev/sg* */
diff --git a/blockdev.c b/blockdev.c
index 06a82d3..9284afd 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -482,17 +482,12 @@ DriveInfo *drive_init(QemuOpts *opts, int default_to_scsi)
}
break;
case MEDIA_CDROM:
- bdrv_set_removable(dinfo->bdrv, 1);
dinfo->media_cd = 1;
break;
}
break;
case IF_SD:
- /* FIXME: This isn't really a floppy, but it's a reasonable
- approximation. */
case IF_FLOPPY:
- bdrv_set_removable(dinfo->bdrv, 1);
- break;
case IF_PFLASH:
case IF_MTD:
break;
diff --git a/hw/fdc.c b/hw/fdc.c
index 6854e15..debcd89 100644
--- a/hw/fdc.c
+++ b/hw/fdc.c
@@ -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 90ad497..2bde2b8 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -1844,7 +1844,6 @@ int ide_init_drive(IDEState *s, BlockDriverState *bs,
IDEDriveKind kind,
}
ide_reset(s);
- bdrv_set_removable(bs, s->drive_kind == IDE_CD);
if (s->drive_kind == IDE_CD) {
bdrv_lock_medium(bs, s->tray_locked);
bdrv_eject(bs, s->tray_open);
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index ae194c5..f36f529 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -1339,7 +1339,6 @@ static int scsi_initfn(SCSIDevice *dev, SCSIDriveKind
kind)
s->qdev.type = TYPE_DISK;
qemu_add_vm_change_state_handler(scsi_dma_restart_cb, s);
- bdrv_set_removable(s->bs, kind == SCSI_CD);
if (kind == SCSI_CD) {
bdrv_lock_medium(s->bs, s->tray_locked);
bdrv_eject(s->bs, s->tray_open);
diff --git a/hw/scsi-generic.c b/hw/scsi-generic.c
index 8e59c7e..24ca9ff 100644
--- a/hw/scsi-generic.c
+++ b/hw/scsi-generic.c
@@ -533,7 +533,6 @@ static int scsi_generic_initfn(SCSIDevice *dev)
DPRINTF("block size %d\n", s->qdev.blocksize);
s->driver_status = 0;
memset(s->sensebuf, 0, sizeof(s->sensebuf));
- bdrv_set_removable(s->bs, 0);
return 0;
}
diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c
index dc0b692..4ed1975 100644
--- a/hw/virtio-blk.c
+++ b/hw/virtio-blk.c
@@ -583,7 +583,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;
--
1.7.2.3
- [Qemu-devel] [PATCH 54/55] block: New change_media_cb() parameter load, (continued)
- [Qemu-devel] [PATCH 54/55] block: New change_media_cb() parameter load, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 55/55] ide/atapi scsi-disk: Make monitor eject -f, then change work, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 25/55] ide/atapi: Switch from BlockDriverState's locked to own tray_locked, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 44/55] spitz tosa: Simplify "drive is suitable for microdrive" test, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 43/55] savevm: Include writable devices with removable media, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 29/55] block: Drop medium lock tracking, ask device models instead, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 46/55] block: Drop BlockDriverState member removable,
Markus Armbruster <=
- [Qemu-devel] [PATCH 22/55] block: Drop tray status tracking, no longer used, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 28/55] block: Leave enforcing tray lock to device models, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 47/55] block: Move BlockConf & friends from block_int.h to block.h, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 48/55] hw: Trim superfluous #include "block_int.h", Markus Armbruster, 2011/07/20