| Message ID | 20200910103059.987-4-luoyonggang@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | W32, W64 msys2/mingw patches | expand |
> Am 10.09.2020 um 12:30 schrieb Yonggang Luo <luoyonggang@gmail.com>: > > These compiling errors are fixed: > ../block/nfs.c:27:10: fatal error: poll.h: No such file or directory > 27 | #include <poll.h> > | ^~~~~~~~ > compilation terminated. > > ../block/nfs.c:63:5: error: unknown type name 'blkcnt_t' > 63 | blkcnt_t st_blocks; > | ^~~~~~~~ > ../block/nfs.c: In function 'nfs_client_open': > ../block/nfs.c:550:27: error: 'struct _stat64' has no member named 'st_blocks' > 550 | client->st_blocks = st.st_blocks; > | ^ > ../block/nfs.c: In function 'nfs_get_allocated_file_size': > ../block/nfs.c:751:41: error: 'struct _stat64' has no member named 'st_blocks' > 751 | return (task.ret < 0 ? task.ret : st.st_blocks * 512); > | ^ > ../block/nfs.c: In function 'nfs_reopen_prepare': > ../block/nfs.c:805:31: error: 'struct _stat64' has no member named 'st_blocks' > 805 | client->st_blocks = st.st_blocks; > | ^ > ../block/nfs.c: In function 'nfs_get_allocated_file_size': > ../block/nfs.c:752:1: error: control reaches end of non-void function [-Werror=return-type] > 752 | } > | ^ > > On msys2/mingw, there is no st_blocks in struct _stat64, so we use consistence st_size instead. > > Signed-off-by: Yonggang Luo <luoyonggang@gmail.com> > --- > block/nfs.c | 32 +++++++++++++++++++++++++------- > 1 file changed, 25 insertions(+), 7 deletions(-) > > diff --git a/block/nfs.c b/block/nfs.c > index 61a249a9fc..db6d8c2d2b 100644 > --- a/block/nfs.c > +++ b/block/nfs.c > @@ -24,7 +24,9 @@ > > #include "qemu/osdep.h" > > +#if !defined(_WIN32) > #include <poll.h> > +#endif > #include "qemu/config-file.h" > #include "qemu/error-report.h" > #include "qapi/error.h" > @@ -51,6 +53,13 @@ > #define QEMU_NFS_MAX_PAGECACHE_SIZE (8388608 / NFS_BLKSIZE) > #define QEMU_NFS_MAX_DEBUG_LEVEL 2 > > +#if defined (_WIN32) > +#define nfs_stat __stat64 > +typedef long long blkcnt_t; > +#else > +#define nfs_stat stat > +#endif > + > typedef struct NFSClient { > struct nfs_context *context; > struct nfsfh *fh; > @@ -70,7 +79,7 @@ typedef struct NFSRPC { > int ret; > int complete; > QEMUIOVector *iov; > - struct stat *st; > + struct nfs_stat *st; > Coroutine *co; > NFSClient *client; > } NFSRPC; > @@ -415,11 +424,20 @@ static void nfs_file_close(BlockDriverState *bs) > nfs_client_close(client); > } > > +static blkcnt_t nfs_get_st_blocks(const struct nfs_stat *st) > +{ > +#if defined(_WIN32) > + return (st->st_size + 511) / 512; > +#else > + return st->st_blocks; > +#endif > +} > + > static int64_t nfs_client_open(NFSClient *client, BlockdevOptionsNfs *opts, > int flags, int open_flags, Error **errp) > { > int64_t ret = -EINVAL; > - struct stat st; > + struct nfs_stat st; > char *file = NULL, *strp = NULL; > > qemu_mutex_init(&client->mutex); > @@ -545,7 +563,7 @@ static int64_t nfs_client_open(NFSClient *client, BlockdevOptionsNfs *opts, > } > > ret = DIV_ROUND_UP(st.st_size, BDRV_SECTOR_SIZE); > - client->st_blocks = st.st_blocks; > + client->st_blocks = nfs_get_st_blocks(&st); > client->has_zero_init = S_ISREG(st.st_mode); > *strp = '/'; > goto out; > @@ -729,7 +747,7 @@ static int64_t nfs_get_allocated_file_size(BlockDriverState *bs) > { > NFSClient *client = bs->opaque; > NFSRPC task = {0}; > - struct stat st; > + struct nfs_stat st; > > if (bdrv_is_read_only(bs) && > !(bs->open_flags & BDRV_O_NOCACHE)) { > @@ -746,7 +764,7 @@ static int64_t nfs_get_allocated_file_size(BlockDriverState *bs) > nfs_set_events(client); > BDRV_POLL_WHILE(bs, !task.complete); > > - return (task.ret < 0 ? task.ret : st.st_blocks * 512); > + return (task.ret < 0 ? task.ret : nfs_get_st_blocks(&st) * 512); > } > > static int coroutine_fn > @@ -778,7 +796,7 @@ static int nfs_reopen_prepare(BDRVReopenState *state, > BlockReopenQueue *queue, Error **errp) > { > NFSClient *client = state->bs->opaque; > - struct stat st; > + struct nfs_stat st; > int ret = 0; > > if (state->flags & BDRV_O_RDWR && bdrv_is_read_only(state->bs)) { > @@ -800,7 +818,7 @@ static int nfs_reopen_prepare(BDRVReopenState *state, > nfs_get_error(client->context)); > return ret; > } > - client->st_blocks = st.st_blocks; > + client->st_blocks = nfs_get_st_blocks(&st); > } > > return 0; > -- > 2.28.0.windows.1 You still implement nfs_get_allocated_file_size without actually returning the allocated file size on WIN32. I would simply do this: diff --git a/block/nfs.c b/block/nfs.c index 61a249a..0983143 100644 --- a/block/nfs.c +++ b/block/nfs.c @@ -24,7 +24,9 @@ #include "qemu/osdep.h" +#if !defined(_WIN32) #include <poll.h> +#endif #include "qemu/config-file.h" #include "qemu/error-report.h" #include "qapi/error.h" @@ -58,7 +60,9 @@ typedef struct NFSClient { bool has_zero_init; AioContext *aio_context; QemuMutex mutex; +#if !defined(_WIN32) blkcnt_t st_blocks; +#endif bool cache_used; NFSServer *server; char *path; @@ -545,7 +549,9 @@ static int64_t nfs_client_open(NFSClient *client, BlockdevOptionsNfs *opts, } ret = DIV_ROUND_UP(st.st_size, BDRV_SECTOR_SIZE); +#if !defined(_WIN32) client->st_blocks = st.st_blocks; +#endif client->has_zero_init = S_ISREG(st.st_mode); *strp = '/'; goto out; @@ -706,6 +712,8 @@ static int nfs_has_zero_init(BlockDriverState *bs) return client->has_zero_init; } + +#if !defined(_WIN32) /* Called (via nfs_service) with QemuMutex held. */ static void nfs_get_allocated_file_size_cb(int ret, struct nfs_context *nfs, void *data, @@ -748,6 +756,7 @@ static int64_t nfs_get_allocated_file_size(BlockDriverState *bs) return (task.ret < 0 ? task.ret : st.st_blocks * 512); } +#endif static int coroutine_fn nfs_file_co_truncate(BlockDriverState *bs, int64_t offset, bool exact, @@ -792,6 +801,7 @@ static int nfs_reopen_prepare(BDRVReopenState *state, return -EINVAL; } +#if !defined(_WIN32) /* Update cache for read-only reopens */ if (!(state->flags & BDRV_O_RDWR)) { ret = nfs_fstat(client->context, client->fh, &st); @@ -802,6 +812,7 @@ static int nfs_reopen_prepare(BDRVReopenState *state, } client->st_blocks = st.st_blocks; } +#endif return 0; } @@ -869,7 +880,9 @@ static BlockDriver bdrv_nfs = { .create_opts = &nfs_create_opts, .bdrv_has_zero_init = nfs_has_zero_init, +#if !defined(_WIN32) .bdrv_get_allocated_file_size = nfs_get_allocated_file_size, +#endif .bdrv_co_truncate = nfs_file_co_truncate, .bdrv_file_open = nfs_file_open, Best, Peter
On Fri, Sep 11, 2020 at 4:16 AM Peter Lieven <pl@kamp.de> wrote: > > > Am 10.09.2020 um 12:30 schrieb Yonggang Luo <luoyonggang@gmail.com>: > > These compiling errors are fixed: > ../block/nfs.c:27:10: fatal error: poll.h: No such file or directory > 27 | #include <poll.h> > | ^~~~~~~~ > compilation terminated. > > ../block/nfs.c:63:5: error: unknown type name 'blkcnt_t' > 63 | blkcnt_t st_blocks; > | ^~~~~~~~ > ../block/nfs.c: In function 'nfs_client_open': > ../block/nfs.c:550:27: error: 'struct _stat64' has no member named > 'st_blocks' > 550 | client->st_blocks = st.st_blocks; > | ^ > ../block/nfs.c: In function 'nfs_get_allocated_file_size': > ../block/nfs.c:751:41: error: 'struct _stat64' has no member named > 'st_blocks' > 751 | return (task.ret < 0 ? task.ret : st.st_blocks * 512); > | ^ > ../block/nfs.c: In function 'nfs_reopen_prepare': > ../block/nfs.c:805:31: error: 'struct _stat64' has no member named > 'st_blocks' > 805 | client->st_blocks = st.st_blocks; > | ^ > ../block/nfs.c: In function 'nfs_get_allocated_file_size': > ../block/nfs.c:752:1: error: control reaches end of non-void function > [-Werror=return-type] > 752 | } > | ^ > > On msys2/mingw, there is no st_blocks in struct _stat64, so we use > consistence st_size instead. > > Signed-off-by: Yonggang Luo <luoyonggang@gmail.com> > --- > block/nfs.c | 32 +++++++++++++++++++++++++------- > 1 file changed, 25 insertions(+), 7 deletions(-) > > diff --git a/block/nfs.c b/block/nfs.c > index 61a249a9fc..db6d8c2d2b 100644 > --- a/block/nfs.c > +++ b/block/nfs.c > @@ -24,7 +24,9 @@ > > #include "qemu/osdep.h" > > +#if !defined(_WIN32) > #include <poll.h> > +#endif > #include "qemu/config-file.h" > #include "qemu/error-report.h" > #include "qapi/error.h" > @@ -51,6 +53,13 @@ > #define QEMU_NFS_MAX_PAGECACHE_SIZE (8388608 / NFS_BLKSIZE) > #define QEMU_NFS_MAX_DEBUG_LEVEL 2 > > +#if defined (_WIN32) > +#define nfs_stat __stat64 > +typedef long long blkcnt_t; > +#else > +#define nfs_stat stat > +#endif > + > typedef struct NFSClient { > struct nfs_context *context; > struct nfsfh *fh; > @@ -70,7 +79,7 @@ typedef struct NFSRPC { > int ret; > int complete; > QEMUIOVector *iov; > - struct stat *st; > + struct nfs_stat *st; > Coroutine *co; > NFSClient *client; > } NFSRPC; > @@ -415,11 +424,20 @@ static void nfs_file_close(BlockDriverState *bs) > nfs_client_close(client); > } > > +static blkcnt_t nfs_get_st_blocks(const struct nfs_stat *st) > +{ > +#if defined(_WIN32) > + return (st->st_size + 511) / 512; > +#else > + return st->st_blocks; > +#endif > +} > + > static int64_t nfs_client_open(NFSClient *client, BlockdevOptionsNfs *opts, > int flags, int open_flags, Error **errp) > { > int64_t ret = -EINVAL; > - struct stat st; > + struct nfs_stat st; > char *file = NULL, *strp = NULL; > > qemu_mutex_init(&client->mutex); > @@ -545,7 +563,7 @@ static int64_t nfs_client_open(NFSClient *client, > BlockdevOptionsNfs *opts, > } > > ret = DIV_ROUND_UP(st.st_size, BDRV_SECTOR_SIZE); > - client->st_blocks = st.st_blocks; > + client->st_blocks = nfs_get_st_blocks(&st); > client->has_zero_init = S_ISREG(st.st_mode); > *strp = '/'; > goto out; > @@ -729,7 +747,7 @@ static int64_t > nfs_get_allocated_file_size(BlockDriverState *bs) > { > NFSClient *client = bs->opaque; > NFSRPC task = {0}; > - struct stat st; > + struct nfs_stat st; > > if (bdrv_is_read_only(bs) && > !(bs->open_flags & BDRV_O_NOCACHE)) { > @@ -746,7 +764,7 @@ static int64_t > nfs_get_allocated_file_size(BlockDriverState *bs) > nfs_set_events(client); > BDRV_POLL_WHILE(bs, !task.complete); > > - return (task.ret < 0 ? task.ret : st.st_blocks * 512); > + return (task.ret < 0 ? task.ret : nfs_get_st_blocks(&st) * 512); > } > > static int coroutine_fn > @@ -778,7 +796,7 @@ static int nfs_reopen_prepare(BDRVReopenState *state, > BlockReopenQueue *queue, Error **errp) > { > NFSClient *client = state->bs->opaque; > - struct stat st; > + struct nfs_stat st; > int ret = 0; > > if (state->flags & BDRV_O_RDWR && bdrv_is_read_only(state->bs)) { > @@ -800,7 +818,7 @@ static int nfs_reopen_prepare(BDRVReopenState *state, > nfs_get_error(client->context)); > return ret; > } > - client->st_blocks = st.st_blocks; > + client->st_blocks = nfs_get_st_blocks(&st); > } > > return 0; > -- > 2.28.0.windows.1 > > > > You still implement nfs_get_allocated_file_size without actually returning > the allocated file size on WIN32. > I would simply do this: > > *diff --git a/block/nfs.c b/block/nfs.c* > *index 61a249a..0983143 100644* > *--- a/block/nfs.c* > *+++ b/block/nfs.c* > @@ -24,7 +24,9 @@ > > > #include "qemu/osdep.h" > > > +#if !defined(_WIN32) > #include <poll.h> > +#endif > #include "qemu/config-file.h" > #include "qemu/error-report.h" > #include "qapi/error.h" > @@ -58,7 +60,9 @@ typedef struct NFSClient { > bool has_zero_init; > AioContext *aio_context; > QemuMutex mutex; > +#if !defined(_WIN32) > blkcnt_t st_blocks; > +#endif > bool cache_used; > NFSServer *server; > char *path; > @@ -545,7 +549,9 @@ static int64_t nfs_client_open(NFSClient *client, > BlockdevOptionsNfs *opts, > } > > > ret = DIV_ROUND_UP(st.st_size, BDRV_SECTOR_SIZE); > +#if !defined(_WIN32) > client->st_blocks = st.st_blocks; > +#endif > client->has_zero_init = S_ISREG(st.st_mode); > *strp = '/'; > goto out; > @@ -706,6 +712,8 @@ static int nfs_has_zero_init(BlockDriverState *bs) > return client->has_zero_init; > } > > > + > +#if !defined(_WIN32) > /* Called (via nfs_service) with QemuMutex held. */ > static void > nfs_get_allocated_file_size_cb(int ret, struct nfs_context *nfs, void > *data, > @@ -748,6 +756,7 @@ static int64_t > nfs_get_allocated_file_size(BlockDriverState *bs) > > > return (task.ret < 0 ? task.ret : st.st_blocks * 512); > } > +#endif > > > static int coroutine_fn > nfs_file_co_truncate(BlockDriverState *bs, int64_t offset, bool exact, > @@ -792,6 +801,7 @@ static int nfs_reopen_prepare(BDRVReopenState *state, > return -EINVAL; > } > > > +#if !defined(_WIN32) > /* Update cache for read-only reopens */ > if (!(state->flags & BDRV_O_RDWR)) { > ret = nfs_fstat(client->context, client->fh, &st); > @@ -802,6 +812,7 @@ static int nfs_reopen_prepare(BDRVReopenState *state, > } > client->st_blocks = st.st_blocks; > } > +#endif > > > return 0; > } > @@ -869,7 +880,9 @@ static BlockDriver bdrv_nfs = { > .create_opts = &nfs_create_opts, > > > .bdrv_has_zero_init = nfs_has_zero_init, > +#if !defined(_WIN32) > .bdrv_get_allocated_file_size = nfs_get_allocated_file_size, > +#endif > .bdrv_co_truncate = nfs_file_co_truncate, > > > .bdrv_file_open = nfs_file_open, > > > Best, > Peter > Any git repo have this patch? I can cherry-pick it directly
> Am 10.09.2020 um 22:36 schrieb 罗勇刚(Yonggang Luo) <luoyonggang@gmail.com>: > > > > >> On Fri, Sep 11, 2020 at 4:16 AM Peter Lieven <pl@kamp.de> wrote: >> >> >>> Am 10.09.2020 um 12:30 schrieb Yonggang Luo <luoyonggang@gmail.com>: >>> >>> These compiling errors are fixed: >>> ../block/nfs.c:27:10: fatal error: poll.h: No such file or directory >>> 27 | #include <poll.h> >>> | ^~~~~~~~ >>> compilation terminated. >>> >>> ../block/nfs.c:63:5: error: unknown type name 'blkcnt_t' >>> 63 | blkcnt_t st_blocks; >>> | ^~~~~~~~ >>> ../block/nfs.c: In function 'nfs_client_open': >>> ../block/nfs.c:550:27: error: 'struct _stat64' has no member named 'st_blocks' >>> 550 | client->st_blocks = st.st_blocks; >>> | ^ >>> ../block/nfs.c: In function 'nfs_get_allocated_file_size': >>> ../block/nfs.c:751:41: error: 'struct _stat64' has no member named 'st_blocks' >>> 751 | return (task.ret < 0 ? task.ret : st.st_blocks * 512); >>> | ^ >>> ../block/nfs.c: In function 'nfs_reopen_prepare': >>> ../block/nfs.c:805:31: error: 'struct _stat64' has no member named 'st_blocks' >>> 805 | client->st_blocks = st.st_blocks; >>> | ^ >>> ../block/nfs.c: In function 'nfs_get_allocated_file_size': >>> ../block/nfs.c:752:1: error: control reaches end of non-void function [-Werror=return-type] >>> 752 | } >>> | ^ >>> >>> On msys2/mingw, there is no st_blocks in struct _stat64, so we use consistence st_size instead. >>> >>> Signed-off-by: Yonggang Luo <luoyonggang@gmail.com> >>> --- >>> block/nfs.c | 32 +++++++++++++++++++++++++------- >>> 1 file changed, 25 insertions(+), 7 deletions(-) >>> >>> diff --git a/block/nfs.c b/block/nfs.c >>> index 61a249a9fc..db6d8c2d2b 100644 >>> --- a/block/nfs.c >>> +++ b/block/nfs.c >>> @@ -24,7 +24,9 @@ >>> >>> #include "qemu/osdep.h" >>> >>> +#if !defined(_WIN32) >>> #include <poll.h> >>> +#endif >>> #include "qemu/config-file.h" >>> #include "qemu/error-report.h" >>> #include "qapi/error.h" >>> @@ -51,6 +53,13 @@ >>> #define QEMU_NFS_MAX_PAGECACHE_SIZE (8388608 / NFS_BLKSIZE) >>> #define QEMU_NFS_MAX_DEBUG_LEVEL 2 >>> >>> +#if defined (_WIN32) >>> +#define nfs_stat __stat64 >>> +typedef long long blkcnt_t; >>> +#else >>> +#define nfs_stat stat >>> +#endif >>> + >>> typedef struct NFSClient { >>> struct nfs_context *context; >>> struct nfsfh *fh; >>> @@ -70,7 +79,7 @@ typedef struct NFSRPC { >>> int ret; >>> int complete; >>> QEMUIOVector *iov; >>> - struct stat *st; >>> + struct nfs_stat *st; >>> Coroutine *co; >>> NFSClient *client; >>> } NFSRPC; >>> @@ -415,11 +424,20 @@ static void nfs_file_close(BlockDriverState *bs) >>> nfs_client_close(client); >>> } >>> >>> +static blkcnt_t nfs_get_st_blocks(const struct nfs_stat *st) >>> +{ >>> +#if defined(_WIN32) >>> + return (st->st_size + 511) / 512; >>> +#else >>> + return st->st_blocks; >>> +#endif >>> +} >>> + >>> static int64_t nfs_client_open(NFSClient *client, BlockdevOptionsNfs *opts, >>> int flags, int open_flags, Error **errp) >>> { >>> int64_t ret = -EINVAL; >>> - struct stat st; >>> + struct nfs_stat st; >>> char *file = NULL, *strp = NULL; >>> >>> qemu_mutex_init(&client->mutex); >>> @@ -545,7 +563,7 @@ static int64_t nfs_client_open(NFSClient *client, BlockdevOptionsNfs *opts, >>> } >>> >>> ret = DIV_ROUND_UP(st.st_size, BDRV_SECTOR_SIZE); >>> - client->st_blocks = st.st_blocks; >>> + client->st_blocks = nfs_get_st_blocks(&st); >>> client->has_zero_init = S_ISREG(st.st_mode); >>> *strp = '/'; >>> goto out; >>> @@ -729,7 +747,7 @@ static int64_t nfs_get_allocated_file_size(BlockDriverState *bs) >>> { >>> NFSClient *client = bs->opaque; >>> NFSRPC task = {0}; >>> - struct stat st; >>> + struct nfs_stat st; >>> >>> if (bdrv_is_read_only(bs) && >>> !(bs->open_flags & BDRV_O_NOCACHE)) { >>> @@ -746,7 +764,7 @@ static int64_t nfs_get_allocated_file_size(BlockDriverState *bs) >>> nfs_set_events(client); >>> BDRV_POLL_WHILE(bs, !task.complete); >>> >>> - return (task.ret < 0 ? task.ret : st.st_blocks * 512); >>> + return (task.ret < 0 ? task.ret : nfs_get_st_blocks(&st) * 512); >>> } >>> >>> static int coroutine_fn >>> @@ -778,7 +796,7 @@ static int nfs_reopen_prepare(BDRVReopenState *state, >>> BlockReopenQueue *queue, Error **errp) >>> { >>> NFSClient *client = state->bs->opaque; >>> - struct stat st; >>> + struct nfs_stat st; >>> int ret = 0; >>> >>> if (state->flags & BDRV_O_RDWR && bdrv_is_read_only(state->bs)) { >>> @@ -800,7 +818,7 @@ static int nfs_reopen_prepare(BDRVReopenState *state, >>> nfs_get_error(client->context)); >>> return ret; >>> } >>> - client->st_blocks = st.st_blocks; >>> + client->st_blocks = nfs_get_st_blocks(&st); >>> } >>> >>> return 0; >>> -- >>> 2.28.0.windows.1 >> >> >> You still implement nfs_get_allocated_file_size without actually returning the allocated file size on WIN32. >> I would simply do this: >> >> diff --git a/block/nfs.c b/block/nfs.c >> index 61a249a..0983143 100644 >> --- a/block/nfs.c >> +++ b/block/nfs.c >> @@ -24,7 +24,9 @@ >> >> #include "qemu/osdep.h" >> >> +#if !defined(_WIN32) >> #include <poll.h> >> +#endif >> #include "qemu/config-file.h" >> #include "qemu/error-report.h" >> #include "qapi/error.h" >> @@ -58,7 +60,9 @@ typedef struct NFSClient { >> bool has_zero_init; >> AioContext *aio_context; >> QemuMutex mutex; >> +#if !defined(_WIN32) >> blkcnt_t st_blocks; >> +#endif >> bool cache_used; >> NFSServer *server; >> char *path; >> @@ -545,7 +549,9 @@ static int64_t nfs_client_open(NFSClient *client, BlockdevOptionsNfs *opts, >> } >> >> ret = DIV_ROUND_UP(st.st_size, BDRV_SECTOR_SIZE); >> +#if !defined(_WIN32) >> client->st_blocks = st.st_blocks; >> +#endif >> client->has_zero_init = S_ISREG(st.st_mode); >> *strp = '/'; >> goto out; >> @@ -706,6 +712,8 @@ static int nfs_has_zero_init(BlockDriverState *bs) >> return client->has_zero_init; >> } >> >> + >> +#if !defined(_WIN32) >> /* Called (via nfs_service) with QemuMutex held. */ >> static void >> nfs_get_allocated_file_size_cb(int ret, struct nfs_context *nfs, void *data, >> @@ -748,6 +756,7 @@ static int64_t nfs_get_allocated_file_size(BlockDriverState *bs) >> >> return (task.ret < 0 ? task.ret : st.st_blocks * 512); >> } >> +#endif >> >> static int coroutine_fn >> nfs_file_co_truncate(BlockDriverState *bs, int64_t offset, bool exact, >> @@ -792,6 +801,7 @@ static int nfs_reopen_prepare(BDRVReopenState *state, >> return -EINVAL; >> } >> >> +#if !defined(_WIN32) >> /* Update cache for read-only reopens */ >> if (!(state->flags & BDRV_O_RDWR)) { >> ret = nfs_fstat(client->context, client->fh, &st); >> @@ -802,6 +812,7 @@ static int nfs_reopen_prepare(BDRVReopenState *state, >> } >> client->st_blocks = st.st_blocks; >> } >> +#endif >> >> return 0; >> } >> @@ -869,7 +880,9 @@ static BlockDriver bdrv_nfs = { >> .create_opts = &nfs_create_opts, >> >> .bdrv_has_zero_init = nfs_has_zero_init, >> +#if !defined(_WIN32) >> .bdrv_get_allocated_file_size = nfs_get_allocated_file_size, >> +#endif >> .bdrv_co_truncate = nfs_file_co_truncate, >> >> .bdrv_file_open = nfs_file_open, >> >> >> Best, >> Peter > Any git repo have this patch? I can cherry-pick it directly not yet. but feel free to use this diff for your own patch. otherwise i can setup a branch with this patch on github where you can pick it. Peter
diff --git a/block/nfs.c b/block/nfs.c index 61a249a9fc..db6d8c2d2b 100644 --- a/block/nfs.c +++ b/block/nfs.c @@ -24,7 +24,9 @@ #include "qemu/osdep.h" +#if !defined(_WIN32) #include <poll.h> +#endif #include "qemu/config-file.h" #include "qemu/error-report.h" #include "qapi/error.h" @@ -51,6 +53,13 @@ #define QEMU_NFS_MAX_PAGECACHE_SIZE (8388608 / NFS_BLKSIZE) #define QEMU_NFS_MAX_DEBUG_LEVEL 2 +#if defined (_WIN32) +#define nfs_stat __stat64 +typedef long long blkcnt_t; +#else +#define nfs_stat stat +#endif + typedef struct NFSClient { struct nfs_context *context; struct nfsfh *fh; @@ -70,7 +79,7 @@ typedef struct NFSRPC { int ret; int complete; QEMUIOVector *iov; - struct stat *st; + struct nfs_stat *st; Coroutine *co; NFSClient *client; } NFSRPC; @@ -415,11 +424,20 @@ static void nfs_file_close(BlockDriverState *bs) nfs_client_close(client); } +static blkcnt_t nfs_get_st_blocks(const struct nfs_stat *st) +{ +#if defined(_WIN32) + return (st->st_size + 511) / 512; +#else + return st->st_blocks; +#endif +} + static int64_t nfs_client_open(NFSClient *client, BlockdevOptionsNfs *opts, int flags, int open_flags, Error **errp) { int64_t ret = -EINVAL; - struct stat st; + struct nfs_stat st; char *file = NULL, *strp = NULL; qemu_mutex_init(&client->mutex); @@ -545,7 +563,7 @@ static int64_t nfs_client_open(NFSClient *client, BlockdevOptionsNfs *opts, } ret = DIV_ROUND_UP(st.st_size, BDRV_SECTOR_SIZE); - client->st_blocks = st.st_blocks; + client->st_blocks = nfs_get_st_blocks(&st); client->has_zero_init = S_ISREG(st.st_mode); *strp = '/'; goto out; @@ -729,7 +747,7 @@ static int64_t nfs_get_allocated_file_size(BlockDriverState *bs) { NFSClient *client = bs->opaque; NFSRPC task = {0}; - struct stat st; + struct nfs_stat st; if (bdrv_is_read_only(bs) && !(bs->open_flags & BDRV_O_NOCACHE)) { @@ -746,7 +764,7 @@ static int64_t nfs_get_allocated_file_size(BlockDriverState *bs) nfs_set_events(client); BDRV_POLL_WHILE(bs, !task.complete); - return (task.ret < 0 ? task.ret : st.st_blocks * 512); + return (task.ret < 0 ? task.ret : nfs_get_st_blocks(&st) * 512); } static int coroutine_fn @@ -778,7 +796,7 @@ static int nfs_reopen_prepare(BDRVReopenState *state, BlockReopenQueue *queue, Error **errp) { NFSClient *client = state->bs->opaque; - struct stat st; + struct nfs_stat st; int ret = 0; if (state->flags & BDRV_O_RDWR && bdrv_is_read_only(state->bs)) { @@ -800,7 +818,7 @@ static int nfs_reopen_prepare(BDRVReopenState *state, nfs_get_error(client->context)); return ret; } - client->st_blocks = st.st_blocks; + client->st_blocks = nfs_get_st_blocks(&st); } return 0;
These compiling errors are fixed: ../block/nfs.c:27:10: fatal error: poll.h: No such file or directory 27 | #include <poll.h> | ^~~~~~~~ compilation terminated. ../block/nfs.c:63:5: error: unknown type name 'blkcnt_t' 63 | blkcnt_t st_blocks; | ^~~~~~~~ ../block/nfs.c: In function 'nfs_client_open': ../block/nfs.c:550:27: error: 'struct _stat64' has no member named 'st_blocks' 550 | client->st_blocks = st.st_blocks; | ^ ../block/nfs.c: In function 'nfs_get_allocated_file_size': ../block/nfs.c:751:41: error: 'struct _stat64' has no member named 'st_blocks' 751 | return (task.ret < 0 ? task.ret : st.st_blocks * 512); | ^ ../block/nfs.c: In function 'nfs_reopen_prepare': ../block/nfs.c:805:31: error: 'struct _stat64' has no member named 'st_blocks' 805 | client->st_blocks = st.st_blocks; | ^ ../block/nfs.c: In function 'nfs_get_allocated_file_size': ../block/nfs.c:752:1: error: control reaches end of non-void function [-Werror=return-type] 752 | } | ^ On msys2/mingw, there is no st_blocks in struct _stat64, so we use consistence st_size instead. Signed-off-by: Yonggang Luo <luoyonggang@gmail.com> --- block/nfs.c | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-)