Patchwork [2/5] scsi-disk: report resized disk via sense codes

login
register
mail settings
Submitter Paolo Bonzini
Date July 16, 2012, 2:25 p.m.
Message ID <1342448756-7582-3-git-send-email-pbonzini@redhat.com>
Download mbox | patch
Permalink /patch/171216/
State New
Headers show

Comments

Paolo Bonzini - July 16, 2012, 2:25 p.m.
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>
---
 hw/scsi-bus.c  |    5 +++++
 hw/scsi-disk.c |   15 +++++++++++----
 hw/scsi.h      |    2 ++
 3 files changed, 18 insertions(+), 4 deletions(-)
Kevin Wolf - July 17, 2012, 11:14 a.m.
Am 16.07.2012 16:25, schrieb Paolo Bonzini:
> 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>
> ---
>  hw/scsi-bus.c  |    5 +++++
>  hw/scsi-disk.c |   15 +++++++++++----
>  hw/scsi.h      |    2 ++
>  3 files changed, 18 insertions(+), 4 deletions(-)
> 
> diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c
> index 8b961f2..2547c50 100644
> --- a/hw/scsi-bus.c
> +++ b/hw/scsi-bus.c
> @@ -1161,6 +1161,11 @@ const struct SCSISense sense_code_LUN_FAILURE = {
>      .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 */
>  const struct SCSISense sense_code_RESET = {
>      .key = UNIT_ATTENTION, .asc = 0x29, .ascq = 0x00
> diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
> index 42bae3b..0905446 100644
> --- a/hw/scsi-disk.c
> +++ b/hw/scsi-disk.c
> @@ -1863,6 +1863,13 @@ static void scsi_destroy(SCSIDevice *dev)
>      blockdev_mark_auto_del(s->qdev.conf.bs);
>  }
>  
> +static void scsi_disk_resize_cb(void *opaque)
> +{
> +    SCSIDiskState *s = opaque;
> +
> +    scsi_device_set_ua(&s->qdev, SENSE_CODE(CAPACITY_CHANGED));
> +}
> +
>  static void scsi_cd_change_media_cb(void *opaque, bool load)
>  {
>      SCSIDiskState *s = opaque;
> @@ -1904,11 +1911,13 @@ static bool scsi_cd_is_medium_locked(void *opaque)
>      return ((SCSIDiskState *)opaque)->tray_locked;
>  }
>  
> -static const BlockDevOps scsi_cd_block_ops = {
> +static const BlockDevOps scsi_disk_block_ops = {
>      .change_media_cb = scsi_cd_change_media_cb,
>      .eject_request_cb = scsi_cd_eject_request_cb,
>      .is_tray_open = scsi_cd_is_tray_open,
>      .is_medium_locked = scsi_cd_is_medium_locked,
> +
> +    .resize_cb = scsi_disk_resize_cb,
>  };
>  
>  static void scsi_disk_unit_attention_reported(SCSIDevice *dev)
> @@ -1956,9 +1965,7 @@ static int scsi_initfn(SCSIDevice *dev)
>          return -1;
>      }
>  
> -    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_block_ops, s);

Are you aware of this code?

bool bdrv_dev_has_removable_media(BlockDriverState *bs)
{
    return !bs->dev || (bs->dev_ops && bs->dev_ops->change_media_cb);
}

This means that now all SCSI disks have removable media from the
monitor's point of view.

Kevin
Paolo Bonzini - July 17, 2012, 11:15 a.m.
Il 17/07/2012 13:14, Kevin Wolf ha scritto:
>> > -    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_block_ops, s);
> Are you aware of this code?
> 
> bool bdrv_dev_has_removable_media(BlockDriverState *bs)
> {
>     return !bs->dev || (bs->dev_ops && bs->dev_ops->change_media_cb);
> }
> 
> This means that now all SCSI disks have removable media from the
> monitor's point of view.

I remembered there was something similar but I couldn't find it.  I'll
rework the patch to have two separate sets of dev_ops.

Thanks very much!

Paolo

Patch

diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c
index 8b961f2..2547c50 100644
--- a/hw/scsi-bus.c
+++ b/hw/scsi-bus.c
@@ -1161,6 +1161,11 @@  const struct SCSISense sense_code_LUN_FAILURE = {
     .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 */
 const struct SCSISense sense_code_RESET = {
     .key = UNIT_ATTENTION, .asc = 0x29, .ascq = 0x00
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index 42bae3b..0905446 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -1863,6 +1863,13 @@  static void scsi_destroy(SCSIDevice *dev)
     blockdev_mark_auto_del(s->qdev.conf.bs);
 }
 
+static void scsi_disk_resize_cb(void *opaque)
+{
+    SCSIDiskState *s = opaque;
+
+    scsi_device_set_ua(&s->qdev, SENSE_CODE(CAPACITY_CHANGED));
+}
+
 static void scsi_cd_change_media_cb(void *opaque, bool load)
 {
     SCSIDiskState *s = opaque;
@@ -1904,11 +1911,13 @@  static bool scsi_cd_is_medium_locked(void *opaque)
     return ((SCSIDiskState *)opaque)->tray_locked;
 }
 
-static const BlockDevOps scsi_cd_block_ops = {
+static const BlockDevOps scsi_disk_block_ops = {
     .change_media_cb = scsi_cd_change_media_cb,
     .eject_request_cb = scsi_cd_eject_request_cb,
     .is_tray_open = scsi_cd_is_tray_open,
     .is_medium_locked = scsi_cd_is_medium_locked,
+
+    .resize_cb = scsi_disk_resize_cb,
 };
 
 static void scsi_disk_unit_attention_reported(SCSIDevice *dev)
@@ -1956,9 +1965,7 @@  static int scsi_initfn(SCSIDevice *dev)
         return -1;
     }
 
-    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_block_ops, s);
     bdrv_set_buffer_alignment(s->qdev.conf.bs, s->qdev.blocksize);
 
     bdrv_iostatus_enable(s->qdev.conf.bs);
diff --git a/hw/scsi.h b/hw/scsi.h
index 47c3b9c..e901350 100644
--- a/hw/scsi.h
+++ b/hw/scsi.h
@@ -198,6 +198,8 @@  extern const struct SCSISense sense_code_IO_ERROR;
 extern const struct SCSISense sense_code_I_T_NEXUS_LOSS;
 /* Command aborted, Logical Unit 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 */
 extern const struct SCSISense sense_code_UNIT_ATTENTION_NO_MEDIUM;
 /* Unit attention, Power on, reset or bus device reset occurred */