From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:33398) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QorJY-0002Nn-82 for qemu-devel@nongnu.org; Thu, 04 Aug 2011 02:21:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QorJW-00087A-NN for qemu-devel@nongnu.org; Thu, 04 Aug 2011 02:21:52 -0400 Received: from cantor2.suse.de ([195.135.220.15]:45468 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QorJW-000875-ER for qemu-devel@nongnu.org; Thu, 04 Aug 2011 02:21:50 -0400 Message-ID: <4E3A3A7D.4050008@suse.de> Date: Thu, 04 Aug 2011 08:21:49 +0200 From: Hannes Reinecke MIME-Version: 1.0 References: <1312376904-16115-1-git-send-email-armbru@redhat.com> <1312376904-16115-25-git-send-email-armbru@redhat.com> In-Reply-To: <1312376904-16115-25-git-send-email-armbru@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v2 24/45] scsi-disk: Avoid physical/virtual tray state mismatch List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: kwolf@redhat.com, quintela@redhat.com, stefano.stabellini@eu.citrix.com, qemu-devel@nongnu.org, lcapitulino@redhat.com, amit.shah@redhat.com, hch@lst.de On 08/03/2011 03:08 PM, Markus Armbruster wrote: > When scsi-cd is backed by a physical drive, we want the physical tray > match the virtual one. To that end, we call bdrv_eject() on guest's > load/eject, and bdrv_lock_medium() on guest's prevent/allow removal. > But we don't set the initial state on device model init. Fix that. > > While there, also unlock on device model exit. > > Signed-off-by: Markus Armbruster > --- > hw/scsi-disk.c | 7 +++++++ > 1 files changed, 7 insertions(+), 0 deletions(-) > > diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c > index 19a1843..f223de6 100644 > --- a/hw/scsi-disk.c > +++ b/hw/scsi-disk.c > @@ -1205,6 +1205,9 @@ static void scsi_destroy(SCSIDevice *dev) > SCSIDiskState *s =3D DO_UPCAST(SCSIDiskState, qdev, dev); > > scsi_device_purge_requests(&s->qdev); > + if (s->qdev.type =3D=3D TYPE_ROM) { > + bdrv_lock_medium(s->qdev.conf.bs, 0); > + } > blockdev_mark_auto_del(s->qdev.conf.bs); > } > > @@ -1265,6 +1268,10 @@ static int scsi_initfn(SCSIDevice *dev, uint8_t = scsi_type) > s->qdev.type =3D scsi_type; > qemu_add_vm_change_state_handler(scsi_dma_restart_cb, s); > bdrv_set_removable(s->bs, scsi_type =3D=3D TYPE_ROM); > + if (scsi_type =3D=3D TYPE_ROM) { > + bdrv_lock_medium(s->bs, s->tray_locked); > + bdrv_eject(s->bs, s->tray_open); > + } > add_boot_device_path(s->qdev.conf.bootindex,&dev->qdev, ",0"); > return 0; > } We could go not into metaphysical arguments that we're exposing the=20 host state to the guest here. But I guess that would be taking=20 things too far :-) Acked-by: Hannes Reinecke Cheers, Hannes --=20 Dr. Hannes Reinecke zSeries & Storage hare@suse.de +49 911 74053 688 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg GF: J. Hawn, J. Guild, F. Imend=F6rffer, HRB 16746 (AG N=FCrnberg)