From: Anthony Liguori Date: Wed, 7 Aug 2013 17:43:27 +0000 (-0500) Subject: Merge remote-tracking branch 'kwolf/for-anthony' into staging X-Git-Tag: qemu-xen-4.4.0-rc1~6^2~39 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=cafffa545420a2c6dc33f9cb58401c606af59572;p=qemu-upstream-4.4-testing.git Merge remote-tracking branch 'kwolf/for-anthony' into staging # By Fam Zheng (8) and others # Via Kevin Wolf * kwolf/for-anthony: vmdk: rename num_gtes_per_gte to num_gtes_per_gt vmdk: use heap allocation for whole_grain vmdk: check l1 size before opening image vmdk: check l2 table size when opening vmdk: check granularity field in opening qemu-iotests: add empty test case for vmdk qemu-iotests: add poke_file utility function vmdk: use unsigned values for on disk header fields vmdk: Make VMDK3Header and VmdkGrainMarker QEMU_PACKED sheepdog: add missing .bdrv_has_zero_init qemu-iotests: filter QEMU version in monitor banner iov: handle EOF in iov_send_recv ignore SIGPIPE in qemu-img and qemu-io qemu-img: Error out for excess arguments Message-id: 1375799990-995-1-git-send-email-kwolf@redhat.com Signed-off-by: Anthony Liguori --- cafffa545420a2c6dc33f9cb58401c606af59572