]> git.proxmox.com Git - qemu.git/commit
Merge remote-tracking branch 'stefanha/block' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 15 Apr 2013 13:02:41 +0000 (08:02 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 15 Apr 2013 13:02:41 +0000 (08:02 -0500)
commitdb08dc213ba87d16c34c235f5c83f70f0239f023
tree75729e2695511f7ef73cf9cf9fc4b2b6206c2f2e
parentc530b1423b86f1589c49bccb460a75cb87322562
parentdc7588c1eb3008bda53dde1d6b890cd299758155
Merge remote-tracking branch 'stefanha/block' into staging

* stefanha/block:
  rbd: add an asynchronous flush
  iotests: Add 'check -ssh' option to test Secure Shell block device.
  block: ssh: Use libssh2_sftp_fsync (if supported by libssh2) to flush to disk.
  block: Add support for Secure Shell (ssh) block device.
  ide: refuse WIN_READ_NATIVE_MAX on empty device
  qemu-iotests: filter QEMU_PROG in 051.out
  qemu-iotests: Add test for -drive options
  qemu-iotests: A few more bdrv_pread/pwrite tests
  block: Introduce bdrv_pwritev() for qcow2_save_vmstate
  savevm: Implement block_writev_buffer()
  block: Introduce bdrv_writev_vmstate

Conflicts:
savevm.c

aliguori: add f->pos parameter to writev_buffer().

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
savevm.c