diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-07-10 08:04:51 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-07-10 08:04:51 +0100 |
| commit | 6784273a0e97a2a348f6ae983408aa00ef4a3132 (patch) | |
| tree | d78f02808de600a9a98cbde0ebfb4d8dfa55ae1f /trace/simple.c | |
| parent | b34181056c04e05db6c632063012beaee7006a37 (diff) | |
| parent | 0e4e4318eaa56c831001bdf617094807ec6d451c (diff) | |
| download | qemu-6784273a0e97a2a348f6ae983408aa00ef4a3132.zip qemu-6784273a0e97a2a348f6ae983408aa00ef4a3132.tar.gz qemu-6784273a0e97a2a348f6ae983408aa00ef4a3132.tar.bz2 | |
Merge remote-tracking branch 'remotes/xanclic/tags/pull-block-2018-07-09' into staging
Block patches for 3.0-rc0:
- qcow2 metadata overlap protection for the persistent bitmap directory
- Various bug fixes
# gpg: Signature made Mon 09 Jul 2018 19:54:38 BST
# gpg: using RSA key F407DB0061D5CF40
# gpg: Good signature from "Max Reitz <mreitz@redhat.com>"
# Primary key fingerprint: 91BE B60A 30DB 3E88 57D1 1829 F407 DB00 61D5 CF40
* remotes/xanclic/tags/pull-block-2018-07-09:
qcow2: add overlap check for bitmap directory
iotests: Add VMDK backing file correlation test
vmdk: Fix possible segfault with non-VMDK backing
raw: Drop superfluous semicolon
qcow2: Drop unreachable break
file-posix: Fix fd_open check in raw_co_copy_range_to
qcow2: Drop unused cluster_data
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'trace/simple.c')
0 files changed, 0 insertions, 0 deletions