From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59037) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UhgSa-0006Bf-P0 for qemu-devel@nongnu.org; Wed, 29 May 2013 09:30:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UhgSW-0008F1-04 for qemu-devel@nongnu.org; Wed, 29 May 2013 09:30:36 -0400 Received: from mail-qe0-f42.google.com ([209.85.128.42]:53469) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UhgSV-0008Eq-Sl for qemu-devel@nongnu.org; Wed, 29 May 2013 09:30:31 -0400 Received: by mail-qe0-f42.google.com with SMTP id cz11so5155002qeb.1 for ; Wed, 29 May 2013 06:30:31 -0700 (PDT) Sender: Paolo Bonzini Message-ID: <51A602E9.3010604@redhat.com> Date: Wed, 29 May 2013 15:30:17 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 2/2] scsi-disk: scsi-block device for scsi pass-through should not be removable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Pavel Hrdina Cc: kwolf@redhat.com, qemu-devel@nongnu.org Il 29/05/2013 14:12, Pavel Hrdina ha scritto: > This patch adds a new SCSI_DISK_F_MONITOR_NOT_REMOVABLE 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 > --- > hw/scsi/scsi-disk.c | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c > index c8d2a99..190c3ad 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_MONITOR_NOT_REMOVABLE 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_MONITOR_NOT_REMOVABLE))) { > 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); > @@ -2463,6 +2465,8 @@ static const TypeInfo scsi_cd_info = { > static Property scsi_block_properties[] = { > DEFINE_PROP_DRIVE("drive", SCSIDiskState, qdev.conf.bs), > DEFINE_PROP_INT32("bootindex", SCSIDiskState, qdev.conf.bootindex, -1), > + DEFINE_PROP_BIT("monitor_not_removable", SCSIDiskState, features, > + SCSI_DISK_F_MONITOR_NOT_REMOVABLE, true), > DEFINE_PROP_END_OF_LIST(), > }; > > Kevin convinced me offlist to take this patch, but I'll still ask for two changes: 1) rename the feature bit to SCSI_DISK_F_NO_REMOVABLE_DEVOPS 2) set the feature in scsi_block_initfn instead of using a bit, because the user should not be able to toggle this. Thanks! Paolo