From nobody Mon Nov 17 13:44:29 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604584131; cv=none; d=zohomail.com; s=zohoarc; b=lEiTPy4brnuiCliuuYvxq2XDyMJEgMWe/lw4WSHYeDQKiLAb76B0Yk+BM5FmB18M/9pEtbQ3TorXWYDxH7m4ZEGUguPoclAThWLgNh1xmJ9ftgj656SlJ7xwV+rdU24JThS1RM5a3nnwy3AMprhv3kS9I2TJU1oA4qFjK1qxiWQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604584131; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hUA7GQ69KkiJkZm9iFyAQO55KpxwpxZAPfWwv0rjgvU=; b=OUh3IDnAYcV4w7emIcpnpmkMmGyGnJFTq4zYbyagJvIRgMp33McAunb3DIaXFFPOxroOrNMMHIx4TlqR9Pej5TSurfNS6KUK13zccJoX7UU7mZvxF3IXFq+eJ+bqAoX2NSe1cdjE/Z290OxxF4YeAMWGpormZTCI0tnoDSji4Ec= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1604584131054768.4982271956993; Thu, 5 Nov 2020 05:48:51 -0800 (PST) Received: from localhost ([::1]:50934 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kafdB-0005Bw-T3 for importer@patchew.org; Thu, 05 Nov 2020 08:48:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59030) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kafW0-0003ws-Lu for qemu-devel@nongnu.org; Thu, 05 Nov 2020 08:41:24 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:25042) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kafVx-0004C5-Ur for qemu-devel@nongnu.org; Thu, 05 Nov 2020 08:41:24 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-357-x57n4RmWMqiXU8Q4vVWftA-1; Thu, 05 Nov 2020 08:41:17 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BEA9564156 for ; Thu, 5 Nov 2020 13:41:16 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-114-66.ams2.redhat.com [10.36.114.66]) by smtp.corp.redhat.com (Postfix) with ESMTP id 617C35D9D5; Thu, 5 Nov 2020 13:41:13 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 9D64D9B0B; Thu, 5 Nov 2020 14:41:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604583681; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hUA7GQ69KkiJkZm9iFyAQO55KpxwpxZAPfWwv0rjgvU=; b=eqGXr8mtoBY2LgDNAUtarxJCrTEm+lxZRfGGqP1y9r3gra8iaV7EkksLnx8dNOaa0uE7ZG MfKZH4gcYbsxiil5K3O3+lLo+RFcvdpNAzcYOY8CO4CP8U3EnoAFghdMEzBaIEuuzyDHZ7 9Q1THyV9t0SF4MGRTOpy/ShABoQ8oF8= X-MC-Unique: x57n4RmWMqiXU8Q4vVWftA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 1/6] usb-storage: switch trace events Date: Thu, 5 Nov 2020 14:41:07 +0100 Message-Id: <20201105134112.25119-2-kraxel@redhat.com> In-Reply-To: <20201105134112.25119-1-kraxel@redhat.com> References: <20201105134112.25119-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/05 01:14:53 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Replace most DPRINTF macros with trace events. Drop some DPRINTF macros. Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/usb/dev-storage.c | 42 +++++++++++++++++------------------------- hw/usb/trace-events | 12 ++++++++++++ 2 files changed, 29 insertions(+), 25 deletions(-) diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c index 648340323f68..e317cde8fd48 100644 --- a/hw/usb/dev-storage.c +++ b/hw/usb/dev-storage.c @@ -23,16 +23,10 @@ #include "qapi/visitor.h" #include "qemu/cutils.h" #include "qom/object.h" +#include "trace.h" =20 //#define DEBUG_MSD =20 -#ifdef DEBUG_MSD -#define DPRINTF(fmt, ...) \ -do { printf("usb-msd: " fmt , ## __VA_ARGS__); } while (0) -#else -#define DPRINTF(fmt, ...) do {} while(0) -#endif - /* USB requests. */ #define MassStorageReset 0xff #define GetMaxLun 0xfe @@ -245,8 +239,8 @@ static void usb_msd_send_status(MSDState *s, USBPacket = *p) { int len; =20 - DPRINTF("Command status %d tag 0x%x, len %zd\n", - s->csw.status, le32_to_cpu(s->csw.tag), p->iov.size); + trace_usb_msd_send_status(s->csw.status, le32_to_cpu(s->csw.tag), + p->iov.size); =20 assert(s->csw.sig =3D=3D cpu_to_le32(0x53425355)); len =3D MIN(sizeof(s->csw), p->iov.size); @@ -261,7 +255,7 @@ static void usb_msd_packet_complete(MSDState *s) /* Set s->packet to NULL before calling usb_packet_complete because another request may be issued before usb_packet_complete returns. */ - DPRINTF("Packet complete %p\n", p); + trace_usb_msd_packet_complete(); s->packet =3D NULL; usb_packet_complete(&s->dev, p); } @@ -289,7 +283,7 @@ static void usb_msd_command_complete(SCSIRequest *req, = uint32_t status, size_t r MSDState *s =3D DO_UPCAST(MSDState, dev.qdev, req->bus->qbus.parent); USBPacket *p =3D s->packet; =20 - DPRINTF("Command complete %d tag 0x%x\n", status, req->tag); + trace_usb_msd_cmd_complete(status, req->tag); =20 s->csw.sig =3D cpu_to_le32(0x53425355); s->csw.tag =3D cpu_to_le32(req->tag); @@ -331,6 +325,8 @@ static void usb_msd_request_cancelled(SCSIRequest *req) { MSDState *s =3D DO_UPCAST(MSDState, dev.qdev, req->bus->qbus.parent); =20 + trace_usb_msd_cmd_cancel(req->tag); + if (req =3D=3D s->req) { scsi_req_unref(s->req); s->req =3D NULL; @@ -342,7 +338,7 @@ static void usb_msd_handle_reset(USBDevice *dev) { MSDState *s =3D (MSDState *)dev; =20 - DPRINTF("Reset\n"); + trace_usb_msd_reset(); if (s->req) { scsi_req_cancel(s->req); } @@ -388,7 +384,7 @@ static void usb_msd_handle_control(USBDevice *dev, USBP= acket *p, } maxlun++; } - DPRINTF("MaxLun %d\n", maxlun); + trace_usb_msd_maxlun(maxlun); data[0] =3D maxlun; p->actual_length =3D 1; break; @@ -436,7 +432,6 @@ static void usb_msd_handle_data(USBDevice *dev, USBPack= et *p) le32_to_cpu(cbw.sig)); goto fail; } - DPRINTF("Command on LUN %d\n", cbw.lun); scsi_dev =3D scsi_device_find(&s->bus, 0, 0, cbw.lun); if (scsi_dev =3D=3D NULL) { error_report("usb-msd: Bad LUN %d", cbw.lun); @@ -451,8 +446,8 @@ static void usb_msd_handle_data(USBDevice *dev, USBPack= et *p) } else { s->mode =3D USB_MSDM_DATAOUT; } - DPRINTF("Command tag 0x%x flags %08x len %d data %d\n", - tag, cbw.flags, cbw.cmd_len, s->data_len); + trace_usb_msd_cmd_submit(cbw.lun, tag, cbw.flags, + cbw.cmd_len, s->data_len); assert(le32_to_cpu(s->csw.residue) =3D=3D 0); s->scsi_len =3D 0; s->req =3D scsi_req_new(scsi_dev, tag, cbw.lun, cbw.cmd, NULL); @@ -466,7 +461,7 @@ static void usb_msd_handle_data(USBDevice *dev, USBPack= et *p) break; =20 case USB_MSDM_DATAOUT: - DPRINTF("Data out %zd/%d\n", p->iov.size, s->data_len); + trace_usb_msd_data_out(p->iov.size, s->data_len); if (p->iov.size > s->data_len) { goto fail; } @@ -488,14 +483,13 @@ static void usb_msd_handle_data(USBDevice *dev, USBPa= cket *p) } } if (p->actual_length < p->iov.size) { - DPRINTF("Deferring packet %p [wait data-out]\n", p); + trace_usb_msd_packet_async(); s->packet =3D p; p->status =3D USB_RET_ASYNC; } break; =20 default: - DPRINTF("Unexpected write (len %zd)\n", p->iov.size); goto fail; } break; @@ -510,6 +504,7 @@ static void usb_msd_handle_data(USBDevice *dev, USBPack= et *p) goto fail; } /* Waiting for SCSI write to complete. */ + trace_usb_msd_packet_async(); s->packet =3D p; p->status =3D USB_RET_ASYNC; break; @@ -521,7 +516,7 @@ static void usb_msd_handle_data(USBDevice *dev, USBPack= et *p) =20 if (s->req) { /* still in flight */ - DPRINTF("Deferring packet %p [wait status]\n", p); + trace_usb_msd_packet_async(); s->packet =3D p; p->status =3D USB_RET_ASYNC; } else { @@ -531,8 +526,7 @@ static void usb_msd_handle_data(USBDevice *dev, USBPack= et *p) break; =20 case USB_MSDM_DATAIN: - DPRINTF("Data in %zd/%d, scsi_len %d\n", - p->iov.size, s->data_len, s->scsi_len); + trace_usb_msd_data_in(p->iov.size, s->data_len, s->scsi_len); if (s->scsi_len) { usb_msd_copy_data(s, p); } @@ -550,20 +544,18 @@ static void usb_msd_handle_data(USBDevice *dev, USBPa= cket *p) } } if (p->actual_length < p->iov.size && s->mode =3D=3D USB_MSDM_= DATAIN) { - DPRINTF("Deferring packet %p [wait data-in]\n", p); + trace_usb_msd_packet_async(); s->packet =3D p; p->status =3D USB_RET_ASYNC; } break; =20 default: - DPRINTF("Unexpected read (len %zd)\n", p->iov.size); goto fail; } break; =20 default: - DPRINTF("Bad token\n"); fail: p->status =3D USB_RET_STALL; break; diff --git a/hw/usb/trace-events b/hw/usb/trace-events index a3292d46248f..38e05fc7f4db 100644 --- a/hw/usb/trace-events +++ b/hw/usb/trace-events @@ -252,6 +252,18 @@ usb_hub_attach(int addr, int nr) "dev %d, port %d" usb_hub_detach(int addr, int nr) "dev %d, port %d" usb_hub_status_report(int addr, int status) "dev %d, status 0x%x" =20 +# dev-storage.c +usb_msd_reset(void) "" +usb_msd_maxlun(unsigned maxlun) "%d" +usb_msd_send_status(unsigned status, unsigned tag, size_t size) "status %d= , tag 0x%x, len %zd" +usb_msd_data_in(unsigned packet, unsigned remaining, unsigned total) "%d/%= d (scsi %d)" +usb_msd_data_out(unsigned packet, unsigned remaining) "%d/%d" +usb_msd_packet_async(void) "" +usb_msd_packet_complete(void) "" +usb_msd_cmd_submit(unsigned lun, unsigned tag, unsigned flags, unsigned le= n, unsigned data_len) "lun %u, tag 0x%x, flags 0x%08x, len %d, data-len %d" +usb_msd_cmd_complete(unsigned status, unsigned tag) "status %d, tag 0x%x" +usb_msd_cmd_cancel(unsigned tag) "tag 0x%x" + # dev-uas.c usb_uas_reset(int addr) "dev %d" usb_uas_command(int addr, uint16_t tag, int lun, uint32_t lun64_1, uint32_= t lun64_2) "dev %d, tag 0x%x, lun %d, lun64 0x%08x-0x%08x" --=20 2.27.0 From nobody Mon Nov 17 13:44:29 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604584257; cv=none; d=zohomail.com; s=zohoarc; b=Ld5ztkKhqMygzuobfmbtVHGWZHSdBmpNgroT7GrJQISkJljTOg3uqdUuBrOCfXaTxgu/8Nlhg05RjKEYJivykkcK6rkocCSLbyc3Uh9luYdQgEHx5qzW1J9OJPZ/vCiad7JChfCs65RcmpOBZ6L+9LNnA5M5T6nUr+MfiTWcAmk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604584257; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/6uL0ifc3NOXN3CbpVzncRBe2N5ILAHhkVbRkNazYBs=; b=PUcAdo/pIoa7I4YZhdbCyw8U0Vh562y2HwL9spwG5bOlWKFAwiXwEUwd5MU08InnL6hYOK6+FNdrs7cqkzfwxuBJOwAfRX4B9kRO6KsRknBAyJpnmkG8V0FnnPMl5o06WmQli9L78pAqW7bZI8oHMDFHJu5cIPMc11+eD+vY5Ls= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1604584257239802.0323430402043; Thu, 5 Nov 2020 05:50:57 -0800 (PST) Received: from localhost ([::1]:58196 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaffC-0008Ee-5f for importer@patchew.org; Thu, 05 Nov 2020 08:50:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59002) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kafVz-0003uP-Nd for qemu-devel@nongnu.org; Thu, 05 Nov 2020 08:41:23 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:24543) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kafVx-0004Bo-3G for qemu-devel@nongnu.org; Thu, 05 Nov 2020 08:41:23 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-377-4_vxVnc7ONCOoZ_h93DWfQ-1; Thu, 05 Nov 2020 08:41:17 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D0C3319080B9 for ; Thu, 5 Nov 2020 13:41:16 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-114-66.ams2.redhat.com [10.36.114.66]) by smtp.corp.redhat.com (Postfix) with ESMTP id 64BC255790; Thu, 5 Nov 2020 13:41:13 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id A68969B0C; Thu, 5 Nov 2020 14:41:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604583679; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/6uL0ifc3NOXN3CbpVzncRBe2N5ILAHhkVbRkNazYBs=; b=M/aewXUeFQBApWF/SQaFfwMaJsF0iPkTCVhxe37kMIPp7Gezwnr1Qu1wEOl/iobORabjDT oGwCoom/j0WlI8om3W5npZOL0BVJseaSUWH/Y2AUntGvz9MUKghLhA+GCxaJKD/cYTUrWw eNmS7q2Osa2FDVSZ0Gj13zZcmdXjWVI= X-MC-Unique: 4_vxVnc7ONCOoZ_h93DWfQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 2/6] usb-storage: add commandlog property Date: Thu, 5 Nov 2020 14:41:08 +0100 Message-Id: <20201105134112.25119-3-kraxel@redhat.com> In-Reply-To: <20201105134112.25119-1-kraxel@redhat.com> References: <20201105134112.25119-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/05 01:14:53 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Add property so scsi command logging can be switched at runtime instead of compile time. Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/usb/dev-storage.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c index e317cde8fd48..d5cc6137443c 100644 --- a/hw/usb/dev-storage.c +++ b/hw/usb/dev-storage.c @@ -25,8 +25,6 @@ #include "qom/object.h" #include "trace.h" =20 -//#define DEBUG_MSD - /* USB requests. */ #define MassStorageReset 0xff #define GetMaxLun 0xfe @@ -59,6 +57,7 @@ struct MSDState { /* usb-storage only */ BlockConf conf; uint32_t removable; + bool commandlog; SCSIDevice *scsi_dev; }; typedef struct MSDState MSDState; @@ -451,9 +450,9 @@ static void usb_msd_handle_data(USBDevice *dev, USBPack= et *p) assert(le32_to_cpu(s->csw.residue) =3D=3D 0); s->scsi_len =3D 0; s->req =3D scsi_req_new(scsi_dev, tag, cbw.lun, cbw.cmd, NULL); -#ifdef DEBUG_MSD - scsi_req_print(s->req); -#endif + if (s->commandlog) { + scsi_req_print(s->req); + } len =3D scsi_req_enqueue(s->req); if (len) { scsi_req_continue(s->req); @@ -684,6 +683,7 @@ static Property msd_properties[] =3D { DEFINE_BLOCK_PROPERTIES(MSDState, conf), DEFINE_BLOCK_ERROR_PROPERTIES(MSDState, conf), DEFINE_PROP_BIT("removable", MSDState, removable, 0, false), + DEFINE_PROP_BOOL("commandlog", MSDState, commandlog, false), DEFINE_PROP_END_OF_LIST(), }; =20 --=20 2.27.0 From nobody Mon Nov 17 13:44:29 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604584022; cv=none; d=zohomail.com; s=zohoarc; b=L/RjgiJvlZO9xMvu3Z20WvRgt2R9DNfkJjgSKOyX0e83T8gMVYOJx2pwgJk0MBHqYl+rVu1lzF5JISYVpuRaX3BdzBhl3B8fSDdS0iI2RL7w4nqRf+Z3F63ZW0bPWe3eIBqEtPLYHabre12U+XBaInxK4hsyMIysZOsXPsItb9E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604584022; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=E6gs2WWgFzBvT/kPNnLYBw7hkr2INdhdSszwgV3IaOc=; b=KqMmOcgOTfWw/0vYgPq5niAlW4+x7wSEpJ711kMg/1Qs+oz1irrlgV98TXU5/TnTFzhosq0PCJo1H9clusUYA2caPY+AziAQhVIBqIo7WxMHvUH1Jgi8+GvCSqBwlrRhpLW/6Ri8C0P2T308V7mqZv19cu4B4btEOM6vIXUk0aE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1604584022810651.2256291589435; Thu, 5 Nov 2020 05:47:02 -0800 (PST) Received: from localhost ([::1]:42698 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kafbR-0001lO-JW for importer@patchew.org; Thu, 05 Nov 2020 08:47:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59014) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kafW0-0003vd-5I for qemu-devel@nongnu.org; Thu, 05 Nov 2020 08:41:24 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:30444) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kafVx-0004Bv-4B for qemu-devel@nongnu.org; Thu, 05 Nov 2020 08:41:23 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-572-iiK9gwXgOreSP3iiFVXfKg-1; Thu, 05 Nov 2020 08:41:18 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DFAB387950E for ; Thu, 5 Nov 2020 13:41:16 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-114-66.ams2.redhat.com [10.36.114.66]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7B9EC60C17; Thu, 5 Nov 2020 13:41:13 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id B01AE9ACF; Thu, 5 Nov 2020 14:41:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604583680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=E6gs2WWgFzBvT/kPNnLYBw7hkr2INdhdSszwgV3IaOc=; b=PTrNPJo0mPPq1dfosfuwz71GCzYVUo2ja6jc2QDkdm/AfYkEthlu1XXtQwfhy2b3x+PKyB MEidxOwQ5kr1aPcXJkeQFIBjTYbNk+kcv8m5ofwWPG9L2/UQ+TJKP4qz04sURMt3ynUBhg kbsPSJMw7XqCDoVDdnT6M4yaDMWfiaE= X-MC-Unique: iiK9gwXgOreSP3iiFVXfKg-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 3/6] usb-storage: use bool for removable property Date: Thu, 5 Nov 2020 14:41:09 +0100 Message-Id: <20201105134112.25119-4-kraxel@redhat.com> In-Reply-To: <20201105134112.25119-1-kraxel@redhat.com> References: <20201105134112.25119-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/04 22:46:30 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/usb/dev-storage.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c index d5cc6137443c..360e8ca8f2bd 100644 --- a/hw/usb/dev-storage.c +++ b/hw/usb/dev-storage.c @@ -56,7 +56,7 @@ struct MSDState { USBPacket *packet; /* usb-storage only */ BlockConf conf; - uint32_t removable; + bool removable; bool commandlog; SCSIDevice *scsi_dev; }; @@ -682,7 +682,7 @@ static const VMStateDescription vmstate_usb_msd =3D { static Property msd_properties[] =3D { DEFINE_BLOCK_PROPERTIES(MSDState, conf), DEFINE_BLOCK_ERROR_PROPERTIES(MSDState, conf), - DEFINE_PROP_BIT("removable", MSDState, removable, 0, false), + DEFINE_PROP_BOOL("removable", MSDState, removable, false), DEFINE_PROP_BOOL("commandlog", MSDState, commandlog, false), DEFINE_PROP_END_OF_LIST(), }; --=20 2.27.0 From nobody Mon Nov 17 13:44:29 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604584397; cv=none; d=zohomail.com; s=zohoarc; b=keD8rag9xzOZm+MUahW95bc1qrzeFaSVDH+W8A9JnymfWT3zwRqxcIu+ImsC7d6FD6KPJVjQBZQqKuSBrgYKAJtVbKQg0Wz4Fdu6wHaZxErHVxCtD2NR3XwvqXAq1+Tmu/iwzNH6lBt+Z0wDlOWJqRN8wWVtjZf4nEi/keluotQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604584397; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=80TCQjbrNZc8Tey16FVCT4I0xjHk1IwJPsVUBnQHORE=; b=DLStwMDHQ4dOJilast9Uf552FhB8+3ixbgrZmRVK0+LyWYGShwJPGD9R/3SsvH8v+90NpXgKsxZZn1pav1QrTL7/SrSXSI1U2C79CWnYAl1P0SHqdt9z2sRGd/Gf2KbD/SoK86IByFP08HMX2wLzTQT/ma0DTz0t60qvexAlcsQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1604584397596879.9594474481858; Thu, 5 Nov 2020 05:53:17 -0800 (PST) Received: from localhost ([::1]:35982 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kafhU-0002La-CM for importer@patchew.org; Thu, 05 Nov 2020 08:53:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59040) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kafW1-0003yH-AH for qemu-devel@nongnu.org; Thu, 05 Nov 2020 08:41:25 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:29257) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kafVz-0004Cy-6m for qemu-devel@nongnu.org; Thu, 05 Nov 2020 08:41:24 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-20-6_mOLDQ0OGGA8mofjr6U0A-1; Thu, 05 Nov 2020 08:41:17 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E3AEE87951B for ; Thu, 5 Nov 2020 13:41:16 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-114-66.ams2.redhat.com [10.36.114.66]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7BBE473679; Thu, 5 Nov 2020 13:41:13 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id B98239AE2; Thu, 5 Nov 2020 14:41:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604583682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=80TCQjbrNZc8Tey16FVCT4I0xjHk1IwJPsVUBnQHORE=; b=WcGmikMLf4kiku4eROMWCERLWV9wSSaiYzbdnwoLARwEYis1bCSwTIYQE4aE2fiQpTvTpB NSed5dqfyuIGWkRR42IPzHM1QPPST+9cnbRUoVrfsmh3bKJwTafdhYbAKlb7ySyODVEWzS 7DhTm9iPiUsV66fMrX+Z3BPifDnYH58= X-MC-Unique: 6_mOLDQ0OGGA8mofjr6U0A-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 4/6] usb-storage: fill csw on cancel Date: Thu, 5 Nov 2020 14:41:10 +0100 Message-Id: <20201105134112.25119-5-kraxel@redhat.com> In-Reply-To: <20201105134112.25119-1-kraxel@redhat.com> References: <20201105134112.25119-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/04 22:46:30 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" 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 --- 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); =20 if (req =3D=3D s->req) { + s->csw.sig =3D cpu_to_le32(0x53425355); + s->csw.tag =3D cpu_to_le32(req->tag); + s->csw.status =3D 1; /* error */ + scsi_req_unref(s->req); s->req =3D NULL; s->scsi_len =3D 0; --=20 2.27.0 From nobody Mon Nov 17 13:44:29 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604584544; cv=none; d=zohomail.com; s=zohoarc; b=m5ElUQbM34wOJifT3xAydKCOiDKnSKcwO8fjA+Yq7LvZuT9VqwtLC7aatQmcPcYNpGBMzNCtoLvL7bcd2huvjA2B8EzSTDHFM7C2SpfhyblUf+AwNNxPNpUWMiWrq7WDhWgHBB4cdgzpVF9UwWnNGtkOhIXgrDiohqWquL8u6ME= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604584544; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=g9qB9M5UbWlBa/XA9Ac/BXwYxQBLDBW0bsz7tGE9puY=; b=OvxSKvlI2muQW2od2QNoRB8y+tFj/BQ9z7XYhSv8XX9hQV1Kfrv6z6KgeZnG+3Ju7KpkXMoQDyfRlVFtpBqicp6BOS5m0cwqf5zpn5nKZZrNdeILXT8ThpMtoC5WCQt8DgQ6tUH6lIKgPmhQwm5RVGULWOIeijsHMxOK+9M8tl8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1604584544335125.42537272400625; Thu, 5 Nov 2020 05:55:44 -0800 (PST) Received: from localhost ([::1]:41728 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kafjr-0004mf-46 for importer@patchew.org; Thu, 05 Nov 2020 08:55:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59074) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kafW4-00047G-Ia for qemu-devel@nongnu.org; Thu, 05 Nov 2020 08:41:28 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:60820) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kafW2-0004Ek-Q3 for qemu-devel@nongnu.org; Thu, 05 Nov 2020 08:41:28 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-477-Jcf6slSePtKkln8MVLpPJg-1; Thu, 05 Nov 2020 08:41:22 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 338771084C8B for ; Thu, 5 Nov 2020 13:41:21 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-114-66.ams2.redhat.com [10.36.114.66]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7926C19D6C; Thu, 5 Nov 2020 13:41:17 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id C30A09AF9; Thu, 5 Nov 2020 14:41:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604583686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=g9qB9M5UbWlBa/XA9Ac/BXwYxQBLDBW0bsz7tGE9puY=; b=Vs/oPZnXXey8ckClOWWwtDHRHsMBCZx6XudPuBO3/7bVcelhI1nWQSZfDlDGEWaIKVjN3x FYqUsx1copL3iU299z9lIiTU4XjTGYIjjDGAturdRSw1fS8qd0e6utRBUH5TUYGl00pwk/ h+qoFy5h93j7RoE/dmW6a/bJ5aPGlFc= X-MC-Unique: Jcf6slSePtKkln8MVLpPJg-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 5/6] xhci: fix guest triggerable assert Date: Thu, 5 Nov 2020 14:41:11 +0100 Message-Id: <20201105134112.25119-6-kraxel@redhat.com> In-Reply-To: <20201105134112.25119-1-kraxel@redhat.com> References: <20201105134112.25119-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/05 01:14:53 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" We didn't start any work yet so we can just return at that point instead of asserting. Buglink: https://bugs.launchpad.net/qemu/+bug/1883732 Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/usb/hcd-xhci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index 79ce5c4be6c4..d00bb0141dac 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -1904,7 +1904,9 @@ static void xhci_kick_epctx(XHCIEPContext *epctx, uns= igned int streamid) streamid =3D 0; xhci_set_ep_state(xhci, epctx, NULL, EP_RUNNING); } - assert(ring->dequeue !=3D 0); + if (!ring->dequeue) { + return; + } =20 epctx->kick_active++; while (1) { --=20 2.27.0 From nobody Mon Nov 17 13:44:29 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604584256; cv=none; d=zohomail.com; s=zohoarc; b=OQUC0WrJ659jMYcVxROKu8Gv3KpMjldy2AY7G+OBYsI6jkDuidEQKThCgrO5TjojDtjudkM9NNgEKLpEtMjIdB7ET38+tk6PFLsiScRVoAdWI92ALg53nC45e72OmuiJ+5HdxvwXbO+iqnYk7HLVn7iYJE1EL2RfqYsm4evhKmo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604584256; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=MpTu7+pxv+zPUU9VW6IUZ+BpvlWuitvM343kAr6A2YE=; b=KGPL6EO16bkeB7PYHf3ppihSXlbagJtbtTo/GVVcwVsJHpIQKilsEdi1i0l80g7izUoNqoRWl4JQq1rUk8tCqINk0ZkQ6rTvDGipJAsIix5VFnf52z5Ebnem9f6+lHKl1MFdi6xCeHwLF71Br3hvKQX2lNGAndgZnjqm2ptzSN0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1604584256262846.170532526911; Thu, 5 Nov 2020 05:50:56 -0800 (PST) Received: from localhost ([::1]:58302 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaffC-0008IU-5K for importer@patchew.org; Thu, 05 Nov 2020 08:50:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59052) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kafW1-0003zR-M9 for qemu-devel@nongnu.org; Thu, 05 Nov 2020 08:41:25 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:54911) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kafVz-0004D9-PP for qemu-devel@nongnu.org; Thu, 05 Nov 2020 08:41:25 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-131-XcflAEQTMhqYEBNO-Atq7Q-1; Thu, 05 Nov 2020 08:41:18 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B0B151009E26 for ; Thu, 5 Nov 2020 13:41:17 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-114-66.ams2.redhat.com [10.36.114.66]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7A7705D9D5; Thu, 5 Nov 2020 13:41:17 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id CC6B09AFB; Thu, 5 Nov 2020 14:41:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604583683; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MpTu7+pxv+zPUU9VW6IUZ+BpvlWuitvM343kAr6A2YE=; b=gaPwhKOPbc8DqUsQzFclfUZf+ndIO2NvqUh/rr5GEHCiZaiST5XqwkzL59MlcmOFHlkYOH dFWtucn5fP/8EdgoaIk4lsH5MEaftIOd3aYNB2bwrQcebDt5uLdVjSN55BMZ2KTIf4s5Ym WKLD8+rhZyPYqXUzgubPR+qBnZMlED0= X-MC-Unique: XcflAEQTMhqYEBNO-Atq7Q-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 6/6] xhci: move sanity checks Date: Thu, 5 Nov 2020 14:41:12 +0100 Message-Id: <20201105134112.25119-7-kraxel@redhat.com> In-Reply-To: <20201105134112.25119-1-kraxel@redhat.com> References: <20201105134112.25119-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/05 01:14:53 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The v variable goes negative for reg < 0x20. Reorder the code to first sanity check then calculate v and assign intr to make sanity checkers happy. Buglink: https://bugs.launchpad.net/qemu/+bug/1902112 Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/usb/hcd-xhci.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index d00bb0141dac..6dfb17cbe915 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -3010,14 +3010,17 @@ static void xhci_runtime_write(void *ptr, hwaddr re= g, uint64_t val, unsigned size) { XHCIState *xhci =3D ptr; - int v =3D (reg - 0x20) / 0x20; - XHCIInterrupter *intr =3D &xhci->intr[v]; + XHCIInterrupter *intr; + int v; + trace_usb_xhci_runtime_write(reg, val); =20 if (reg < 0x20) { trace_usb_xhci_unimplemented("runtime write", reg); return; } + v =3D (reg - 0x20) / 0x20; + intr =3D &xhci->intr[v]; =20 switch (reg & 0x1f) { case 0x00: /* IMAN */ --=20 2.27.0