From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:47273) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UhhIq-0007Ka-0B for qemu-devel@nongnu.org; Wed, 29 May 2013 10:24:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UhhIl-0001KI-CF for qemu-devel@nongnu.org; Wed, 29 May 2013 10:24:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:24207) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UhhIl-0001K7-5B for qemu-devel@nongnu.org; Wed, 29 May 2013 10:24:31 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r4TEOUEO017327 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 29 May 2013 10:24:30 -0400 Message-ID: <51A60F92.7020506@redhat.com> Date: Wed, 29 May 2013 16:24:18 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: In-Reply-To: Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 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 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 > --- > 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