| commit | 277ba8a6d717abb2f36896cd9877a68d2cf03d77 | |
| author | Anthony Liguori <aliguori@us.ibm.com> | |
| Tue, 19 Mar 2013 12:58:44 +0000 (19 07:58 -0500) | ||
| committer | Anthony Liguori <aliguori@us.ibm.com> | |
| Tue, 19 Mar 2013 12:58:44 +0000 (19 07:58 -0500) | ||
| tree | 3b330b5d9e5a529410444237fd56e86c1c2193f4 | treesnapshot (tar.gz zip) |
| parent | 2c8a59422c06fe1e37c85502d92ccdfb5e2ac987 | commitdiff |
| parent | a8e5cc0c076a6e3a62f0e9aad88b007dccf3dd17 | commitdiff |
Merge remote-tracking branch 'kwolf/for-anthony' into staging
# By Stefan Hajnoczi (2) and others
# Via Kevin Wolf
* kwolf/for-anthony:
virtio-blk: Do not segfault fault if failed to initialize dataplane
qemu-iotests: add 052 BDRV_O_SNAPSHOT test
block: fix BDRV_O_SNAPSHOT protocol detection
qcow2: Fix segfault in qcow2_invalidate_cache
sheepdog: show error message for halt status
# By Stefan Hajnoczi (2) and others
# Via Kevin Wolf
* kwolf/for-anthony:
virtio-blk: Do not segfault fault if failed to initialize dataplane
qemu-iotests: add 052 BDRV_O_SNAPSHOT test
block: fix BDRV_O_SNAPSHOT protocol detection
qcow2: Fix segfault in qcow2_invalidate_cache
sheepdog: show error message for halt status