Fix the build for --disable-aio
This was reported by malc. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6993 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
59030a8cd4
commit
8185d2c9a2
|
@ -1018,8 +1018,10 @@ static int hdev_open(BlockDriverState *bs, const char *filename, int flags)
|
||||||
s->fd_open_flags = open_flags;
|
s->fd_open_flags = open_flags;
|
||||||
/* open will not fail even if no floppy is inserted */
|
/* open will not fail even if no floppy is inserted */
|
||||||
open_flags |= O_NONBLOCK;
|
open_flags |= O_NONBLOCK;
|
||||||
|
#ifdef CONFIG_AIO
|
||||||
} else if (strstart(filename, "/dev/sg", NULL)) {
|
} else if (strstart(filename, "/dev/sg", NULL)) {
|
||||||
bs->sg = 1;
|
bs->sg = 1;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#if defined(__FreeBSD__)
|
#if defined(__FreeBSD__)
|
||||||
|
@ -1210,6 +1212,7 @@ static int raw_ioctl(BlockDriverState *bs, unsigned long int req, void *buf)
|
||||||
return ioctl(s->fd, req, buf);
|
return ioctl(s->fd, req, buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef CONFIG_AIO
|
||||||
static BlockDriverAIOCB *raw_aio_ioctl(BlockDriverState *bs,
|
static BlockDriverAIOCB *raw_aio_ioctl(BlockDriverState *bs,
|
||||||
unsigned long int req, void *buf,
|
unsigned long int req, void *buf,
|
||||||
BlockDriverCompletionFunc *cb, void *opaque)
|
BlockDriverCompletionFunc *cb, void *opaque)
|
||||||
|
@ -1228,6 +1231,7 @@ static BlockDriverAIOCB *raw_aio_ioctl(BlockDriverState *bs,
|
||||||
|
|
||||||
return &acb->common;
|
return &acb->common;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
#elif defined(__FreeBSD__)
|
#elif defined(__FreeBSD__)
|
||||||
|
|
||||||
|
@ -1439,5 +1443,7 @@ BlockDriver bdrv_host_device = {
|
||||||
.bdrv_set_locked = raw_set_locked,
|
.bdrv_set_locked = raw_set_locked,
|
||||||
/* generic scsi device */
|
/* generic scsi device */
|
||||||
.bdrv_ioctl = raw_ioctl,
|
.bdrv_ioctl = raw_ioctl,
|
||||||
|
#ifdef CONFIG_AIO
|
||||||
.bdrv_aio_ioctl = raw_aio_ioctl,
|
.bdrv_aio_ioctl = raw_aio_ioctl,
|
||||||
|
#endif
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue