[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 15/17] scsi-generic: do not do VPD emulation for sens
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 15/17] scsi-generic: do not do VPD emulation for sense other than ILLEGAL_REQUEST |
Date: |
Tue, 6 Nov 2018 22:38:01 +0100 |
Pass other sense, such as UNIT_ATTENTION or BUSY, directly to the
guest.
Reported-by: Max Reitz <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/scsi/scsi-generic.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c
index b50ce64..7237b41 100644
--- a/hw/scsi/scsi-generic.c
+++ b/hw/scsi/scsi-generic.c
@@ -246,7 +246,6 @@ static void scsi_read_complete(void * opaque, int ret)
{
SCSIGenericReq *r = (SCSIGenericReq *)opaque;
SCSIDevice *s = r->req.dev;
- SCSISense sense;
int len;
assert(r->req.aiocb != NULL);
@@ -269,11 +268,14 @@ static void scsi_read_complete(void * opaque, int ret)
* resulted in sense error but would need emulation.
* In this case, emulate a valid VPD response.
*/
- if (s->needs_vpd_bl_emulation &&
+ if (s->needs_vpd_bl_emulation && ret == 0 &&
+ (r->io_header.driver_status & SG_ERR_DRIVER_SENSE) &&
r->req.cmd.buf[0] == INQUIRY &&
(r->req.cmd.buf[1] & 0x01) &&
r->req.cmd.buf[2] == 0xb0) {
- if (sg_io_sense_from_errno(-ret, &r->io_header, &sense)) {
+ SCSISense sense =
+ scsi_parse_sense_buf(r->req.sense, r->io_header.sb_len_wr);
+ if (sense.key == ILLEGAL_REQUEST) {
len = scsi_generic_emulate_block_limits(r, s);
/*
* No need to let scsi_read_complete go on and handle an
--
1.8.3.1
- [Qemu-devel] [PULL 03/17] i386: clarify that the Q35 machine type implements a P35 chipset, (continued)
- [Qemu-devel] [PULL 03/17] i386: clarify that the Q35 machine type implements a P35 chipset, Paolo Bonzini, 2018/11/06
- [Qemu-devel] [PULL 13/17] scsi-generic: avoid out-of-bounds access to VPD page list, Paolo Bonzini, 2018/11/06
- [Qemu-devel] [PULL 01/17] icount: fix deadlock when all cpus are sleeping, Paolo Bonzini, 2018/11/06
- [Qemu-devel] [PULL 16/17] include/qemu/thread.h: Document qemu_thread_atexit* API, Paolo Bonzini, 2018/11/06
- [Qemu-devel] [PULL 14/17] scsi-generic: avoid invalid access to struct when emulating block limits, Paolo Bonzini, 2018/11/06
- [Qemu-devel] [PULL 05/17] MAINTAINERS: remove or downgrade myself to reviewer from some subsystems, Paolo Bonzini, 2018/11/06
- [Qemu-devel] [PULL 17/17] util/qemu-thread-posix: Fix qemu_thread_atexit* for OSX, Paolo Bonzini, 2018/11/06
- [Qemu-devel] [PULL 02/17] x86: hv_evmcs CPU flag support, Paolo Bonzini, 2018/11/06
- [Qemu-devel] [PULL 12/17] scsi-generic: keep VPD page list sorted, Paolo Bonzini, 2018/11/06
- [Qemu-devel] [PULL 11/17] lsi53c895a: check message length value is valid, Paolo Bonzini, 2018/11/06
- [Qemu-devel] [PULL 15/17] scsi-generic: do not do VPD emulation for sense other than ILLEGAL_REQUEST,
Paolo Bonzini <=
- [Qemu-devel] [PULL 04/17] ivshmem: fix memory backend leak, Paolo Bonzini, 2018/11/06
- [Qemu-devel] [PULL 10/17] scripts/dump-guest-memory: Synchronize with guest_phys_blocks_region_add, Paolo Bonzini, 2018/11/06
- [Qemu-devel] [PULL 09/17] memory-mapping: skip non-volatile memory regions in GuestPhysBlockList, Paolo Bonzini, 2018/11/06
- [Qemu-devel] [PULL 06/17] target/i386: Clear RF on SYSCALL instruction, Paolo Bonzini, 2018/11/06
- [Qemu-devel] [PULL 08/17] nvdimm: set non-volatile on the memory region, Paolo Bonzini, 2018/11/06
- [Qemu-devel] [PULL 07/17] memory: learn about non-volatile memory region, Paolo Bonzini, 2018/11/06
- Re: [Qemu-devel] [PULL 00/17] Misc patches for QEMU 3.1 hard freeze (?), Peter Maydell, 2018/11/06
- Re: [Qemu-devel] [PULL 00/17] Misc patches for QEMU 3.1 hard freeze (?), Peter Maydell, 2018/11/08