diff options
| author | Peter Maydell | 2017-08-11 16:11:50 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-08-11 16:11:50 +0200 |
| commit | 9db6ffc76676731a25a5538ab71e8ca6ac234f80 (patch) | |
| tree | cdfb74c60955bdc2490338a75fd8976777e94014 /include | |
| parent | Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into ... (diff) | |
| parent | qemu-iotests: fix 185 (diff) | |
| download | qemu-9db6ffc76676731a25a5538ab71e8ca6ac234f80.tar.gz qemu-9db6ffc76676731a25a5538ab71e8ca6ac234f80.tar.xz qemu-9db6ffc76676731a25a5538ab71e8ca6ac234f80.zip | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches for 2.10.0-rc3
# gpg: Signature made Fri 11 Aug 2017 15:02:58 BST
# gpg: using RSA key 0x7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74 56FE 7F09 B272 C88F 2FD6
* remotes/kevin/tags/for-upstream:
qemu-iotests: fix 185
file-posix: Do runtime check for ofd lock API
osdep: Add runtime OFD lock detection
qcow2: Check failure of bdrv_getlength()
qcow2: Drop debugging dump_refcounts()
vpc: Check failure of bdrv_getlength()
tests/multiboot: Fix whitespace failure
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/qemu/osdep.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index 3b74f6fcb2..6855b94bbf 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -357,6 +357,7 @@ int qemu_dup(int fd); int qemu_lock_fd(int fd, int64_t start, int64_t len, bool exclusive); int qemu_unlock_fd(int fd, int64_t start, int64_t len); int qemu_lock_fd_test(int fd, int64_t start, int64_t len, bool exclusive); +bool qemu_has_ofd_lock(void); #if defined(__HAIKU__) && defined(__i386__) #define FMT_pid "%ld" |