[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/13] scsi: Handle no media case for scsi_get_config
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 08/13] scsi: Handle no media case for scsi_get_configuration |
Date: |
Fri, 24 Jul 2015 12:16:29 +0200 |
From: Matthew Rosato <address@hidden>
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 <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
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);
--
2.4.3
- [Qemu-devel] [PULL 00/13] Miscellaneous bugfixes for 2.4.0-rc3, Paolo Bonzini, 2015/07/24
- [Qemu-devel] [PULL 01/13] exec.c: Use atomic_rcu_read() to access dispatch in memory_region_section_get_iotlb(), Paolo Bonzini, 2015/07/24
- [Qemu-devel] [PULL 03/13] qemu-char: Fix missed data on unix socket, Paolo Bonzini, 2015/07/24
- [Qemu-devel] [PULL 02/13] qemu-char: handle EINTR for TCP character devices, Paolo Bonzini, 2015/07/24
- [Qemu-devel] [PULL 05/13] vnc: fix memory leak, Paolo Bonzini, 2015/07/24
- [Qemu-devel] [PULL 04/13] crypto: extend unit tests to cover decryption too, Paolo Bonzini, 2015/07/24
- [Qemu-devel] [PULL 07/13] rcu: actually register threads that have RCU read-side critical sections, Paolo Bonzini, 2015/07/24
- [Qemu-devel] [PULL 08/13] scsi: Handle no media case for scsi_get_configuration,
Paolo Bonzini <=
- [Qemu-devel] [PULL 10/13] memory: count number of active VGA logging clients, Paolo Bonzini, 2015/07/24
- [Qemu-devel] [PULL 06/13] scsi: fix buffer overflow in scsi_req_parse_cdb (CVE-2015-5158), Paolo Bonzini, 2015/07/24
- [Qemu-devel] [PULL 09/13] vl: Fix compiler warning for builds without VNC, Paolo Bonzini, 2015/07/24
- [Qemu-devel] [PULL 12/13] qemu-doc: fix typos, Paolo Bonzini, 2015/07/24
- [Qemu-devel] [PULL 11/13] framebuffer: set DIRTY_MEMORY_VGA on RAM that is used for the framebuffer, Paolo Bonzini, 2015/07/24
- [Qemu-devel] [PULL 13/13] target-i386/FPU: a misprint in helper_fistll_ST0, Paolo Bonzini, 2015/07/24
- Re: [Qemu-devel] [PULL 00/13] Miscellaneous bugfixes for 2.4.0-rc3, Peter Maydell, 2015/07/24