From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, stefanha@redhat.com, peter.maydell@linaro.org,
qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 6/7] file-posix: Do runtime check for ofd lock API
Date: Fri, 11 Aug 2017 16:05:35 +0200 [thread overview]
Message-ID: <20170811140536.2792-7-kwolf@redhat.com> (raw)
In-Reply-To: <20170811140536.2792-1-kwolf@redhat.com>
From: Fam Zheng <famz@redhat.com>
It is reported that on Windows Subsystem for Linux, ofd operations fail
with -EINVAL. In other words, QEMU binary built with system headers that
exports F_OFD_SETLK doesn't necessarily run in an environment that
actually supports it:
$ qemu-system-aarch64 ... -drive file=test.vhdx,if=none,id=hd0 \
-device virtio-blk-pci,drive=hd0
qemu-system-aarch64: -drive file=test.vhdx,if=none,id=hd0: Failed to unlock byte 100
qemu-system-aarch64: -drive file=test.vhdx,if=none,id=hd0: Failed to unlock byte 100
qemu-system-aarch64: -drive file=test.vhdx,if=none,id=hd0: Failed to lock byte 100
As a matter of fact this is not WSL specific. It can happen when running
a QEMU compiled against a newer glibc on an older kernel, such as in
a containerized environment.
Let's do a runtime check to cope with that.
Reported-by: Andrew Baumann <Andrew.Baumann@microsoft.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
block/file-posix.c | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/block/file-posix.c b/block/file-posix.c
index f4de022ae0..cb3bfce147 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -457,22 +457,19 @@ static int raw_open_common(BlockDriverState *bs, QDict *options,
switch (locking) {
case ON_OFF_AUTO_ON:
s->use_lock = true;
-#ifndef F_OFD_SETLK
- fprintf(stderr,
- "File lock requested but OFD locking syscall is unavailable, "
- "falling back to POSIX file locks.\n"
- "Due to the implementation, locks can be lost unexpectedly.\n");
-#endif
+ if (!qemu_has_ofd_lock()) {
+ fprintf(stderr,
+ "File lock requested but OFD locking syscall is "
+ "unavailable, falling back to POSIX file locks.\n"
+ "Due to the implementation, locks can be lost "
+ "unexpectedly.\n");
+ }
break;
case ON_OFF_AUTO_OFF:
s->use_lock = false;
break;
case ON_OFF_AUTO_AUTO:
-#ifdef F_OFD_SETLK
- s->use_lock = true;
-#else
- s->use_lock = false;
-#endif
+ s->use_lock = qemu_has_ofd_lock();
break;
default:
abort();
--
2.13.4
next prev parent reply other threads:[~2017-08-11 14:06 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-11 14:05 [Qemu-devel] [PULL 0/7] Block/Multiboot patches for 2.10.0-rc3 Kevin Wolf
2017-08-11 14:05 ` [Qemu-devel] [PULL 1/7] tests/multiboot: Fix whitespace failure Kevin Wolf
2017-08-11 14:05 ` [Qemu-devel] [PULL 2/7] vpc: Check failure of bdrv_getlength() Kevin Wolf
2017-08-11 14:05 ` [Qemu-devel] [PULL 3/7] qcow2: Drop debugging dump_refcounts() Kevin Wolf
2017-08-11 14:05 ` [Qemu-devel] [PULL 4/7] qcow2: Check failure of bdrv_getlength() Kevin Wolf
2017-08-11 14:05 ` [Qemu-devel] [PULL 5/7] osdep: Add runtime OFD lock detection Kevin Wolf
2017-08-11 14:05 ` Kevin Wolf [this message]
2017-08-11 14:05 ` [Qemu-devel] [PULL 7/7] qemu-iotests: fix 185 Kevin Wolf
2017-08-11 17:10 ` [Qemu-devel] [PULL 0/7] Block/Multiboot patches for 2.10.0-rc3 Peter Maydell
2017-08-11 18:00 ` Peter Maydell
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=20170811140536.2792-7-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/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).