diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-07-25 16:27:54 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-07-25 16:27:54 +0100 |
| commit | 0f1e9c80941cca7721bf71ab19bf2c06c853169c (patch) | |
| tree | f2f1d7ad1922c1a0d73a1cfd739a5b01a7712bfc /tests | |
| parent | 4c4414a4388f902b7ae2814f9a64898dd0e426a5 (diff) | |
| parent | bd998d7cc8ced211def90e4225042d63dddecc54 (diff) | |
| download | qemu-0f1e9c80941cca7721bf71ab19bf2c06c853169c.zip qemu-0f1e9c80941cca7721bf71ab19bf2c06c853169c.tar.gz qemu-0f1e9c80941cca7721bf71ab19bf2c06c853169c.tar.bz2 | |
Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2017-07-25' into staging
Block patches for 2.10-rc0
# gpg: Signature made Tue 25 Jul 2017 15:35:12 BST
# gpg: using RSA key 0xF407DB0061D5CF40
# gpg: Good signature from "Max Reitz <mreitz@redhat.com>"
# Primary key fingerprint: 91BE B60A 30DB 3E88 57D1 1829 F407 DB00 61D5 CF40
* remotes/maxreitz/tags/pull-block-2017-07-25:
qemu-iotests: Fix reference output for 186
qcow2-bitmap: fix bitmap_free
qcow: fix memory leaks related to encryption
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/qemu-iotests/186.out | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/qemu-iotests/186.out b/tests/qemu-iotests/186.out index b963b12..b8bf9a2 100644 --- a/tests/qemu-iotests/186.out +++ b/tests/qemu-iotests/186.out @@ -442,7 +442,7 @@ ide0-cd0 (NODE_NAME): null-co:// (null-co, read-only) Cache mode: writeback (qemu) quit -warning: qemu-system-x86_64: -drive if=scsi,driver=null-co: bus=0,unit=0 is deprecated with this machine type +qemu-system-x86_64: -drive if=scsi,driver=null-co: warning: bus=0,unit=0 is deprecated with this machine type Testing: -drive if=scsi,driver=null-co QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block @@ -451,7 +451,7 @@ scsi0-hd0 (NODE_NAME): null-co:// (null-co) Cache mode: writeback (qemu) quit -warning: qemu-system-x86_64: -drive if=scsi,media=cdrom: bus=0,unit=0 is deprecated with this machine type +qemu-system-x86_64: -drive if=scsi,media=cdrom: warning: bus=0,unit=0 is deprecated with this machine type Testing: -drive if=scsi,media=cdrom QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block @@ -460,7 +460,7 @@ scsi0-cd0: [not inserted] Removable device: not locked, tray closed (qemu) quit -warning: qemu-system-x86_64: -drive if=scsi,driver=null-co,media=cdrom: bus=0,unit=0 is deprecated with this machine type +qemu-system-x86_64: -drive if=scsi,driver=null-co,media=cdrom: warning: bus=0,unit=0 is deprecated with this machine type Testing: -drive if=scsi,driver=null-co,media=cdrom QEMU X.Y.Z monitor - type 'help' for more information (qemu) info block |