Branch: refs/heads/master
Home: https://github.com/qemu/qemu
Commit: 01a02ec4f6b6a12df7acfb6ad820b384b48cbf70
https://github.com/qemu/qemu/commit/01a02ec4f6b6a12df7acfb6ad820b384b48cbf70
Author: Eric Blake <ebl...@redhat.com>
Date: 2017-08-11 (Fri, 11 Aug 2017)
Changed paths:
M tests/multiboot/run_test.sh
Log Message:
-----------
tests/multiboot: Fix whitespace failure
Commit b43671f8 accidentally broke run_test.sh within tests/multiboot;
due to a subtle change in whitespace.
These two commands produce theh same output (at least, for sane $IFS
of space-tab-newline):
echo -e "...$@..."
echo -e "...$*..."
But that's only because echo inserts spaces between multiple arguments
(the $@ case), while the $* form gives a single argument to echo with
the spaces already present.
But when converting to printf %b, there are no automatic spaces between
multiple arguments, so we HAVE to use $*.
It doesn't help that run_test.sh isn't part of 'make check'.
Signed-off-by: Eric Blake <ebl...@redhat.com>
Signed-off-by: Kevin Wolf <kw...@redhat.com>
Commit: 81caa3cc3bdd9f5406130ee5bea94d5d7ee6e2e2
https://github.com/qemu/qemu/commit/81caa3cc3bdd9f5406130ee5bea94d5d7ee6e2e2
Author: Eric Blake <ebl...@redhat.com>
Date: 2017-08-11 (Fri, 11 Aug 2017)
Changed paths:
M block/vpc.c
Log Message:
-----------
vpc: Check failure of bdrv_getlength()
vpc_open() was checking for bdrv_getlength() failure in one, but
not the other, location.
Reported-by: Markus Armbruster <arm...@redhat.com>
Signed-off-by: Eric Blake <ebl...@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org>
Reviewed-by: Jeff Cody <jc...@redhat.com>
Reviewed-by: John Snow <js...@redhat.com>
Signed-off-by: Kevin Wolf <kw...@redhat.com>
Commit: c40fe9c06c35fa8076f9a0daeea5c8684d773645
https://github.com/qemu/qemu/commit/c40fe9c06c35fa8076f9a0daeea5c8684d773645
Author: Eric Blake <ebl...@redhat.com>
Date: 2017-08-11 (Fri, 11 Aug 2017)
Changed paths:
M block/qcow2.c
Log Message:
-----------
qcow2: Drop debugging dump_refcounts()
It's been #if 0'd since its introduction in 2006, commit 585f8587.
We can revive dead code if we need it, but in the meantime, it has
bit-rotted (for example, not checking for failure in bdrv_getlength()).
Signed-off-by: Eric Blake <ebl...@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org>
Reviewed-by: Jeff Cody <jc...@redhat.com>
Reviewed-by: Kevin Wolf <kw...@redhat.com>
Reviewed-by: John Snow <js...@redhat.com>
Signed-off-by: Kevin Wolf <kw...@redhat.com>
Commit: d0d5d0e31a874d592741a088c2c5071bae164dbf
https://github.com/qemu/qemu/commit/d0d5d0e31a874d592741a088c2c5071bae164dbf
Author: Eric Blake <ebl...@redhat.com>
Date: 2017-08-11 (Fri, 11 Aug 2017)
Changed paths:
M block/qcow2.c
Log Message:
-----------
qcow2: Check failure of bdrv_getlength()
qcow2_co_pwritev_compressed() should not call bdrv_truncate()
if determining the size failed.
Reported-by: Markus Armbruster <arm...@redhat.com>
Signed-off-by: Eric Blake <ebl...@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org>
Reviewed-by: Jeff Cody <jc...@redhat.com>
Reviewed-by: Kevin Wolf <kw...@redhat.com>
Reviewed-by: John Snow <js...@redhat.com>
Signed-off-by: Kevin Wolf <kw...@redhat.com>
Commit: ca749954b09b89e22cd69c4949fb7e689b057963
https://github.com/qemu/qemu/commit/ca749954b09b89e22cd69c4949fb7e689b057963
Author: Fam Zheng <f...@redhat.com>
Date: 2017-08-11 (Fri, 11 Aug 2017)
Changed paths:
M include/qemu/osdep.h
M util/osdep.c
Log Message:
-----------
osdep: Add runtime OFD lock detection
Build time check of OFD lock is not sufficient and can cause image open
errors when the runtime environment doesn't support it.
Add a helper function to probe it at runtime, additionally. Also provide
a qemu_has_ofd_lock() for callers to check the status.
Signed-off-by: Fam Zheng <f...@redhat.com>
Signed-off-by: Kevin Wolf <kw...@redhat.com>
Commit: 2b218f5dbcca5fe728b1852d161d7a21fd02b2f5
https://github.com/qemu/qemu/commit/2b218f5dbcca5fe728b1852d161d7a21fd02b2f5
Author: Fam Zheng <f...@redhat.com>
Date: 2017-08-11 (Fri, 11 Aug 2017)
Changed paths:
M block/file-posix.c
Log Message:
-----------
file-posix: Do runtime check for ofd lock API
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.baum...@microsoft.com>
Reviewed-by: Eric Blake <ebl...@redhat.com>
Signed-off-by: Fam Zheng <f...@redhat.com>
Signed-off-by: Kevin Wolf <kw...@redhat.com>
Commit: 8565c3ab537e78f3e69977ec2c609dc9417a806e
https://github.com/qemu/qemu/commit/8565c3ab537e78f3e69977ec2c609dc9417a806e
Author: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com>
Date: 2017-08-11 (Fri, 11 Aug 2017)
Changed paths:
M tests/qemu-iotests/185
Log Message:
-----------
qemu-iotests: fix 185
185 can sometimes produce wrong output like this:
185 2s ... - output mismatch (see 185.out.bad)
--- /work/src/qemu/master/tests/qemu-iotests/185.out 2017-07-14 \
15:14:29.520343805 +0300
+++ 185.out.bad 2017-08-07 16:51:02.231922900 +0300
@@ -37,7 +37,7 @@
{"return": {}}
{"return": {}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, \
"event": "SHUTDOWN", "data": {"guest": false}}
-{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, \
"event": "BLOCK_JOB_CANCELLED", "data": {"device": "disk", \
"len": 4194304, "offset": 4194304, "speed": 65536, "type": \
"mirror"}}
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, \
"event": "BLOCK_JOB_CANCELLED", "data": {"device": "disk", \
"len": 0, "offset": 0, "speed": 65536, "type": "mirror"}}
=== Start backup job and exit qemu ===
Failures: 185
Failed 1 of 1 tests
This is because, under heavy load, the quit can happen before the first
iteration of the mirror request has occurred. To make sure we've had
time to iterate, let's just add a sleep for 0.5 seconds before quitting.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com>
Reviewed-by: Eric Blake <ebl...@redhat.com>
Signed-off-by: Kevin Wolf <kw...@redhat.com>
Commit: 9db6ffc76676731a25a5538ab71e8ca6ac234f80
https://github.com/qemu/qemu/commit/9db6ffc76676731a25a5538ab71e8ca6ac234f80
Author: Peter Maydell <peter.mayd...@linaro.org>
Date: 2017-08-11 (Fri, 11 Aug 2017)
Changed paths:
M block/file-posix.c
M block/qcow2.c
M block/vpc.c
M include/qemu/osdep.h
M tests/multiboot/run_test.sh
M tests/qemu-iotests/185
M util/osdep.c
Log Message:
-----------
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 <kw...@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.mayd...@linaro.org>
Compare: https://github.com/qemu/qemu/compare/95766c2cd043...9db6ffc76676
