Patchwork [v2,2/2] scsi-disk: scsi-block device for scsi pass-through should not be removable

login
register
mail settings
Submitter Pavel Hrdina
Date May 29, 2013, 1:47 p.m.
Message ID <bb86382a12b372ed883eaed6d1b097029e1847c1.1369834642.git.phrdina@redhat.com>
Download mbox | patch
Permalink /patch/247268/
State New
Headers show

Comments

Pavel Hrdina - May 29, 2013, 1:47 p.m.
This patch adds a new SCSI_DISK_F_NO_REMOVABLE_DEVOPS feature. By this
feature we can set that the scsi-block (scsi pass-through) device will still
be removable from the guest side, but from monitor it cannot be removed.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
---
changes from v1:
    - renamed the SCSI_DISK_F_MONITOR_NOT_REMOVABLE
      into SCSI_DISK_F_NO_REMOVABLE_DEVOPS
    - set this bit directli in scsi_block_initfn

 hw/scsi/scsi-disk.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)
Paolo Bonzini - May 29, 2013, 2:24 p.m.
Il 29/05/2013 15:47, Pavel Hrdina ha scritto:
> This patch adds a new SCSI_DISK_F_NO_REMOVABLE_DEVOPS feature. By this
> feature we can set that the scsi-block (scsi pass-through) device will still
> be removable from the guest side, but from monitor it cannot be removed.
> 
> Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
> ---
> changes from v1:
>     - renamed the SCSI_DISK_F_MONITOR_NOT_REMOVABLE
>       into SCSI_DISK_F_NO_REMOVABLE_DEVOPS
>     - set this bit directli in scsi_block_initfn
> 
>  hw/scsi/scsi-disk.c | 14 +++++++++++---
>  1 file changed, 11 insertions(+), 3 deletions(-)
> 
> diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
> index c8d2a99..729418f 100644
> --- a/hw/scsi/scsi-disk.c
> +++ b/hw/scsi/scsi-disk.c
> @@ -61,8 +61,9 @@ typedef struct SCSIDiskReq {
>      BlockAcctCookie acct;
>  } SCSIDiskReq;
>  
> -#define SCSI_DISK_F_REMOVABLE   0
> -#define SCSI_DISK_F_DPOFUA      1
> +#define SCSI_DISK_F_REMOVABLE             0
> +#define SCSI_DISK_F_DPOFUA                1
> +#define SCSI_DISK_F_NO_REMOVABLE_DEVOPS   2
>  
>  struct SCSIDiskState
>  {
> @@ -2107,7 +2108,8 @@ static int scsi_initfn(SCSIDevice *dev)
>          return -1;
>      }
>  
> -    if (s->features & (1 << SCSI_DISK_F_REMOVABLE)) {
> +    if ((s->features & (1 << SCSI_DISK_F_REMOVABLE)) &&
> +            !(s->features & (1 << SCSI_DISK_F_NO_REMOVABLE_DEVOPS))) {
>          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);
> @@ -2319,6 +2321,12 @@ static int scsi_block_initfn(SCSIDevice *dev)
>      } else {
>          s->qdev.blocksize = 512;
>      }
> +
> +    /* Makes the scsi-block device not removable by using HMP and QMP eject
> +     * command.
> +     */
> +    s->features |= (1 << SCSI_DISK_F_NO_REMOVABLE_DEVOPS);
> +
>      return scsi_initfn(&s->qdev);
>  }
>  
> 

Applied, thanks.

Paolo

Patch

diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
index c8d2a99..729418f 100644
--- a/hw/scsi/scsi-disk.c
+++ b/hw/scsi/scsi-disk.c
@@ -61,8 +61,9 @@  typedef struct SCSIDiskReq {
     BlockAcctCookie acct;
 } SCSIDiskReq;
 
-#define SCSI_DISK_F_REMOVABLE   0
-#define SCSI_DISK_F_DPOFUA      1
+#define SCSI_DISK_F_REMOVABLE             0
+#define SCSI_DISK_F_DPOFUA                1
+#define SCSI_DISK_F_NO_REMOVABLE_DEVOPS   2
 
 struct SCSIDiskState
 {
@@ -2107,7 +2108,8 @@  static int scsi_initfn(SCSIDevice *dev)
         return -1;
     }
 
-    if (s->features & (1 << SCSI_DISK_F_REMOVABLE)) {
+    if ((s->features & (1 << SCSI_DISK_F_REMOVABLE)) &&
+            !(s->features & (1 << SCSI_DISK_F_NO_REMOVABLE_DEVOPS))) {
         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);
@@ -2319,6 +2321,12 @@  static int scsi_block_initfn(SCSIDevice *dev)
     } else {
         s->qdev.blocksize = 512;
     }
+
+    /* Makes the scsi-block device not removable by using HMP and QMP eject
+     * command.
+     */
+    s->features |= (1 << SCSI_DISK_F_NO_REMOVABLE_DEVOPS);
+
     return scsi_initfn(&s->qdev);
 }