From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57603) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZHuoM-0003mL-Vz for qemu-devel@nongnu.org; Wed, 22 Jul 2015 10:15:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZHuoI-0000dS-Qx for qemu-devel@nongnu.org; Wed, 22 Jul 2015 10:15:54 -0400 Received: from e32.co.us.ibm.com ([32.97.110.150]:38700) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZHuoI-0000dD-BA for qemu-devel@nongnu.org; Wed, 22 Jul 2015 10:15:50 -0400 Received: from /spool/local by e32.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 22 Jul 2015 08:15:47 -0600 Received: from b03cxnp08027.gho.boulder.ibm.com (b03cxnp08027.gho.boulder.ibm.com [9.17.130.19]) by d03dlp02.boulder.ibm.com (Postfix) with ESMTP id 39CFE3E40047 for ; Wed, 22 Jul 2015 08:15:46 -0600 (MDT) Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by b03cxnp08027.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t6MEFkAL41222238 for ; Wed, 22 Jul 2015 07:15:46 -0700 Received: from d03av02.boulder.ibm.com (localhost [127.0.0.1]) by d03av02.boulder.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t6MEFj0u028708 for ; Wed, 22 Jul 2015 08:15:45 -0600 Message-ID: <55AFA58F.4040005@linux.vnet.ibm.com> Date: Wed, 22 Jul 2015 10:15:43 -0400 From: Matthew Rosato MIME-Version: 1.0 References: <1436986352-10695-1-git-send-email-mjrosato@linux.vnet.ibm.com> In-Reply-To: <1436986352-10695-1-git-send-email-mjrosato@linux.vnet.ibm.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] scsi: Handle no media case for scsi_get_configuration List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com On 07/15/2015 02:52 PM, Matthew Rosato wrote: > Currently, scsi_get_configuration always returns a current > profile (DVD or CD), even when there is actually no media present. > By comparison, ide/atapi uses a default profile of 0 (MMC_PROFILE_NONE) > for this case and checks for tray_open, so let's do the same for scsi. > > This fixes a problem I'm seeing with Fedora 22 guests where systemd > cdrom_id fails to unmount after a QEMU-initiated eject against a > scsi cdrom device because it believes the media is still present > (but unreadable). > > Signed-off-by: Matthew Rosato Ping > --- > hw/scsi/scsi-disk.c | 16 +++++++++++++++- > 1 file changed, 15 insertions(+), 1 deletion(-) > > diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c > index 54d71f4..64f0694 100644 > --- a/hw/scsi/scsi-disk.c > +++ b/hw/scsi/scsi-disk.c > @@ -765,6 +765,9 @@ static inline bool media_is_dvd(SCSIDiskState *s) > if (!blk_is_inserted(s->qdev.conf.blk)) { > return false; > } > + if (s->tray_open) { > + return false; > + } > blk_get_geometry(s->qdev.conf.blk, &nb_sectors); > return nb_sectors > CD_MAX_SECTORS; > } > @@ -778,6 +781,9 @@ static inline bool media_is_cd(SCSIDiskState *s) > if (!blk_is_inserted(s->qdev.conf.blk)) { > return false; > } > + if (s->tray_open) { > + return false; > + } > blk_get_geometry(s->qdev.conf.blk, &nb_sectors); > return nb_sectors <= CD_MAX_SECTORS; > } > @@ -975,7 +981,15 @@ static int scsi_get_configuration(SCSIDiskState *s, uint8_t *outbuf) > if (s->qdev.type != TYPE_ROM) { > return -1; > } > - current = media_is_dvd(s) ? MMC_PROFILE_DVD_ROM : MMC_PROFILE_CD_ROM; > + > + if (media_is_dvd(s)) { > + current = MMC_PROFILE_DVD_ROM; > + } else if (media_is_cd(s)) { > + current = MMC_PROFILE_CD_ROM; > + } else { > + current = MMC_PROFILE_NONE; > + } > + > memset(outbuf, 0, 40); > stl_be_p(&outbuf[0], 36); /* Bytes after the data length field */ > stw_be_p(&outbuf[6], current); >