From patchwork Wed Aug 3 08:49:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 108086 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 911BDB71E2 for ; Wed, 3 Aug 2011 20:03:35 +1000 (EST) Received: from localhost ([::1]:54931 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QoX9w-0008P4-Aj for incoming@patchwork.ozlabs.org; Wed, 03 Aug 2011 04:50:36 -0400 Received: from eggs.gnu.org ([140.186.70.92]:44632) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QoX8x-0005jj-Sp for qemu-devel@nongnu.org; Wed, 03 Aug 2011 04:49:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QoX8v-0003hw-GB for qemu-devel@nongnu.org; Wed, 03 Aug 2011 04:49:35 -0400 Received: from mail-wy0-f173.google.com ([74.125.82.173]:65424) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QoX8v-0003g9-AW for qemu-devel@nongnu.org; Wed, 03 Aug 2011 04:49:33 -0400 Received: by wye20 with SMTP id 20so154364wye.4 for ; Wed, 03 Aug 2011 01:49:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=t/ce7AQVK0+Ng1lRlLFP86/8aSLXSFBSlxcWyR7k1R8=; b=SWJcP+fD+gIDixO3dLM84Hlqda6VDY5kI1kSzhoKelKeMYxg5B5xQp8eDkgOjsvo/h PdSUZVGYCnhk7/4mG8OCIdCPVt2LuLu6NUcfb/AijcjRhFOdIWOMuN985dGmZoAHdrrj T7wFGIfnW8MeD/BgdQi4rGSkdshbLpfSiE6M4= Received: by 10.227.28.96 with SMTP id l32mr8309332wbc.50.1312361367387; Wed, 03 Aug 2011 01:49:27 -0700 (PDT) Received: from localhost.localdomain (93-34-199-31.ip51.fastwebnet.it [93.34.199.31]) by mx.google.com with ESMTPS id ff6sm485877wbb.66.2011.08.03.01.49.26 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 03 Aug 2011 01:49:26 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 3 Aug 2011 10:49:04 +0200 Message-Id: <1312361359-15445-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1312361359-15445-1-git-send-email-pbonzini@redhat.com> References: <1312361359-15445-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.82.173 Subject: [Qemu-devel] [PATCH 01/16] scsi-disk: no need to call scsi_req_data on a short read X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 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-bounces+incoming=patchwork.ozlabs.org@nongnu.org In fact, if the HBA's transfer_data callback goes on with scsi_req_continue the request will be completed successfully instead of showing a failure. It can even cause a segmentation fault. An easy way to trigger it is "eject -f cd" during installation (during media test if the installer does something like that). Signed-off-by: Paolo Bonzini Reviewed-by: Christoph Hellwig --- hw/scsi-disk.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index f42a5d1..814bf74 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -217,9 +217,6 @@ static int scsi_handle_rw_error(SCSIDiskReq *r, int error, int type) bdrv_mon_event(s->bs, BDRV_ACTION_STOP, is_read); vm_stop(VMSTOP_DISKFULL); } else { - if (type == SCSI_REQ_STATUS_RETRY_READ) { - scsi_req_data(&r->req, 0); - } switch (error) { case ENOMEM: scsi_command_complete(r, CHECK_CONDITION,