david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

block: purge s->aligned_buf and s->aligned_buf_size from raw-posix.c

Browse Source 
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 <jcody@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Jeff Cody 2012-09-20 15:13:24 -04:00 committed by Kevin Wolf
parent 9acc5a06d4
commit 3d1807ac67
1 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
block/raw-posix.c
View File

@ -133,8 +133,6 @@ typedef struct BDRVRawState {
int use_aio; int use_aio;
void *aio_ctx; void *aio_ctx;
#endif #endif
uint8_t *aligned_buf;
unsigned aligned_buf_size;
#ifdef CONFIG_XFS #ifdef CONFIG_XFS
bool is_xfs : 1; bool is_xfs : 1;
#endif #endif
@ -259,23 +257,10 @@ static int raw_open_common(BlockDriverState *bs, const char *filename,
return ret; return ret;
} }
s->fd = fd; 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 */ /* We're falling back to POSIX AIO in some cases so init always */
if (paio_init() < 0) { if (paio_init() < 0) {
goto out_free_buf; goto out_close;
} }
#ifdef CONFIG_LINUX_AIO #ifdef CONFIG_LINUX_AIO
@ -292,8 +277,6 @@ static int raw_open_common(BlockDriverState *bs, const char *filename,
return 0; return 0;
out_free_buf:
qemu_vfree(s->aligned_buf);
out_close: out_close:
qemu_close(fd); qemu_close(fd);
return -errno; return -errno;
@ -402,8 +385,6 @@ static void raw_close(BlockDriverState *bs)
if (s->fd >= 0) { if (s->fd >= 0) {
qemu_close(s->fd); qemu_close(s->fd);
s->fd = -1; s->fd = -1;
if (s->aligned_buf != NULL)
qemu_vfree(s->aligned_buf);
} }
} }