mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scsi-disk: report resized disk via sense codes

Browse Source 
Linux will not use these, but a very similar mechanism will be used to
report the condition via virtio-scsi events.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2012-07-16 14:07:55 +02:00
parent e48e84ea80
commit aaebacef0a
3 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/scsi-bus.c
View File

@ -1161,6 +1161,11 @@ const struct SCSISense sense_code_LUN_FAILURE = {
.key = ABORTED_COMMAND, .asc = 0x3e, .ascq = 0x01 .key = ABORTED_COMMAND, .asc = 0x3e, .ascq = 0x01
}; };
/* Unit attention, Capacity data has changed */
const struct SCSISense sense_code_CAPACITY_CHANGED = {
.key = UNIT_ATTENTION, .asc = 0x2a, .ascq = 0x09
};
/* Unit attention, Power on, reset or bus device reset occurred */ /* Unit attention, Power on, reset or bus device reset occurred */
const struct SCSISense sense_code_RESET = { const struct SCSISense sense_code_RESET = {
.key = UNIT_ATTENTION, .asc = 0x29, .ascq = 0x00 .key = UNIT_ATTENTION, .asc = 0x29, .ascq = 0x00

24
hw/scsi-disk.c
View File

@ -1860,6 +1860,18 @@ static void scsi_destroy(SCSIDevice *dev)
blockdev_mark_auto_del(s->qdev.conf.bs); blockdev_mark_auto_del(s->qdev.conf.bs);
} }
static void scsi_disk_resize_cb(void *opaque)
{
SCSIDiskState *s = opaque;
/* SPC lists this sense code as available only for
* direct-access devices.
*/
if (s->qdev.type == TYPE_DISK) {
scsi_device_set_ua(&s->qdev, SENSE_CODE(CAPACITY_CHANGED));
}
}
static void scsi_cd_change_media_cb(void *opaque, bool load) static void scsi_cd_change_media_cb(void *opaque, bool load)
{ {
SCSIDiskState *s = opaque; SCSIDiskState *s = opaque;
@ -1901,11 +1913,17 @@ static bool scsi_cd_is_medium_locked(void *opaque)
return ((SCSIDiskState *)opaque)->tray_locked; return ((SCSIDiskState *)opaque)->tray_locked;
} }
static const BlockDevOps scsi_cd_block_ops = { static const BlockDevOps scsi_disk_removable_block_ops = {
.change_media_cb = scsi_cd_change_media_cb, .change_media_cb = scsi_cd_change_media_cb,
.eject_request_cb = scsi_cd_eject_request_cb, .eject_request_cb = scsi_cd_eject_request_cb,
.is_tray_open = scsi_cd_is_tray_open, .is_tray_open = scsi_cd_is_tray_open,
.is_medium_locked = scsi_cd_is_medium_locked, .is_medium_locked = scsi_cd_is_medium_locked,
.resize_cb = scsi_disk_resize_cb,
};
static const BlockDevOps scsi_disk_block_ops = {
.resize_cb = scsi_disk_resize_cb,
}; };
static void scsi_disk_unit_attention_reported(SCSIDevice *dev) static void scsi_disk_unit_attention_reported(SCSIDevice *dev)
@ -1950,7 +1968,9 @@ static int scsi_initfn(SCSIDevice *dev)
} }
if (s->features & (1 << SCSI_DISK_F_REMOVABLE)) { if (s->features & (1 << SCSI_DISK_F_REMOVABLE)) {
bdrv_set_dev_ops(s->qdev.conf.bs, &scsi_cd_block_ops, s); bdrv_set_dev_ops(s->qdev.conf.bs, &scsi_disk_removable_block_ops, s);
} else {
bdrv_set_dev_ops(s->qdev.conf.bs, &scsi_disk_block_ops, s);
} }
bdrv_set_buffer_alignment(s->qdev.conf.bs, s->qdev.blocksize); bdrv_set_buffer_alignment(s->qdev.conf.bs, s->qdev.blocksize);

2
hw/scsi.h
View File

@ -200,6 +200,8 @@ extern const struct SCSISense sense_code_IO_ERROR;
extern const struct SCSISense sense_code_I_T_NEXUS_LOSS; extern const struct SCSISense sense_code_I_T_NEXUS_LOSS;
/* Command aborted, Logical Unit failure */ /* Command aborted, Logical Unit failure */
extern const struct SCSISense sense_code_LUN_FAILURE; extern const struct SCSISense sense_code_LUN_FAILURE;
/* LUN not ready, Capacity data has changed */
extern const struct SCSISense sense_code_CAPACITY_CHANGED;
/* LUN not ready, Medium not present */ /* LUN not ready, Medium not present */
extern const struct SCSISense sense_code_UNIT_ATTENTION_NO_MEDIUM; extern const struct SCSISense sense_code_UNIT_ATTENTION_NO_MEDIUM;
/* Unit attention, Power on, reset or bus device reset occurred */ /* Unit attention, Power on, reset or bus device reset occurred */