qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>
Subject: [PATCH 4/6] usb-storage: fill csw on cancel
Date: Thu,  5 Nov 2020 14:41:10 +0100	[thread overview]
Message-ID: <20201105134112.25119-5-kraxel@redhat.com> (raw)
In-Reply-To: <20201105134112.25119-1-kraxel@redhat.com>

When scsi requests are canceled fill the csw
(command status word) accordingly.

Buglink: https://bugs.launchpad.net/qemu/+bug/1901981
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/usb/dev-storage.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c
index 360e8ca8f2bd..f0f005869d25 100644
--- a/hw/usb/dev-storage.c
+++ b/hw/usb/dev-storage.c
@@ -327,6 +327,10 @@ static void usb_msd_request_cancelled(SCSIRequest *req)
     trace_usb_msd_cmd_cancel(req->tag);
 
     if (req == s->req) {
+        s->csw.sig = cpu_to_le32(0x53425355);
+        s->csw.tag = cpu_to_le32(req->tag);
+        s->csw.status = 1; /* error */
+
         scsi_req_unref(s->req);
         s->req = NULL;
         s->scsi_len = 0;
-- 
2.27.0



  parent reply	other threads:[~2020-11-05 13:53 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-05 13:41 [PATCH 0/6] usb: fix some guest-triggerable asserts Gerd Hoffmann
2020-11-05 13:41 ` [PATCH 1/6] usb-storage: switch trace events Gerd Hoffmann
2020-11-05 14:26   ` Philippe Mathieu-Daudé
2020-11-05 13:41 ` [PATCH 2/6] usb-storage: add commandlog property Gerd Hoffmann
2020-11-05 14:27   ` Philippe Mathieu-Daudé
2020-11-05 13:41 ` [PATCH 3/6] usb-storage: use bool for removable property Gerd Hoffmann
2020-11-05 14:27   ` Philippe Mathieu-Daudé
2020-11-05 13:41 ` Gerd Hoffmann [this message]
2020-11-05 13:41 ` [PATCH 5/6] xhci: fix guest triggerable assert Gerd Hoffmann
2020-11-05 14:28   ` Philippe Mathieu-Daudé
2020-11-05 13:41 ` [PATCH 6/6] xhci: move sanity checks Gerd Hoffmann
2020-11-05 14:30   ` Philippe Mathieu-Daudé

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201105134112.25119-5-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).