motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-03 15:53:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

scsi-generic: check ioctl statuses when SG_IO succeeds

Browse source 
A succeeding ioctl does not imply that the SCSI command succeeded.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Paolo Bonzini 2011-10-12 14:49:48 +02:00 • committed by Kevin Wolf
parent 6a58a3a6eb
commit fe0ed71279
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
hw/scsi-generic.c
View file

@ -310,9 +310,9 @@ static int get_blocksize(BlockDriverState *bdrv)
io_header.timeout = 6000; /* XXX */ io_header.timeout = 6000; /* XXX */
ret = bdrv_ioctl(bdrv, SG_IO, &io_header); 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 -1;
}
return (buf[4] << 24) | (buf[5] << 16) | (buf[6] << 8) | buf[7]; 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 */ io_header.timeout = 6000; /* XXX */
ret = bdrv_ioctl(bdrv, SG_IO, &io_header); 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 -1;
}
return (buf[9] << 16) | (buf[10] << 8) | buf[11]; return (buf[9] << 16) | (buf[10] << 8) | buf[11];
} }