diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-12-07 11:04:32 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-12-07 11:04:32 +0200 |
| commit | 149d76049af52aa76f4665b6bc9bdbd5904a8588 (patch) | |
| tree | e07c6dfe28f03438dff9bb07240a7534c010f990 /block/raw-posix.c | |
| parent | Merge commit 'e9b2e81889d9877415710484b876ee57a42b0bcb' into upstream-merge (diff) | |
| parent | Don't leak file descriptors (diff) | |
| download | qemu-kvm-149d76049af52aa76f4665b6bc9bdbd5904a8588.tar.gz qemu-kvm-149d76049af52aa76f4665b6bc9bdbd5904a8588.tar.bz2 qemu-kvm-149d76049af52aa76f4665b6bc9bdbd5904a8588.zip | |
Merge commit '40ff6d7e8dceca227e7f8a3e8e0d58b2c66d19b4' into upstream-merge
* commit '40ff6d7e8dceca227e7f8a3e8e0d58b2c66d19b4':
Don't leak file descriptors
qemu-img: There is more than one host device driver
qcow2: Fix some more qemu_malloc fallout
qcow2: Store exact backing format length
virtio-blk: Implement rerror option
ide: Implement rerror option
Conflicts:
posix-aio-compat.c
Extended qemu_set_cloexec() to compatfd.c.
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'block/raw-posix.c')
| -rw-r--r-- | block/raw-posix.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/block/raw-posix.c b/block/raw-posix.c index 7446ca931..6dcc65189 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -155,7 +155,7 @@ static int raw_open_common(BlockDriverState *bs, const char *filename, s->open_flags |= O_DSYNC; s->fd = -1; - fd = open(filename, s->open_flags, 0644); + fd = qemu_open(filename, s->open_flags, 0644); if (fd < 0) { ret = -errno; if (ret == -EROFS) @@ -1016,6 +1016,7 @@ static BlockDriver bdrv_host_device = { .bdrv_close = raw_close, .bdrv_create = hdev_create, .create_options = raw_create_options, + .no_zero_init = 1, .bdrv_flush = raw_flush, .bdrv_aio_readv = raw_aio_readv, @@ -1112,6 +1113,7 @@ static BlockDriver bdrv_host_floppy = { .bdrv_close = raw_close, .bdrv_create = hdev_create, .create_options = raw_create_options, + .no_zero_init = 1, .bdrv_flush = raw_flush, .bdrv_aio_readv = raw_aio_readv, @@ -1194,6 +1196,7 @@ static BlockDriver bdrv_host_cdrom = { .bdrv_close = raw_close, .bdrv_create = hdev_create, .create_options = raw_create_options, + .no_zero_init = 1, .bdrv_flush = raw_flush, .bdrv_aio_readv = raw_aio_readv, @@ -1315,6 +1318,7 @@ static BlockDriver bdrv_host_cdrom = { .bdrv_close = raw_close, .bdrv_create = hdev_create, .create_options = raw_create_options, + .no_zero_init = 1, .bdrv_flush = raw_flush, .bdrv_aio_readv = raw_aio_readv, |