From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44770) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VZOW6-0003wB-6G for qemu-devel@nongnu.org; Thu, 24 Oct 2013 13:16:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VZOVx-0006Xs-4N for qemu-devel@nongnu.org; Thu, 24 Oct 2013 13:16:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:9666) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VZOVw-0006Xj-R2 for qemu-devel@nongnu.org; Thu, 24 Oct 2013 13:16:05 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r9OHG4cr026562 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 24 Oct 2013 13:16:04 -0400 From: Hans de Goede Date: Thu, 24 Oct 2013 18:15:51 +0100 Message-Id: <1382634953-9240-4-git-send-email-hdegoede@redhat.com> In-Reply-To: <1382634953-9240-1-git-send-email-hdegoede@redhat.com> References: <1382634953-9240-1-git-send-email-hdegoede@redhat.com> Subject: [Qemu-devel] [PATCH 3/5] uas: Fix / cleanup usb_uas_task error handling List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gerd Hoffmann Cc: Hans de Goede , qemu-devel@nongnu.org -The correct error if we cannot find the dev is INCORRECT_LUN rather then INVALID_INFO_UNIT -Move the device not found check to the top so we only need to do it once -Remove the dev->lun != lun checks, dev is returned by scsi_device_find which searches by lun, so this will never trigger Signed-off-by: Hans de Goede --- hw/usb/dev-uas.c | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/hw/usb/dev-uas.c b/hw/usb/dev-uas.c index 36a75b2..12d79ef 100644 --- a/hw/usb/dev-uas.c +++ b/hw/usb/dev-uas.c @@ -746,17 +746,14 @@ static void usb_uas_task(UASDevice *uas, uas_ui *ui) if (req) { goto overlapped_tag; } + if (dev == NULL) { + goto incorrect_lun; + } switch (ui->task.function) { case UAS_TMF_ABORT_TASK: task_tag = be16_to_cpu(ui->task.task_tag); trace_usb_uas_tmf_abort_task(uas->dev.addr, tag, task_tag); - if (dev == NULL) { - goto bad_target; - } - if (dev->lun != lun) { - goto incorrect_lun; - } req = usb_uas_find_request(uas, task_tag); if (req && req->dev == dev) { scsi_req_cancel(req->req); @@ -766,12 +763,6 @@ static void usb_uas_task(UASDevice *uas, uas_ui *ui) case UAS_TMF_LOGICAL_UNIT_RESET: trace_usb_uas_tmf_logical_unit_reset(uas->dev.addr, tag, lun); - if (dev == NULL) { - goto bad_target; - } - if (dev->lun != lun) { - goto incorrect_lun; - } qdev_reset_all(&dev->qdev); usb_uas_queue_response(uas, tag, UAS_RC_TMF_COMPLETE, 0); break; @@ -787,11 +778,6 @@ overlapped_tag: usb_uas_queue_response(uas, req->tag, UAS_RC_OVERLAPPED_TAG, 0); return; -bad_target: - /* FIXME: correct? [see long comment in usb_uas_command()] */ - usb_uas_queue_response(uas, tag, UAS_RC_INVALID_INFO_UNIT, 0); - return; - incorrect_lun: usb_uas_queue_response(uas, tag, UAS_RC_INCORRECT_LUN, 0); } -- 1.8.3.1