diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-03-08 12:17:17 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-03-08 12:17:17 +0000 |
| commit | d7c698af8a5c7330a5ba70de0ff70904a661c20e (patch) | |
| tree | 6020293bdb1385b8dcd5c04d250af2fec828b2f0 /tests/test-x86-cpuid.c | |
| parent | 6570025e53df25c47486d79cc8d3aea725f1744e (diff) | |
| parent | 4089f7c6a0d91020ca60ce8300784c93dd9ddcbe (diff) | |
| download | qemu-d7c698af8a5c7330a5ba70de0ff70904a661c20e.zip | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block patches
# gpg: Signature made Fri 07 Mar 2014 13:30:04 GMT using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
* remotes/kevin/tags/for-upstream:
block: qemu-iotests 085 - live snapshots tests
hw/ide/ahci.h: Avoid shifting left into sign bit
block: Fix error path segfault in bdrv_open()
qemu-iotests: Test a few blockdev-add error cases
blockdev: Fix NULL pointer dereference in blockdev-add
blockdev: Fail blockdev-add with encrypted images
block/raw-win32: Strip "file:" prefix on creation
block/raw-win32: Implement bdrv_parse_filename()
block/raw-posix: Strip "file:" prefix on creation
block/raw-posix: Implement bdrv_parse_filename()
block: Keep "filename" option after parsing
block: mirror - remove code cruft that has no function
block: make bdrv_swap rebuild the bs graph node list field.
block: Fix bs->request_alignment assertion for bs->sg=1
iscsi: Use bs->sg for everything else than disks
qemu-iotests: Test progress output for conversion
qemu-img convert: Fix progress output
gluster: Remove unused defines and header include
gluster: Change licence to GPLv2+
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/test-x86-cpuid.c')
0 files changed, 0 insertions, 0 deletions