From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:41147) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RKrug-0005EH-4y for qemu-devel@nongnu.org; Mon, 31 Oct 2011 09:28:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RKruc-0004Q5-0k for qemu-devel@nongnu.org; Mon, 31 Oct 2011 09:28:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47298) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RKrub-0004Pp-BQ for qemu-devel@nongnu.org; Mon, 31 Oct 2011 09:28:25 -0400 From: Kevin Wolf Date: Mon, 31 Oct 2011 14:30:16 +0100 Message-Id: <1320067830-12093-42-git-send-email-kwolf@redhat.com> In-Reply-To: <1320067830-12093-1-git-send-email-kwolf@redhat.com> References: <1320067830-12093-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 41/55] scsi-generic: check ioctl statuses when SG_IO succeeds List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Paolo Bonzini A succeeding ioctl does not imply that the SCSI command succeeded. Signed-off-by: Paolo Bonzini Signed-off-by: Kevin Wolf --- hw/scsi-generic.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/scsi-generic.c b/hw/scsi-generic.c index 5ef4825..c313749 100644 --- a/hw/scsi-generic.c +++ b/hw/scsi-generic.c @@ -310,9 +310,9 @@ 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 (buf[4] << 24) | (buf[5] << 16) | (buf[6] << 8) | buf[7]; } @@ -341,9 +341,9 @@ 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 (buf[9] << 16) | (buf[10] << 8) | buf[11]; } -- 1.7.6.4