Commit 0d4377b3 authored by Kevin Wolf's avatar Kevin Wolf
Browse files

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: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
parent 48af776a

block/raw-posix.c

+13 −3
Original line number Diff line number Diff line
@@ -2069,13 +2069,23 @@ static bool hdev_is_sg(BlockDriverState *bs) 


#if defined(__linux__)



    BDRVRawState *s = bs->opaque;

    struct stat st;

    struct sg_scsi_id scsiid;

    int sg_version;

    int ret;



    if (stat(bs->filename, &st) < 0 || !S_ISCHR(st.st_mode)) {

        return false;

    }



    if (stat(bs->filename, &st) >= 0 && S_ISCHR(st.st_mode) &&

        !bdrv_ioctl(bs, SG_GET_VERSION_NUM, &sg_version) &&

        !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",

            scsiid.scsi_type, sg_version);

        return true;