From patchwork Tue Nov 6 21:38:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 993916 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="hkBW4Dg3"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42qNhv3KTNz9sBZ for ; Wed, 7 Nov 2018 08:58:22 +1100 (AEDT) Received: from localhost ([::1]:43973 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gK9MY-0007qt-KY for incoming@patchwork.ozlabs.org; Tue, 06 Nov 2018 16:58:18 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42735) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gK9D5-0005fz-KW for qemu-devel@nongnu.org; Tue, 06 Nov 2018 16:48:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gK93T-0001Dy-LF for qemu-devel@nongnu.org; Tue, 06 Nov 2018 16:38:38 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:37782) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gK93S-0000bF-W7 for qemu-devel@nongnu.org; Tue, 06 Nov 2018 16:38:35 -0500 Received: by mail-wm1-x333.google.com with SMTP id p2-v6so13717363wmc.2 for ; Tue, 06 Nov 2018 13:38:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=WgZvR0RbKUtZsROKV+ztLGGbfoQL0YxAqUmRVNKBrN8=; b=hkBW4Dg3Pr+8BZrp4E4mMwV6VIBuC0ZdWdmsOWZ7LLzACO2pVtnJwWecJ1m/qgAfe7 PAbijLQq7g3x2NjurY5wEj6FVdfjjiRHOYTjZi3/8vVVKp0A1T8aW8X3bcQAV/U9oYA6 fLPYS3zh4erw36n7VS8JGYhMfFB30niQXQP7a4RwJs/OHdLsxmH7VyBbfLFwNFTk36jj 2Rk7Mfe9VSiLJySb5rF9u03OCMKjE8EsmB+MUFCMyccVye3U0cKOuhPyo9SQOJFusu+q XR0hhKpT9EKgGR4O1Z1xFNc7qhR3WuQNvZ9N2UkUEN4bE8p7q2CsOtGN45kUSmJxP0Tq VCKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=WgZvR0RbKUtZsROKV+ztLGGbfoQL0YxAqUmRVNKBrN8=; b=miYSNfW8Fyj8H4zg+mi7pIEiMJs0QUPFOjxgFaAovdmmYtbopv71EBQFXs4TlsfP7Y 4Ejm11PRTG5CJQs4zxBbZjCeKfgHdPnRxyyYeGsgw9K17ZXhQuRpkR0waDZb4AmYUq1q 8YXQnuSbc+KN4OX40s/INCgflxeNtsbuz3mhfIWqhlFMzRW1IJRtbsLmTL+B4cB8Y0+V KryvuD/VF050Wr9WjWTwqeI66sO/FJk5Ihr/+jNzFPyp6TMSQB/qSmYdXvm7NJh1dC5D qsJbTMlJebtJGPkGcGgJsqb1KOaUT4Ami47Nf52NkoCf3KzuvTKMTtChUQ5D8CRBrFm0 AsNw== X-Gm-Message-State: AGRZ1gLOv34M+4OAtQHR46QPJg0Lwuwj6oR0r+5P1KYLbF/mNwIPlL7P KDLhWlTrBIwnq2i5o5IJtgMV3Ezp X-Google-Smtp-Source: AJdET5eTbPwdCzSgQSeGozvWgUHWijVyVlU9hF4++wlhn46+W8bdN9DscWi/BME2YW7U+Roxk4/xOQ== X-Received: by 2002:a1c:a910:: with SMTP id s16-v6mr3332729wme.86.1541540303219; Tue, 06 Nov 2018 13:38:23 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id l186-v6sm3223526wma.13.2018.11.06.13.38.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Nov 2018 13:38:22 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 6 Nov 2018 22:38:01 +0100 Message-Id: <1541540283-45699-16-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1541540283-45699-1-git-send-email-pbonzini@redhat.com> References: <1541540283-45699-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::333 Subject: [Qemu-devel] [PULL 15/17] scsi-generic: do not do VPD emulation for sense other than ILLEGAL_REQUEST X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Pass other sense, such as UNIT_ATTENTION or BUSY, directly to the guest. Reported-by: Max Reitz Signed-off-by: Paolo Bonzini --- 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