From: Anthony Liguori Date: Sat, 2 Jun 2012 23:54:05 +0000 (+0800) Subject: Merge remote-tracking branch 'kwolf/for-anthony' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2eb02f28269dc47b38aa3becbaff1cc6300210da;p=qemu.git Merge remote-tracking branch 'kwolf/for-anthony' into staging * kwolf/for-anthony: ahci: SATA FIS is 20 bytes, not 0x20 virtio-blk: Fix geometry sector calculation block: prevent snapshot mode $TMPDIR symlink attack sheepdog: fix return value of do_load_save_vm_state virtio: Fix compiler warning for non Linux hosts --- 2eb02f28269dc47b38aa3becbaff1cc6300210da