Hi Kevin, On Sat, Sep 24, 2022 at 9:19 AM Bin Meng <[email protected]> wrote: > > Hi, > > On Wed, Sep 21, 2022 at 8:10 PM Meng, Bin <[email protected]> wrote: > > > > -----Original Message----- > > From: Philippe Mathieu-Daudé <[email protected]> On Behalf > > Of Philippe Mathieu-Daudé > > Sent: Sunday, September 18, 2022 5:32 AM > > To: Bin Meng <[email protected]>; [email protected] > > Cc: Meng, Bin <[email protected]>; Hanna Reitz <[email protected]>; > > Kevin Wolf <[email protected]>; Peter Lieven <[email protected]>; > > [email protected] > > Subject: Re: [PATCH 5/7] block/nfs: Fix 32-bit Windows build > > > > [Please note: This e-mail is from an EXTERNAL e-mail address] > > > > On 8/9/22 15:28, Bin Meng wrote: > > > From: Bin Meng <[email protected]> > > > > > > libnfs.h declares nfs_fstat() as the following for win32: > > > > > > int nfs_fstat(struct nfs_context *nfs, struct nfsfh *nfsfh, > > > struct __stat64 *st); > > > > > > The 'st' parameter should be of type 'struct __stat64'. The codes > > > happen to build successfully for 64-bit Windows, but it does not build > > > for 32-bit Windows. > > > > > > Fixes: 6542aa9c75bc ("block: add native support for NFS") > > > Fixes: 18a8056e0bc7 ("block/nfs: cache allocated filesize for > > > read-only files") > > > Signed-off-by: Bin Meng <[email protected]> > > > --- > > > > > > block/nfs.c | 8 ++++++++ > > > 1 file changed, 8 insertions(+) > > > > > > diff --git a/block/nfs.c b/block/nfs.c index 444c40b458..d5d67937dd > > > 100644 > > > --- a/block/nfs.c > > > +++ b/block/nfs.c > > > @@ -418,7 +418,11 @@ static int64_t nfs_client_open(NFSClient *client, > > > BlockdevOptionsNfs *opts, > > > int flags, int open_flags, Error **errp) > > > { > > > int64_t ret = -EINVAL; > > > +#ifdef _WIN32 > > > + struct __stat64 st; > > > +#else > > > struct stat st; > > > +#endif > > > char *file = NULL, *strp = NULL; > > > > > > qemu_mutex_init(&client->mutex); @@ -781,7 +785,11 @@ static int > > > nfs_reopen_prepare(BDRVReopenState *state, > > > BlockReopenQueue *queue, Error **errp) > > > { > > > NFSClient *client = state->bs->opaque; > > > +#ifdef _WIN32 > > > + struct __stat64 st; > > > +#else > > > struct stat st; > > > +#endif > > > int ret = 0; > > > > > > if (state->flags & BDRV_O_RDWR && bdrv_is_read_only(state->bs)) > > > { > > > > What about the field in struct NFSRPC? > > > > NFSRPC::struct stat is used in nfs_get_allocated_file_size_cb() and > > nfs_get_allocated_file_size() that are not built on win32, so there is no > > problem. > > > > Any further comments? >
Will you queue this patch via the block tree? Regards, Bin
