[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 08/19] block: purge s->aligned_buf and s->aligned
From: |
Jeff Cody |
Subject: |
[Qemu-devel] [PATCH v4 08/19] block: purge s->aligned_buf and s->aligned_buf_size from raw-posix.c |
Date: |
Thu, 20 Sep 2012 15:13:24 -0400 |
The aligned_buf pointer and aligned_buf size are no longer used in
raw_posix.c, so remove all references to them.
Signed-off-by: Jeff Cody <address@hidden>
---
block/raw-posix.c | 21 +--------------------
1 file changed, 1 insertion(+), 20 deletions(-)
diff --git a/block/raw-posix.c b/block/raw-posix.c
index 1e727eb..0ffb3d0 100644
--- a/block/raw-posix.c
+++ b/block/raw-posix.c
@@ -133,8 +133,6 @@ typedef struct BDRVRawState {
int use_aio;
void *aio_ctx;
#endif
- uint8_t *aligned_buf;
- unsigned aligned_buf_size;
#ifdef CONFIG_XFS
bool is_xfs : 1;
#endif
@@ -259,23 +257,10 @@ static int raw_open_common(BlockDriverState *bs, const
char *filename,
return ret;
}
s->fd = fd;
- s->aligned_buf = NULL;
-
- if ((bdrv_flags & BDRV_O_NOCACHE)) {
- /*
- * Allocate a buffer for read/modify/write cycles. Chose the size
- * pessimistically as we don't know the block size yet.
- */
- s->aligned_buf_size = 32 * MAX_BLOCKSIZE;
- s->aligned_buf = qemu_memalign(MAX_BLOCKSIZE, s->aligned_buf_size);
- if (s->aligned_buf == NULL) {
- goto out_close;
- }
- }
/* We're falling back to POSIX AIO in some cases so init always */
if (paio_init() < 0) {
- goto out_free_buf;
+ goto out_close;
}
#ifdef CONFIG_LINUX_AIO
@@ -292,8 +277,6 @@ static int raw_open_common(BlockDriverState *bs, const char
*filename,
return 0;
-out_free_buf:
- qemu_vfree(s->aligned_buf);
out_close:
qemu_close(fd);
return -errno;
@@ -402,8 +385,6 @@ static void raw_close(BlockDriverState *bs)
if (s->fd >= 0) {
qemu_close(s->fd);
s->fd = -1;
- if (s->aligned_buf != NULL)
- qemu_vfree(s->aligned_buf);
}
}
--
1.7.11.4
- [Qemu-devel] [PATCH v4 00/19] block: bdrv_reopen() patches, Jeff Cody, 2012/09/20
- [Qemu-devel] [PATCH v4 02/19] block: make bdrv_set_enable_write_cache() modify open_flags, Jeff Cody, 2012/09/20
- [Qemu-devel] [PATCH v4 03/19] block: Framework for reopening files safely, Jeff Cody, 2012/09/20
- [Qemu-devel] [PATCH v4 04/19] block: move aio initialization into a helper function, Jeff Cody, 2012/09/20
- [Qemu-devel] [PATCH v4 01/19] block: correctly set the keep_read_only flag, Jeff Cody, 2012/09/20
- [Qemu-devel] [PATCH v4 06/19] block: do not parse BDRV_O_CACHE_WB in block drivers, Jeff Cody, 2012/09/20
- [Qemu-devel] [PATCH v4 07/19] block: use BDRV_O_NOCACHE instead of s->aligned_buf in raw-posix.c, Jeff Cody, 2012/09/20
- [Qemu-devel] [PATCH v4 05/19] block: move open flag parsing in raw block drivers to helper functions, Jeff Cody, 2012/09/20
- [Qemu-devel] [PATCH v4 09/19] block: raw-posix image file reopen, Jeff Cody, 2012/09/20
- [Qemu-devel] [PATCH v4 08/19] block: purge s->aligned_buf and s->aligned_buf_size from raw-posix.c,
Jeff Cody <=
- [Qemu-devel] [PATCH v4 12/19] block: qcow2 image file reopen, Jeff Cody, 2012/09/20
- [Qemu-devel] [PATCH v4 19/19] block: remove keep_read_only flag from BlockDriverState struct, Jeff Cody, 2012/09/20
- [Qemu-devel] [PATCH v4 10/19] block: raw image file reopen, Jeff Cody, 2012/09/20
- [Qemu-devel] [PATCH v4 17/19] block: vpc image file reopen, Jeff Cody, 2012/09/20
- [Qemu-devel] [PATCH v4 18/19] block: convert bdrv_commit() to use bdrv_reopen(), Jeff Cody, 2012/09/20
- [Qemu-devel] [PATCH v4 15/19] block: raw-win32 driver reopen support, Jeff Cody, 2012/09/20