« Previous | Next » 

Revision d7c698af

IDd7c698af8a5c7330a5ba70de0ff70904a661c20e

Added by Peter Maydell over 10 years ago

Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging

Block patches

  1. gpg: Signature made Fri 07 Mar 2014 13:30:04 GMT using RSA key ID C88F2FD6
  2. gpg: Good signature from "Kevin Wolf <>"
  • 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 <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted