From: Bin Meng <bmeng.cn@gmail.com>
To: qemu-devel@nongnu.org
Cc: Bin Meng <bin.meng@windriver.com>,
Hanna Reitz <hreitz@redhat.com>, Kevin Wolf <kwolf@redhat.com>,
Peter Lieven <pl@kamp.de>,
qemu-block@nongnu.org
Subject: [PATCH 5/7] block/nfs: Fix 32-bit Windows build
Date: Thu, 8 Sep 2022 21:28:15 +0800 [thread overview]
Message-ID: <20220908132817.1831008-6-bmeng.cn@gmail.com> (raw)
In-Reply-To: <20220908132817.1831008-1-bmeng.cn@gmail.com>
From: Bin Meng <bin.meng@windriver.com>
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 <bin.meng@windriver.com>
---
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)) {
--
2.34.1
next prev parent reply other threads:[~2022-09-08 13:40 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-08 13:28 [PATCH 0/7] nsis: gitlab-ci: Improve QEMU Windows installer packaging Bin Meng
2022-09-08 13:28 ` [PATCH 1/7] scripts/nsis.py: Drop the unnecessary path separator Bin Meng
2022-09-17 21:18 ` Philippe Mathieu-Daudé via
2022-10-29 7:44 ` Stefan Weil via
2022-09-08 13:28 ` [PATCH 2/7] scripts/nsis.py: Fix destination directory name when invoked on Windows Bin Meng
2022-09-08 13:46 ` Marc-André Lureau
2022-09-17 21:20 ` Philippe Mathieu-Daudé via
2022-10-29 7:58 ` Stefan Weil via
2022-09-08 13:28 ` [PATCH 3/7] scripts/nsis.py: Automatically package required DLLs of QEMU executables Bin Meng
2022-09-08 13:56 ` Marc-André Lureau
2022-09-09 16:49 ` Mark Cave-Ayland
2022-09-10 0:37 ` Bin Meng
2024-02-25 17:37 ` Stefan Weil via
2024-02-26 4:35 ` Bin Meng
2024-02-26 6:30 ` Stefan Weil via
2024-03-10 8:02 ` Mark Cave-Ayland
2022-10-29 9:04 ` Stefan Weil via
2022-09-08 13:28 ` [PATCH 4/7] .gitlab-ci.d/windows.yml: Drop the sed processing in the 64-bit build Bin Meng
2022-09-08 14:04 ` Marc-André Lureau
2022-09-09 16:30 ` Thomas Huth
2022-09-17 21:22 ` Philippe Mathieu-Daudé via
2022-09-08 13:28 ` Bin Meng [this message]
2022-09-17 21:32 ` [PATCH 5/7] block/nfs: Fix 32-bit Windows build Philippe Mathieu-Daudé via
2022-09-21 12:10 ` Meng, Bin
2022-09-24 1:19 ` Bin Meng
2022-10-27 2:45 ` Bin Meng
2022-10-27 7:54 ` Kevin Wolf
2022-10-27 8:16 ` Bin Meng
2022-10-29 15:57 ` Stefan Weil via
2022-09-08 13:28 ` [PATCH 6/7] .gitlab-ci.d/windows.yml: Unify the prerequisite packages Bin Meng
2022-09-09 16:32 ` Thomas Huth
2022-09-10 0:32 ` Bin Meng
2022-09-10 5:09 ` 罗勇刚(Yonggang Luo)
2022-09-24 9:20 ` Bin Meng
2022-10-29 13:06 ` Bin Meng
2022-10-29 16:19 ` Stefan Weil via
2022-10-31 6:43 ` Thomas Huth
2022-09-08 13:28 ` [PATCH 7/7] .gitlab-ci.d/windows.yml: Test 'make installer' in the CI Bin Meng
2022-09-17 21:31 ` Philippe Mathieu-Daudé via
2022-10-29 16:39 ` Stefan Weil via
2022-10-30 3:21 ` Bin Meng
2022-10-31 7:01 ` Thomas Huth
2022-09-16 0:35 ` [PATCH 0/7] nsis: gitlab-ci: Improve QEMU Windows installer packaging Bin Meng
2022-09-21 12:18 ` Bin Meng
2022-09-21 12:24 ` Thomas Huth
2022-09-23 2:28 ` Bin Meng
2022-10-29 13:45 ` Bin Meng
2022-10-31 6:52 ` Thomas Huth
2022-10-31 9:26 ` Stefan Weil via
2022-10-31 9:29 ` Marc-André Lureau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220908132817.1831008-6-bmeng.cn@gmail.com \
--to=bmeng.cn@gmail.com \
--cc=bin.meng@windriver.com \
--cc=hreitz@redhat.com \
--cc=kwolf@redhat.com \
--cc=pl@kamp.de \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).