diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-08-24 18:36:49 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-08-24 18:36:49 +0300 |
| commit | fe6fc7bdaf9b0b13ec40f517113ebc3eefabe548 (patch) | |
| tree | 367007de80911198edf9e9031844ef80fdb38a98 /block/raw-posix.c | |
| parent | Merge commit '4a1418e07bdcfaa3177739e04707ecaec75d89e1' into upstream-merge (diff) | |
| parent | make pthreads mandatory (diff) | |
| download | qemu-kvm-fe6fc7bdaf9b0b13ec40f517113ebc3eefabe548.tar.gz qemu-kvm-fe6fc7bdaf9b0b13ec40f517113ebc3eefabe548.tar.bz2 qemu-kvm-fe6fc7bdaf9b0b13ec40f517113ebc3eefabe548.zip | |
Merge commit '4dd75c702c96ec84db4efe24fcc80a4d7bb32df2' into upstream-merge
* commit '4dd75c702c96ec84db4efe24fcc80a4d7bb32df2':
make pthreads mandatory
qemu: move virtio-pci.o to near pci.o
char: Emit 'CLOSED' events on char device close
cleanup cpu-exec.c, part 0/N: consolidate handle_cpu_signal
unify popen/fopen qemu wrappers
Only build osdep once
Conflicts:
block/raw-posix.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'block/raw-posix.c')
| -rw-r--r-- | block/raw-posix.c | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/block/raw-posix.c b/block/raw-posix.c index b3af76bc7..5584e80b7 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -29,9 +29,7 @@ #include "module.h" #include "compatfd.h" #include <assert.h> -#ifdef CONFIG_AIO #include "posix-aio-compat.h" -#endif #ifdef CONFIG_COCOA #include <paths.h> @@ -491,7 +489,6 @@ static int raw_write(BlockDriverState *bs, int64_t sector_num, return ret; } -#ifdef CONFIG_AIO /***********************************************************/ /* Unix AIO using POSIX AIO */ @@ -723,13 +720,6 @@ static BlockDriverAIOCB *raw_aio_writev(BlockDriverState *bs, } return &acb->common; } -#else /* CONFIG_AIO */ -static int posix_aio_init(void) -{ - return 0; -} -#endif /* CONFIG_AIO */ - static void raw_close(BlockDriverState *bs) { @@ -904,10 +894,8 @@ static BlockDriver bdrv_raw = { .bdrv_create = raw_create, .bdrv_flush = raw_flush, -#ifdef CONFIG_AIO .bdrv_aio_readv = raw_aio_readv, .bdrv_aio_writev = raw_aio_writev, -#endif .bdrv_truncate = raw_truncate, .bdrv_getlength = raw_getlength, @@ -1024,7 +1012,7 @@ static int hdev_open(BlockDriverState *bs, const char *filename, int flags) #endif s->type = FTYPE_FILE; -#if defined(__linux__) && defined(CONFIG_AIO) +#if defined(__linux__) if (strstart(filename, "/dev/sg", NULL)) { bs->sg = 1; } @@ -1090,7 +1078,6 @@ static int hdev_ioctl(BlockDriverState *bs, unsigned long int req, void *buf) return ioctl(s->fd, req, buf); } -#ifdef CONFIG_AIO static BlockDriverAIOCB *hdev_aio_ioctl(BlockDriverState *bs, unsigned long int req, void *buf, BlockDriverCompletionFunc *cb, void *opaque) @@ -1121,7 +1108,6 @@ static BlockDriverAIOCB *hdev_aio_ioctl(BlockDriverState *bs, return &acb->common; } -#endif #elif defined(__FreeBSD__) static int fd_open(BlockDriverState *bs) @@ -1181,10 +1167,8 @@ static BlockDriver bdrv_host_device = { .bdrv_create = hdev_create, .bdrv_flush = raw_flush, -#ifdef CONFIG_AIO .bdrv_aio_readv = raw_aio_readv, .bdrv_aio_writev = raw_aio_writev, -#endif .bdrv_read = raw_read, .bdrv_write = raw_write, @@ -1193,10 +1177,8 @@ static BlockDriver bdrv_host_device = { /* generic scsi device */ #ifdef __linux__ .bdrv_ioctl = hdev_ioctl, -#ifdef CONFIG_AIO .bdrv_aio_ioctl = hdev_aio_ioctl, #endif -#endif }; #ifdef __linux__ @@ -1281,10 +1263,8 @@ static BlockDriver bdrv_host_floppy = { .bdrv_create = hdev_create, .bdrv_flush = raw_flush, -#ifdef CONFIG_AIO .bdrv_aio_readv = raw_aio_readv, .bdrv_aio_writev = raw_aio_writev, -#endif .bdrv_read = raw_read, .bdrv_write = raw_write, @@ -1363,10 +1343,8 @@ static BlockDriver bdrv_host_cdrom = { .bdrv_create = hdev_create, .bdrv_flush = raw_flush, -#ifdef CONFIG_AIO .bdrv_aio_readv = raw_aio_readv, .bdrv_aio_writev = raw_aio_writev, -#endif .bdrv_read = raw_read, .bdrv_write = raw_write, @@ -1379,9 +1357,7 @@ static BlockDriver bdrv_host_cdrom = { /* generic scsi device */ .bdrv_ioctl = hdev_ioctl, -#ifdef CONFIG_AIO .bdrv_aio_ioctl = hdev_aio_ioctl, -#endif }; #endif /* __linux__ */ @@ -1486,10 +1462,8 @@ static BlockDriver bdrv_host_cdrom = { .bdrv_create = hdev_create, .bdrv_flush = raw_flush, -#ifdef CONFIG_AIO .bdrv_aio_readv = raw_aio_readv, .bdrv_aio_writev = raw_aio_writev, -#endif .bdrv_read = raw_read, .bdrv_write = raw_write, |