From: Anthony Liguori Date: Mon, 19 Nov 2012 15:27:00 +0000 (-0600) Subject: Merge remote-tracking branch 'kwolf/for-anthony' into staging X-Git-Tag: v1.3.0-rc0~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ad1db3b341d3d55e6d722ad868bd48ed4425c9fb;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'kwolf/for-anthony' into staging * kwolf/for-anthony: (26 commits) qemu-io: Use bdrv_drain_all instead of qemu_aio_flush megasas: Use bdrv_drain_all instead of qemu_aio_flush vmdk: Fix data corruption bug in WRITE and READ handling fdc: remove last usage of FD_STATE_SEEK fdc: fix typo in zero constant fdc: remove double affectation of FD_MSR_CMDBUSY flag fdc-tests: add tests for VERIFY command fdc: implement VERIFY command fdc-test: Check READ ID fdc: fix false FD_SR0_SEEK fdc: fix FD_SR0_SEEK for initial seek on DMA transfers fdc: fix FD_SR0_SEEK for non-DMA transfers and multi sectors transfers fdc: use status0 field instead of a local variable fdc-test: add tests for non-DMA READ command fdc-test: insert media before fuzzing registers fdc-test: split test_media_change() test, so insert part can be reused fdc: Remove status0 parameter from fdctrl_set_fifo() aio: rename AIOPool to AIOCBInfo aio: use g_slice_alloc() for AIOCB pooling aio: switch aiocb_size type int -> size_t ... Signed-off-by: Anthony Liguori --- ad1db3b341d3d55e6d722ad868bd48ed4425c9fb