SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

file-posix: remove incorrect coroutine_fn calls

Browse Source 
raw_co_getlength is called by handle_aiocb_write_zeroes, which is not a coroutine
function.  This is harmless because raw_co_getlength does not actually suspend,
but in the interest of clarity make it a non-coroutine_fn that is just wrapped
by the coroutine_fn raw_co_getlength.  Likewise, check_cache_dropped was only
a coroutine_fn because it called raw_co_getlength, so it can be made non-coroutine
as well.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-ID: <20230601115145.196465-2-pbonzini@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Paolo Bonzini 2023-06-01 13:51:34 +02:00 committed by Kevin Wolf
parent 3cce22defb
commit 36c6c8773a
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
block/file-posix.c
View File

@ -193,7 +193,7 @@ static int fd_open(BlockDriverState *bs)
return -EIO; return -EIO;
} }
static int64_t coroutine_fn raw_co_getlength(BlockDriverState *bs); static int64_t raw_getlength(BlockDriverState *bs);
typedef struct RawPosixAIOData { typedef struct RawPosixAIOData {
BlockDriverState *bs; BlockDriverState *bs;
@ -1974,7 +1974,7 @@ static int handle_aiocb_write_zeroes(void *opaque)
#ifdef CONFIG_FALLOCATE #ifdef CONFIG_FALLOCATE
/* Last resort: we are trying to extend the file with zeroed data. This /* Last resort: we are trying to extend the file with zeroed data. This
* can be done via fallocate(fd, 0) */ * can be done via fallocate(fd, 0) */
len = raw_co_getlength(aiocb->bs); len = raw_getlength(aiocb->bs);
if (s->has_fallocate && len >= 0 && aiocb->aio_offset >= len) { if (s->has_fallocate && len >= 0 && aiocb->aio_offset >= len) {
int ret = do_fallocate(s->fd, 0, aiocb->aio_offset, aiocb->aio_nbytes); int ret = do_fallocate(s->fd, 0, aiocb->aio_offset, aiocb->aio_nbytes);
if (ret == 0 || ret != -ENOTSUP) { if (ret == 0 || ret != -ENOTSUP) {
@ -2666,7 +2666,7 @@ static int coroutine_fn raw_co_truncate(BlockDriverState *bs, int64_t offset,
} }
if (S_ISCHR(st.st_mode) || S_ISBLK(st.st_mode)) { if (S_ISCHR(st.st_mode) || S_ISBLK(st.st_mode)) {
int64_t cur_length = raw_co_getlength(bs); int64_t cur_length = raw_getlength(bs);
if (offset != cur_length && exact) { if (offset != cur_length && exact) {
error_setg(errp, "Cannot resize device files"); error_setg(errp, "Cannot resize device files");
@ -2684,7 +2684,7 @@ static int coroutine_fn raw_co_truncate(BlockDriverState *bs, int64_t offset,
} }
#ifdef __OpenBSD__ #ifdef __OpenBSD__
static int64_t coroutine_fn raw_co_getlength(BlockDriverState *bs) static int64_t raw_getlength(BlockDriverState *bs)
{ {
BDRVRawState *s = bs->opaque; BDRVRawState *s = bs->opaque;
int fd = s->fd; int fd = s->fd;
@ -2703,7 +2703,7 @@ static int64_t coroutine_fn raw_co_getlength(BlockDriverState *bs)
return st.st_size; return st.st_size;
} }
#elif defined(__NetBSD__) #elif defined(__NetBSD__)
static int64_t coroutine_fn raw_co_getlength(BlockDriverState *bs) static int64_t raw_getlength(BlockDriverState *bs)
{ {
BDRVRawState *s = bs->opaque; BDRVRawState *s = bs->opaque;
int fd = s->fd; int fd = s->fd;
@ -2728,7 +2728,7 @@ static int64_t coroutine_fn raw_co_getlength(BlockDriverState *bs)
return st.st_size; return st.st_size;
} }
#elif defined(__sun__) #elif defined(__sun__)
static int64_t coroutine_fn raw_co_getlength(BlockDriverState *bs) static int64_t raw_getlength(BlockDriverState *bs)
{ {
BDRVRawState *s = bs->opaque; BDRVRawState *s = bs->opaque;
struct dk_minfo minfo; struct dk_minfo minfo;
@ -2759,7 +2759,7 @@ static int64_t coroutine_fn raw_co_getlength(BlockDriverState *bs)
return size; return size;
} }
#elif defined(CONFIG_BSD) #elif defined(CONFIG_BSD)
static int64_t coroutine_fn raw_co_getlength(BlockDriverState *bs) static int64_t raw_getlength(BlockDriverState *bs)
{ {
BDRVRawState *s = bs->opaque; BDRVRawState *s = bs->opaque;
int fd = s->fd; int fd = s->fd;
@ -2831,7 +2831,7 @@ again:
return size; return size;
} }
#else #else
static int64_t coroutine_fn raw_co_getlength(BlockDriverState *bs) static int64_t raw_getlength(BlockDriverState *bs)
{ {
BDRVRawState *s = bs->opaque; BDRVRawState *s = bs->opaque;
int ret; int ret;
@ -2850,6 +2850,11 @@ static int64_t coroutine_fn raw_co_getlength(BlockDriverState *bs)
} }
#endif #endif
static int64_t coroutine_fn raw_co_getlength(BlockDriverState *bs)
{
return raw_getlength(bs);
}
static int64_t coroutine_fn raw_co_get_allocated_file_size(BlockDriverState *bs) static int64_t coroutine_fn raw_co_get_allocated_file_size(BlockDriverState *bs)
{ {
struct stat st; struct stat st;
@ -3215,7 +3220,7 @@ static int coroutine_fn raw_co_block_status(BlockDriverState *bs,
* round up if necessary. * round up if necessary.
*/ */
if (!QEMU_IS_ALIGNED(*pnum, bs->bl.request_alignment)) { if (!QEMU_IS_ALIGNED(*pnum, bs->bl.request_alignment)) {
int64_t file_length = raw_co_getlength(bs); int64_t file_length = raw_getlength(bs);
if (file_length > 0) { if (file_length > 0) {
/* Ignore errors, this is just a safeguard */ /* Ignore errors, this is just a safeguard */
assert(hole == file_length); assert(hole == file_length);
@ -3237,7 +3242,7 @@ static int coroutine_fn raw_co_block_status(BlockDriverState *bs,
#if defined(__linux__) #if defined(__linux__)
/* Verify that the file is not in the page cache */ /* Verify that the file is not in the page cache */
static void coroutine_fn check_cache_dropped(BlockDriverState *bs, Error **errp) static void check_cache_dropped(BlockDriverState *bs, Error **errp)
{ {
const size_t window_size = 128 * 1024 * 1024; const size_t window_size = 128 * 1024 * 1024;
BDRVRawState *s = bs->opaque; BDRVRawState *s = bs->opaque;
@ -3252,7 +3257,7 @@ static void coroutine_fn check_cache_dropped(BlockDriverState *bs, Error **errp)
page_size = sysconf(_SC_PAGESIZE); page_size = sysconf(_SC_PAGESIZE);
vec = g_malloc(DIV_ROUND_UP(window_size, page_size)); vec = g_malloc(DIV_ROUND_UP(window_size, page_size));
end = raw_co_getlength(bs); end = raw_getlength(bs);
for (offset = 0; offset < end; offset += window_size) { for (offset = 0; offset < end; offset += window_size) {
void *new_window; void *new_window;
@ -4468,7 +4473,7 @@ static int cdrom_reopen(BlockDriverState *bs)
static bool coroutine_fn cdrom_co_is_inserted(BlockDriverState *bs) static bool coroutine_fn cdrom_co_is_inserted(BlockDriverState *bs)
{ {
return raw_co_getlength(bs) > 0; return raw_getlength(bs) > 0;
} }
static void coroutine_fn cdrom_co_eject(BlockDriverState *bs, bool eject_flag) static void coroutine_fn cdrom_co_eject(BlockDriverState *bs, bool eject_flag)