[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 36/45] block: Drop BlockDriverState member remova
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v2 36/45] block: Drop BlockDriverState member removable |
Date: |
Wed, 3 Aug 2011 15:08:15 +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 87a3ef3..b488b21 100644
--- a/block.c
+++ b/block.c
@@ -1574,14 +1574,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 fd8f1d1..6b11be5 100644
--- a/block.h
+++ b/block.h
@@ -207,7 +207,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 a271a07..9dad1c0 100644
--- a/block_int.h
+++ b/block_int.h
@@ -154,7 +154,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 bcddfc0..6d921ea 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 22a2dc7..c82d8a1 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -1838,7 +1838,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 a30063a..a7a70bd 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -1272,7 +1272,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);
if (scsi_type == TYPE_ROM) {
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 7b0026e..8cbbdc9 100644
--- a/hw/scsi-generic.c
+++ b/hw/scsi-generic.c
@@ -534,7 +534,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.6
- [Qemu-devel] [PATCH v2 34/45] spitz tosa: Simplify "drive is suitable for microdrive" test, (continued)
- [Qemu-devel] [PATCH v2 34/45] spitz tosa: Simplify "drive is suitable for microdrive" test, Markus Armbruster, 2011/08/03
- [Qemu-devel] [PATCH v2 42/45] block: Reset buffer alignment on detach, Markus Armbruster, 2011/08/03
- [Qemu-devel] [PATCH v2 22/45] ide/atapi: Avoid physical/virtual tray state mismatch, Markus Armbruster, 2011/08/03
- [Qemu-devel] [PATCH v2 26/45] ide/atapi: Preserve tray state on migration, Markus Armbruster, 2011/08/03
- [Qemu-devel] [PATCH v2 39/45] hw: Trim superfluous #include "block_int.h", Markus Armbruster, 2011/08/03
- [Qemu-devel] [PATCH v2 32/45] savevm: Include writable devices with removable media, Markus Armbruster, 2011/08/03
- [Qemu-devel] [PATCH v2 29/45] block: Leave tracking media change to device models, Markus Armbruster, 2011/08/03
- [Qemu-devel] [PATCH v2 20/45] ide: Provide IDEDeviceInfo method exit(), Markus Armbruster, 2011/08/03
- [Qemu-devel] [PATCH v2 36/45] block: Drop BlockDriverState member removable,
Markus Armbruster <=
- [Qemu-devel] [PATCH v2 45/45] ide/atapi scsi-disk: Make monitor eject -f, then change work, Markus Armbruster, 2011/08/03
- [Qemu-devel] [PATCH v2 41/45] block: New bdrv_set_buffer_alignment(), Markus Armbruster, 2011/08/03
- [Qemu-devel] [PATCH v2 30/45] fdc: Make media change detection more robust, Markus Armbruster, 2011/08/03
- [Qemu-devel] [PATCH v2 44/45] block: New change_media_cb() parameter load, Markus Armbruster, 2011/08/03
- [Qemu-devel] [PATCH v2 27/45] scsi-disk: Preserve tray state on migration, Markus Armbruster, 2011/08/03
- [Qemu-devel] [PATCH v2 28/45] block/raw: Fix to forward method bdrv_media_changed(), Markus Armbruster, 2011/08/03
- [Qemu-devel] [PATCH v2 38/45] block: Move BlockConf & friends from block_int.h to block.h, Markus Armbruster, 2011/08/03