From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:34119) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RDzjU-0004Va-Mm for qemu-devel@nongnu.org; Wed, 12 Oct 2011 10:24:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RDzjT-0005T6-6M for qemu-devel@nongnu.org; Wed, 12 Oct 2011 10:24:32 -0400 Received: from mail-wy0-f173.google.com ([74.125.82.173]:63010) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RDzjT-0005Ro-0j for qemu-devel@nongnu.org; Wed, 12 Oct 2011 10:24:31 -0400 Received: by mail-wy0-f173.google.com with SMTP id 22so836426wyh.4 for ; Wed, 12 Oct 2011 07:24:30 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 12 Oct 2011 16:24:04 +0200 Message-Id: <1318429451-9306-4-git-send-email-pbonzini@redhat.com> In-Reply-To: <1318429451-9306-1-git-send-email-pbonzini@redhat.com> References: <1318429451-9306-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 03/10] scsi-generic: check ioctl statuses when SG_IO succeeds List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org A succeeding ioctl does not imply that the SCSI command succeeded. Signed-off-by: Paolo Bonzini --- hw/scsi-generic.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/scsi-generic.c b/hw/scsi-generic.c index 5130e9a..04549aa 100644 --- a/hw/scsi-generic.c +++ b/hw/scsi-generic.c @@ -311,7 +311,7 @@ static int get_blocksize(BlockDriverState *bdrv) io_header.timeout = 6000; /* XXX */ ret = bdrv_ioctl(bdrv, SG_IO, &io_header); - if (ret < 0) + if (ret < 0 || io_header.driver_status || io_header.host_status) return -1; return ldl_be_p(&buf[4]); @@ -341,7 +341,7 @@ static int get_stream_blocksize(BlockDriverState *bdrv) io_header.timeout = 6000; /* XXX */ ret = bdrv_ioctl(bdrv, SG_IO, &io_header); - if (ret < 0) + if (ret < 0 || io_header.driver_status || io_header.host_status) return -1; return ldl_be_p(&buf[0]) & 0xffffff; -- 1.7.6