From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:50350) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QzSTq-0006NK-IL for qemu-devel@nongnu.org; Fri, 02 Sep 2011 08:04:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QzSTp-0003Nq-G0 for qemu-devel@nongnu.org; Fri, 02 Sep 2011 08:04:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46521) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QzSTp-0003NV-4E for qemu-devel@nongnu.org; Fri, 02 Sep 2011 08:04:17 -0400 Message-ID: <4E60C6EA.1030602@redhat.com> Date: Fri, 02 Sep 2011 14:07:06 +0200 From: Kevin Wolf MIME-Version: 1.0 References: <1312376904-16115-1-git-send-email-armbru@redhat.com> <1312376904-16115-23-git-send-email-armbru@redhat.com> In-Reply-To: <1312376904-16115-23-git-send-email-armbru@redhat.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 22/45] ide/atapi: Avoid physical/virtual tray state mismatch List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: quintela@redhat.com, stefano.stabellini@eu.citrix.com, qemu-devel@nongnu.org, lcapitulino@redhat.com, hare@suse.de, amit.shah@redhat.com, hch@lst.de Am 03.08.2011 15:08, schrieb Markus Armbruster: > When ide-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/ide/core.c | 4 ++++ > hw/ide/qdev.c | 18 ++++++++++++++++++ > 2 files changed, 22 insertions(+), 0 deletions(-) > > diff --git a/hw/ide/core.c b/hw/ide/core.c > index 5bcc857..d8b1d43 100644 > --- a/hw/ide/core.c > +++ b/hw/ide/core.c > @@ -1839,6 +1839,10 @@ int ide_init_drive(IDEState *s, BlockDriverState *bs, IDEDriveKind kind, > > ide_reset(s); > bdrv_set_removable(bs, s->drive_kind == IDE_CD); > + if (s->drive_kind == IDE_CD) { > + bdrv_lock_medium(bs, s->tray_locked); > + bdrv_eject(bs, s->tray_open); > + } > return 0; > } > > diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c > index 3b7b306..bc2f426 100644 > --- a/hw/ide/qdev.c > +++ b/hw/ide/qdev.c > @@ -182,6 +182,12 @@ static int ide_cd_initfn(IDEDevice *dev) > return ide_dev_initfn(dev, IDE_CD); > } > > +static int ide_cd_exitfn(IDEDevice *dev) > +{ > + bdrv_lock_medium(dev->conf.bs, 0); > + return 0; > +} > + > static int ide_drive_initfn(IDEDevice *dev) > { > DriveInfo *dinfo = drive_get_by_blockdev(dev->conf.bs); > @@ -189,6 +195,16 @@ static int ide_drive_initfn(IDEDevice *dev) > return ide_dev_initfn(dev, dinfo->media_cd ? IDE_CD : IDE_HD); > } > > +static int ide_drive_exitfn(IDEDevice *dev) > +{ > + DriveInfo *dinfo = drive_get_by_blockdev(dev->conf.bs); > + > + if (dinfo->media_cd) { > + return ide_cd_exitfn(dev); > + } Is dinfo->media_cd guaranteed to be the same as s->drive_kind? I wouldn't have expected this to be true at least since the introduction of ide-hd/cd. Kevin