* [PATCH v2 0/2] Fixes building nfs on msys2/mingw
@ 2020-10-13 0:15 Yonggang Luo
2020-10-13 0:15 ` [PATCH v2 1/2] block: Fixes nfs compiling error " Yonggang Luo
2020-10-13 0:15 ` [PATCH v2 2/2] block: enable libnfs on msys2/mingw in cirrus.yml Yonggang Luo
0 siblings, 2 replies; 12+ messages in thread
From: Yonggang Luo @ 2020-10-13 0:15 UTC (permalink / raw)
To: qemu-devel
Cc: Kevin Wolf, qemu-block, QEMU Trivial, Peter Lieven, Max Reitz,
Yonggang Luo
V1-V2
Apply suggestion from Peter Lieven
Yonggang Luo (2):
block: Fixes nfs compiling error on msys2/mingw
block: enable libnfs on msys2/mingw in cirrus.yml
.cirrus.yml | 1 +
block/nfs.c | 15 +++++++++++++++
2 files changed, 16 insertions(+)
--
2.28.0.windows.1
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v2 1/2] block: Fixes nfs compiling error on msys2/mingw
2020-10-13 0:15 [PATCH v2 0/2] Fixes building nfs on msys2/mingw Yonggang Luo
@ 2020-10-13 0:15 ` Yonggang Luo
2020-11-05 11:29 ` Max Reitz
2020-10-13 0:15 ` [PATCH v2 2/2] block: enable libnfs on msys2/mingw in cirrus.yml Yonggang Luo
1 sibling, 1 reply; 12+ messages in thread
From: Yonggang Luo @ 2020-10-13 0:15 UTC (permalink / raw)
To: qemu-devel
Cc: Kevin Wolf, qemu-block, QEMU Trivial, Peter Lieven, Max Reitz,
Yonggang Luo
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 yet, we disable the usage of it
on msys2/mingw, and create a typedef long long blkcnt_t; for further implementation
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
---
block/nfs.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/block/nfs.c b/block/nfs.c
index f86e660374..cf8795fb49 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,10 @@
#define QEMU_NFS_MAX_PAGECACHE_SIZE (8388608 / NFS_BLKSIZE)
#define QEMU_NFS_MAX_DEBUG_LEVEL 2
+#if defined(_WIN32)
+typedef long long blkcnt_t;
+#endif
+
typedef struct NFSClient {
struct nfs_context *context;
struct nfsfh *fh;
@@ -545,7 +551,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 +714,7 @@ 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 +757,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,
@@ -800,7 +810,9 @@ static int nfs_reopen_prepare(BDRVReopenState *state,
nfs_get_error(client->context));
return ret;
}
+#if !defined(_WIN32)
client->st_blocks = st.st_blocks;
+#endif
}
return 0;
@@ -869,7 +881,10 @@ static BlockDriver bdrv_nfs = {
.create_opts = &nfs_create_opts,
.bdrv_has_zero_init = nfs_has_zero_init,
+/* libnfs does not provide the allocated filesize of a file on win32. */
+#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,
--
2.28.0.windows.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v2 2/2] block: enable libnfs on msys2/mingw in cirrus.yml
2020-10-13 0:15 [PATCH v2 0/2] Fixes building nfs on msys2/mingw Yonggang Luo
2020-10-13 0:15 ` [PATCH v2 1/2] block: Fixes nfs compiling error " Yonggang Luo
@ 2020-10-13 0:15 ` Yonggang Luo
2020-11-05 11:43 ` Max Reitz
1 sibling, 1 reply; 12+ messages in thread
From: Yonggang Luo @ 2020-10-13 0:15 UTC (permalink / raw)
To: qemu-devel
Cc: Kevin Wolf, qemu-block, QEMU Trivial, Peter Lieven, Max Reitz,
Yonggang Luo
At the begging libnfs are not enabled because of compiling error,
now it's fixed so enable it
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
---
.cirrus.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.cirrus.yml b/.cirrus.yml
index f42ccb956a..2c6bf45e6d 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -109,6 +109,7 @@ windows_msys2_task:
mingw-w64-x86_64-cyrus-sasl \
mingw-w64-x86_64-curl \
mingw-w64-x86_64-gnutls \
+ mingw-w64-x86_64-libnfs \
"
bitsadmin /transfer msys_download /dynamic /download /priority FOREGROUND `
https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-python-sphinx-2.3.1-1-any.pkg.tar.xz `
--
2.28.0.windows.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH v2 1/2] block: Fixes nfs compiling error on msys2/mingw
2020-10-13 0:15 ` [PATCH v2 1/2] block: Fixes nfs compiling error " Yonggang Luo
@ 2020-11-05 11:29 ` Max Reitz
2020-11-05 11:32 ` 罗勇刚(Yonggang Luo)
0 siblings, 1 reply; 12+ messages in thread
From: Max Reitz @ 2020-11-05 11:29 UTC (permalink / raw)
To: Yonggang Luo, qemu-devel
Cc: QEMU Trivial, Kevin Wolf, Peter Lieven, qemu-block
On 13.10.20 02:15, Yonggang Luo wrote:
> 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 yet, we disable the usage of it
> on msys2/mingw, and create a typedef long long blkcnt_t; for further implementation
>
> Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
> ---
> block/nfs.c | 15 +++++++++++++++
> 1 file changed, 15 insertions(+)
>
> diff --git a/block/nfs.c b/block/nfs.c
> index f86e660374..cf8795fb49 100644
> --- a/block/nfs.c
> +++ b/block/nfs.c
[...]
> @@ -51,6 +53,10 @@
> #define QEMU_NFS_MAX_PAGECACHE_SIZE (8388608 / NFS_BLKSIZE)
> #define QEMU_NFS_MAX_DEBUG_LEVEL 2
>
> +#if defined(_WIN32)
> +typedef long long blkcnt_t;
This makes me uneasy. Is there a guarantee that this type will never be
defined in a mingw environment (which would then result in a new compile
error)?
Can’t we just give NFSClient.st_blocks a different type, i.e. uint64_t?
Apart from that, looks good to me.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v2 1/2] block: Fixes nfs compiling error on msys2/mingw
2020-11-05 11:29 ` Max Reitz
@ 2020-11-05 11:32 ` 罗勇刚(Yonggang Luo)
2020-11-05 11:43 ` Max Reitz
0 siblings, 1 reply; 12+ messages in thread
From: 罗勇刚(Yonggang Luo) @ 2020-11-05 11:32 UTC (permalink / raw)
To: Max Reitz; +Cc: QEMU Trivial, Kevin Wolf, Peter Lieven, qemu-level, Qemu-block
[-- Attachment #1: Type: text/plain, Size: 2545 bytes --]
On Thu, Nov 5, 2020 at 7:29 PM Max Reitz <mreitz@redhat.com> wrote:
>
> On 13.10.20 02:15, Yonggang Luo wrote:
> > 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 yet, we disable
the usage of it
> > on msys2/mingw, and create a typedef long long blkcnt_t; for further
implementation
> >
> > Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
> > ---
> > block/nfs.c | 15 +++++++++++++++
> > 1 file changed, 15 insertions(+)
> >
> > diff --git a/block/nfs.c b/block/nfs.c
> > index f86e660374..cf8795fb49 100644
> > --- a/block/nfs.c
> > +++ b/block/nfs.c
>
> [...]
>
> > @@ -51,6 +53,10 @@
> > #define QEMU_NFS_MAX_PAGECACHE_SIZE (8388608 / NFS_BLKSIZE)
> > #define QEMU_NFS_MAX_DEBUG_LEVEL 2
> >
> > +#if defined(_WIN32)
> > +typedef long long blkcnt_t;
>
> This makes me uneasy. Is there a guarantee that this type will never be
> defined in a mingw environment (which would then result in a new compile
> error)?
That's be sure, mingw is compat with msvcrt.dll, so blkcnt_t are always
not defined.
>
> Can’t we just give NFSClient.st_blocks a different type, i.e. uint64_t?
>
> Apart from that, looks good to me.
>
--
此致
礼
罗勇刚
Yours
sincerely,
Yonggang Luo
[-- Attachment #2: Type: text/html, Size: 3356 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v2 2/2] block: enable libnfs on msys2/mingw in cirrus.yml
2020-10-13 0:15 ` [PATCH v2 2/2] block: enable libnfs on msys2/mingw in cirrus.yml Yonggang Luo
@ 2020-11-05 11:43 ` Max Reitz
2020-11-05 12:32 ` 罗勇刚(Yonggang Luo)
0 siblings, 1 reply; 12+ messages in thread
From: Max Reitz @ 2020-11-05 11:43 UTC (permalink / raw)
To: Yonggang Luo, qemu-devel
Cc: QEMU Trivial, Kevin Wolf, Peter Lieven, qemu-block
On 13.10.20 02:15, Yonggang Luo wrote:
> At the begging libnfs are not enabled because of compiling error,
> now it's fixed so enable it
>
> Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
> ---
> .cirrus.yml | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/.cirrus.yml b/.cirrus.yml
> index f42ccb956a..2c6bf45e6d 100644
> --- a/.cirrus.yml
> +++ b/.cirrus.yml
> @@ -109,6 +109,7 @@ windows_msys2_task:
> mingw-w64-x86_64-cyrus-sasl \
> mingw-w64-x86_64-curl \
> mingw-w64-x86_64-gnutls \
> + mingw-w64-x86_64-libnfs \
> "
> bitsadmin /transfer msys_download /dynamic /download /priority FOREGROUND `
> https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-python-sphinx-2.3.1-1-any.pkg.tar.xz `
I’d love to test this, unfortunately git.qemu.org has some issues now
and so I can’t run Cirrus tests. :/
I suppose I’ll retry when git.qemu.org works again.
Max
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v2 1/2] block: Fixes nfs compiling error on msys2/mingw
2020-11-05 11:32 ` 罗勇刚(Yonggang Luo)
@ 2020-11-05 11:43 ` Max Reitz
2020-11-05 11:46 ` 罗勇刚(Yonggang Luo)
0 siblings, 1 reply; 12+ messages in thread
From: Max Reitz @ 2020-11-05 11:43 UTC (permalink / raw)
To: luoyonggang
Cc: QEMU Trivial, Kevin Wolf, Peter Lieven, qemu-level, Qemu-block
On 05.11.20 12:32, 罗勇刚(Yonggang Luo) wrote:
>
>
> On Thu, Nov 5, 2020 at 7:29 PM Max Reitz <mreitz@redhat.com
> <mailto:mreitz@redhat.com>> wrote:
> >
> > On 13.10.20 02:15, Yonggang Luo wrote:
> > > 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 yet, we
> disable the usage of it
> > > on msys2/mingw, and create a typedef long long blkcnt_t; for
> further implementation
> > >
> > > Signed-off-by: Yonggang Luo <luoyonggang@gmail.com
> <mailto:luoyonggang@gmail.com>>
> > > ---
> > > block/nfs.c | 15 +++++++++++++++
> > > 1 file changed, 15 insertions(+)
> > >
> > > diff --git a/block/nfs.c b/block/nfs.c
> > > index f86e660374..cf8795fb49 100644
> > > --- a/block/nfs.c
> > > +++ b/block/nfs.c
> >
> > [...]
> >
> > > @@ -51,6 +53,10 @@
> > > #define QEMU_NFS_MAX_PAGECACHE_SIZE (8388608 / NFS_BLKSIZE)
> > > #define QEMU_NFS_MAX_DEBUG_LEVEL 2
> > >
> > > +#if defined(_WIN32)
> > > +typedef long long blkcnt_t;
> >
> > This makes me uneasy. Is there a guarantee that this type will never be
> > defined in a mingw environment (which would then result in a new compile
> > error)?
> That's be sure, mingw is compat with msvcrt.dll, so blkcnt_t are always
> not defined.
And there is no possibility of that being added in the future?
Max
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v2 1/2] block: Fixes nfs compiling error on msys2/mingw
2020-11-05 11:43 ` Max Reitz
@ 2020-11-05 11:46 ` 罗勇刚(Yonggang Luo)
2020-11-05 12:11 ` Max Reitz
0 siblings, 1 reply; 12+ messages in thread
From: 罗勇刚(Yonggang Luo) @ 2020-11-05 11:46 UTC (permalink / raw)
To: Max Reitz; +Cc: QEMU Trivial, Kevin Wolf, Peter Lieven, qemu-level, Qemu-block
[-- Attachment #1: Type: text/plain, Size: 3054 bytes --]
On Thu, Nov 5, 2020 at 7:44 PM Max Reitz <mreitz@redhat.com> wrote:
>
> On 05.11.20 12:32, 罗勇刚(Yonggang Luo) wrote:
> >
> >
> > On Thu, Nov 5, 2020 at 7:29 PM Max Reitz <mreitz@redhat.com
> > <mailto:mreitz@redhat.com>> wrote:
> > >
> > > On 13.10.20 02:15, Yonggang Luo wrote:
> > > > 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 yet, we
> > disable the usage of it
> > > > on msys2/mingw, and create a typedef long long blkcnt_t; for
> > further implementation
> > > >
> > > > Signed-off-by: Yonggang Luo <luoyonggang@gmail.com
> > <mailto:luoyonggang@gmail.com>>
> > > > ---
> > > > block/nfs.c | 15 +++++++++++++++
> > > > 1 file changed, 15 insertions(+)
> > > >
> > > > diff --git a/block/nfs.c b/block/nfs.c
> > > > index f86e660374..cf8795fb49 100644
> > > > --- a/block/nfs.c
> > > > +++ b/block/nfs.c
> > >
> > > [...]
> > >
> > > > @@ -51,6 +53,10 @@
> > > > #define QEMU_NFS_MAX_PAGECACHE_SIZE (8388608 / NFS_BLKSIZE)
> > > > #define QEMU_NFS_MAX_DEBUG_LEVEL 2
> > > >
> > > > +#if defined(_WIN32)
> > > > +typedef long long blkcnt_t;
> > >
> > > This makes me uneasy. Is there a guarantee that this type will
never be
> > > defined in a mingw environment (which would then result in a new
compile
> > > error)?
> > That's be sure, mingw is compat with msvcrt.dll, so blkcnt_t are always
> > not defined.
>
> And there is no possibility of that being added in the future?
If that's the case, what's the better option.
>
> Max
>
--
此致
礼
罗勇刚
Yours
sincerely,
Yonggang Luo
[-- Attachment #2: Type: text/html, Size: 4476 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v2 1/2] block: Fixes nfs compiling error on msys2/mingw
2020-11-05 11:46 ` 罗勇刚(Yonggang Luo)
@ 2020-11-05 12:11 ` Max Reitz
2020-11-05 12:32 ` 罗勇刚(Yonggang Luo)
0 siblings, 1 reply; 12+ messages in thread
From: Max Reitz @ 2020-11-05 12:11 UTC (permalink / raw)
To: luoyonggang
Cc: QEMU Trivial, Kevin Wolf, Peter Lieven, qemu-level, Qemu-block
On 05.11.20 12:46, 罗勇刚(Yonggang Luo) wrote:
>
>
> On Thu, Nov 5, 2020 at 7:44 PM Max Reitz <mreitz@redhat.com
> <mailto:mreitz@redhat.com>> wrote:
> >
> > On 05.11.20 12:32, 罗勇刚(Yonggang Luo) wrote:
> > >
> > >
> > > On Thu, Nov 5, 2020 at 7:29 PM Max Reitz <mreitz@redhat.com
> <mailto:mreitz@redhat.com>
> > > <mailto:mreitz@redhat.com <mailto:mreitz@redhat.com>>> wrote:
> > > >
> > > > On 13.10.20 02:15, Yonggang Luo wrote:
> > > > > 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 yet, we
> > > disable the usage of it
> > > > > on msys2/mingw, and create a typedef long long blkcnt_t; for
> > > further implementation
> > > > >
> > > > > Signed-off-by: Yonggang Luo <luoyonggang@gmail.com
> <mailto:luoyonggang@gmail.com>
> > > <mailto:luoyonggang@gmail.com <mailto:luoyonggang@gmail.com>>>
> > > > > ---
> > > > > block/nfs.c | 15 +++++++++++++++
> > > > > 1 file changed, 15 insertions(+)
> > > > >
> > > > > diff --git a/block/nfs.c b/block/nfs.c
> > > > > index f86e660374..cf8795fb49 100644
> > > > > --- a/block/nfs.c
> > > > > +++ b/block/nfs.c
> > > >
> > > > [...]
> > > >
> > > > > @@ -51,6 +53,10 @@
> > > > > #define QEMU_NFS_MAX_PAGECACHE_SIZE (8388608 / NFS_BLKSIZE)
> > > > > #define QEMU_NFS_MAX_DEBUG_LEVEL 2
> > > > >
> > > > > +#if defined(_WIN32)
> > > > > +typedef long long blkcnt_t;
> > > >
> > > > This makes me uneasy. Is there a guarantee that this type will
> never be
> > > > defined in a mingw environment (which would then result in a new
> compile
> > > > error)?
> > > That's be sure, mingw is compat with msvcrt.dll, so blkcnt_t are
> always
> > > not defined.
> >
> > And there is no possibility of that being added in the future?
> If that's the case, what's the better option.
As I said, just making NFSClient.st_blocks a uint64_t.
Max
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v2 1/2] block: Fixes nfs compiling error on msys2/mingw
2020-11-05 12:11 ` Max Reitz
@ 2020-11-05 12:32 ` 罗勇刚(Yonggang Luo)
0 siblings, 0 replies; 12+ messages in thread
From: 罗勇刚(Yonggang Luo) @ 2020-11-05 12:32 UTC (permalink / raw)
To: Max Reitz; +Cc: QEMU Trivial, Kevin Wolf, Peter Lieven, qemu-level, Qemu-block
[-- Attachment #1: Type: text/plain, Size: 3815 bytes --]
Updated with fixes.
On Thu, Nov 5, 2020 at 8:11 PM Max Reitz <mreitz@redhat.com> wrote:
>
> On 05.11.20 12:46, 罗勇刚(Yonggang Luo) wrote:
> >
> >
> > On Thu, Nov 5, 2020 at 7:44 PM Max Reitz <mreitz@redhat.com
> > <mailto:mreitz@redhat.com>> wrote:
> > >
> > > On 05.11.20 12:32, 罗勇刚(Yonggang Luo) wrote:
> > > >
> > > >
> > > > On Thu, Nov 5, 2020 at 7:29 PM Max Reitz <mreitz@redhat.com
> > <mailto:mreitz@redhat.com>
> > > > <mailto:mreitz@redhat.com <mailto:mreitz@redhat.com>>> wrote:
> > > > >
> > > > > On 13.10.20 02:15, Yonggang Luo wrote:
> > > > > > 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 yet,
we
> > > > disable the usage of it
> > > > > > on msys2/mingw, and create a typedef long long blkcnt_t; for
> > > > further implementation
> > > > > >
> > > > > > Signed-off-by: Yonggang Luo <luoyonggang@gmail.com
> > <mailto:luoyonggang@gmail.com>
> > > > <mailto:luoyonggang@gmail.com <mailto:luoyonggang@gmail.com>>>
> > > > > > ---
> > > > > > block/nfs.c | 15 +++++++++++++++
> > > > > > 1 file changed, 15 insertions(+)
> > > > > >
> > > > > > diff --git a/block/nfs.c b/block/nfs.c
> > > > > > index f86e660374..cf8795fb49 100644
> > > > > > --- a/block/nfs.c
> > > > > > +++ b/block/nfs.c
> > > > >
> > > > > [...]
> > > > >
> > > > > > @@ -51,6 +53,10 @@
> > > > > > #define QEMU_NFS_MAX_PAGECACHE_SIZE (8388608 / NFS_BLKSIZE)
> > > > > > #define QEMU_NFS_MAX_DEBUG_LEVEL 2
> > > > > >
> > > > > > +#if defined(_WIN32)
> > > > > > +typedef long long blkcnt_t;
> > > > >
> > > > > This makes me uneasy. Is there a guarantee that this type will
> > never be
> > > > > defined in a mingw environment (which would then result in a new
> > compile
> > > > > error)?
> > > > That's be sure, mingw is compat with msvcrt.dll, so blkcnt_t are
> > always
> > > > not defined.
> > >
> > > And there is no possibility of that being added in the future?
> > If that's the case, what's the better option.
>
> As I said, just making NFSClient.st_blocks a uint64_t.
>
> Max
>
--
此致
礼
罗勇刚
Yours
sincerely,
Yonggang Luo
[-- Attachment #2: Type: text/html, Size: 6107 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v2 2/2] block: enable libnfs on msys2/mingw in cirrus.yml
2020-11-05 11:43 ` Max Reitz
@ 2020-11-05 12:32 ` 罗勇刚(Yonggang Luo)
2020-11-05 14:40 ` Max Reitz
0 siblings, 1 reply; 12+ messages in thread
From: 罗勇刚(Yonggang Luo) @ 2020-11-05 12:32 UTC (permalink / raw)
To: Max Reitz; +Cc: QEMU Trivial, Kevin Wolf, Peter Lieven, qemu-level, Qemu-block
[-- Attachment #1: Type: text/plain, Size: 1222 bytes --]
On Thu, Nov 5, 2020 at 7:43 PM Max Reitz <mreitz@redhat.com> wrote:
>
> On 13.10.20 02:15, Yonggang Luo wrote:
> > At the begging libnfs are not enabled because of compiling error,
> > now it's fixed so enable it
> >
> > Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
> > ---
> > .cirrus.yml | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/.cirrus.yml b/.cirrus.yml
> > index f42ccb956a..2c6bf45e6d 100644
> > --- a/.cirrus.yml
> > +++ b/.cirrus.yml
> > @@ -109,6 +109,7 @@ windows_msys2_task:
> > mingw-w64-x86_64-cyrus-sasl \
> > mingw-w64-x86_64-curl \
> > mingw-w64-x86_64-gnutls \
> > + mingw-w64-x86_64-libnfs \
> > "
> > bitsadmin /transfer msys_download /dynamic /download
/priority FOREGROUND `
> >
https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-python-sphinx-2.3.1-1-any.pkg.tar.xz
`
>
> I’d love to test this, unfortunately git.qemu.org has some issues now
> and so I can’t run Cirrus tests. :/
>
> I suppose I’ll retry when git.qemu.org works again.
>
> Max
>
Maybe we arealdy switched to gitlab?
--
此致
礼
罗勇刚
Yours
sincerely,
Yonggang Luo
[-- Attachment #2: Type: text/html, Size: 1812 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v2 2/2] block: enable libnfs on msys2/mingw in cirrus.yml
2020-11-05 12:32 ` 罗勇刚(Yonggang Luo)
@ 2020-11-05 14:40 ` Max Reitz
0 siblings, 0 replies; 12+ messages in thread
From: Max Reitz @ 2020-11-05 14:40 UTC (permalink / raw)
To: luoyonggang
Cc: QEMU Trivial, Kevin Wolf, Peter Lieven, qemu-level, Qemu-block
On 05.11.20 13:32, 罗勇刚(Yonggang Luo) wrote:
>
>
> On Thu, Nov 5, 2020 at 7:43 PM Max Reitz <mreitz@redhat.com
> <mailto:mreitz@redhat.com>> wrote:
> >
> > On 13.10.20 02:15, Yonggang Luo wrote:
> > > At the begging libnfs are not enabled because of compiling error,
> > > now it's fixed so enable it
> > >
> > > Signed-off-by: Yonggang Luo <luoyonggang@gmail.com
> <mailto:luoyonggang@gmail.com>>
> > > ---
> > > .cirrus.yml | 1 +
> > > 1 file changed, 1 insertion(+)
> > >
> > > diff --git a/.cirrus.yml b/.cirrus.yml
> > > index f42ccb956a..2c6bf45e6d 100644
> > > --- a/.cirrus.yml
> > > +++ b/.cirrus.yml
> > > @@ -109,6 +109,7 @@ windows_msys2_task:
> > > mingw-w64-x86_64-cyrus-sasl \
> > > mingw-w64-x86_64-curl \
> > > mingw-w64-x86_64-gnutls \
> > > + mingw-w64-x86_64-libnfs \
> > > "
> > > bitsadmin /transfer msys_download /dynamic /download
> /priority FOREGROUND `
> > >
> https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-python-sphinx-2.3.1-1-any.pkg.tar.xz
> <https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-python-sphinx-2.3.1-1-any.pkg.tar.xz>
> `
> >
> > I’d love to test this, unfortunately git.qemu.org
> <http://git.qemu.org> has some issues now
> > and so I can’t run Cirrus tests. :/
> >
> > I suppose I’ll retry when git.qemu.org <http://git.qemu.org> works again.
> >
> > Max
> >
> Maybe we arealdy switched to gitlab?
I hope not, or it would be really sad that I didn’t notice...
Max
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2020-11-05 14:45 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-10-13 0:15 [PATCH v2 0/2] Fixes building nfs on msys2/mingw Yonggang Luo
2020-10-13 0:15 ` [PATCH v2 1/2] block: Fixes nfs compiling error " Yonggang Luo
2020-11-05 11:29 ` Max Reitz
2020-11-05 11:32 ` 罗勇刚(Yonggang Luo)
2020-11-05 11:43 ` Max Reitz
2020-11-05 11:46 ` 罗勇刚(Yonggang Luo)
2020-11-05 12:11 ` Max Reitz
2020-11-05 12:32 ` 罗勇刚(Yonggang Luo)
2020-10-13 0:15 ` [PATCH v2 2/2] block: enable libnfs on msys2/mingw in cirrus.yml Yonggang Luo
2020-11-05 11:43 ` Max Reitz
2020-11-05 12:32 ` 罗勇刚(Yonggang Luo)
2020-11-05 14:40 ` Max Reitz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).