From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58092) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZHuqz-00063r-81 for qemu-devel@nongnu.org; Wed, 22 Jul 2015 10:18:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZHuqt-0001Fu-JA for qemu-devel@nongnu.org; Wed, 22 Jul 2015 10:18:37 -0400 Received: from mail-wi0-x22d.google.com ([2a00:1450:400c:c05::22d]:38346) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZHuqt-0001Fj-CA for qemu-devel@nongnu.org; Wed, 22 Jul 2015 10:18:31 -0400 Received: by wibxm9 with SMTP id xm9so104837430wib.1 for ; Wed, 22 Jul 2015 07:18:30 -0700 (PDT) Sender: Paolo Bonzini References: <1436986352-10695-1-git-send-email-mjrosato@linux.vnet.ibm.com> <55AFA58F.4040005@linux.vnet.ibm.com> From: Paolo Bonzini Message-ID: <55AFA634.2060000@redhat.com> Date: Wed, 22 Jul 2015 16:18:28 +0200 MIME-Version: 1.0 In-Reply-To: <55AFA58F.4040005@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: Matthew Rosato , qemu-devel@nongnu.org On 22/07/2015 16:15, Matthew Rosato wrote: > 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 The patch looks good. Would you like it in 2.4? Paolo >> --- >> 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); >> > > >