ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

raw-posix: Don't use bdrv_ioctl() 

Instead of letting raw-posix use the bdrv_ioctl() abstraction to issue
an ioctl to itself, just call ioctl() directly.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Kevin Wolf 2016-10-20 14:50:12 +02:00
parent 48af776a5b
commit 0d4377b3ea
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
block/raw-posix.c
View File

@ -2069,13 +2069,23 @@ static bool hdev_is_sg(BlockDriverState *bs)
#if defined(__linux__) #if defined(__linux__)
BDRVRawState *s = bs->opaque;
struct stat st; struct stat st;
struct sg_scsi_id scsiid; struct sg_scsi_id scsiid;
int sg_version; int sg_version;
int ret;
if (stat(bs->filename, &st) >= 0 && S_ISCHR(st.st_mode) && if (stat(bs->filename, &st) < 0 || !S_ISCHR(st.st_mode)) {
!bdrv_ioctl(bs, SG_GET_VERSION_NUM, &sg_version) && return false;
!bdrv_ioctl(bs, SG_GET_SCSI_ID, &scsiid)) { }
ret = ioctl(s->fd, SG_GET_VERSION_NUM, &sg_version);
if (ret < 0) {
return false;
}
ret = ioctl(s->fd, SG_GET_SCSI_ID, &scsiid);
if (ret >= 0) {
DPRINTF("SG device found: type=%d, version=%d\n", DPRINTF("SG device found: type=%d, version=%d\n",
scsiid.scsi_type, sg_version); scsiid.scsi_type, sg_version);
return true; return true;