I'm away tomorrow and Kevin is also on vacation. So here is the weekly pull request one day early. We've got plenty of patches sitting in the block queue :).
The following changes since commit ecfe10c9a6f9bc77d0e4b7eb5d0f5d61e8fbaed8: Merge remote-tracking branch 'pmaydell/tags/pull-target-arm-20130820' into staging (2013-08-20 11:23:52 -0500) are available in the git repository at: git://github.com/stefanha/qemu.git block for you to fetch changes up to b10577df13fa4a1b38ea6c1ea7b66c6dfd90a07a: win32-aio: drop win32_aio_flush_cb() (2013-08-22 22:05:04 +0200) ---------------------------------------------------------------- Alex Bligh (32): aio / timers: Rename qemu_timer_* functions aio / timers: Rename qemu_new_clock and expose clock types aio / timers: add qemu-timer.c utility functions aio / timers: Consistent treatment of disabled clocks for deadlines aio / timers: add ppoll support with qemu_poll_ns aio / timers: Add prctl(PR_SET_TIMERSLACK, 1, ...) to reduce timer slack aio / timers: Make qemu_run_timers and qemu_run_all_timers return progress aio / timers: Split QEMUClock into QEMUClock and QEMUTimerList aio / timers: Untangle include files aio / timers: Add QEMUTimerListGroup and helper functions aio / timers: Add QEMUTimerListGroup to AioContext aio / timers: Add a notify callback to QEMUTimerList aio / timers: aio_ctx_prepare sets timeout from AioContext timers aio / timers: Add aio_timer_init & aio_timer_new wrappers aio / timers: Convert aio_poll to use AioContext timers' deadline aio / timers: Convert mainloop to use timeout aio / timers: On timer modification, qemu_notify or aio_notify aio / timers: Introduce new API timer_new and friends aio / timers: Use all timerlists in icount warp calculations aio / timers: Add documentation and new format calls aio / timers: Remove alarm timers aio / timers: Remove legacy qemu_clock_deadline & qemu_timerlist_deadline aio / timers: Add qemu_clock_get_ms and qemu_clock_get_ms aio / timers: Rearrange timer.h & make legacy functions call non-legacy aio / timers: Remove main_loop_timerlist aio / timers: Convert rtc_clock to be a QEMUClockType aio / timers: convert block_job_sleep_ns and co_sleep_ns to new API aio / timers: Add test harness for AioContext timers aio / timers: Add scripts/switch-timer-api aio / timers: Switch entire codebase to the new timer API aio / timers: Remove legacy interface aio / timers: remove dummy_io_handler_flush from tests/test-aio.c Asias He (1): block: Introduce bs->zero_beyond_eof Fam Zheng (4): block: better error message for read only format name vmdk: Move l1_size check into vmdk_add_extent() vmdk: fix L1 and L2 table size in vmdk3 open vmdk: support vmfsSparse files Kevin Wolf (1): qcow2: Change default for new images to compat=1.1 MORITA Kazutaka (1): block: Produce zeros when protocols reading beyond end of file Paolo Bonzini (1): vmdk: support vmfs files Stefan Hajnoczi (2): aio-win32: replace incorrect AioHandler->opaque usage with ->e win32-aio: drop win32_aio_flush_cb() aio-posix.c | 18 +- aio-win32.c | 24 +- arch_init.c | 12 +- async.c | 20 +- audio/audio.c | 6 +- audio/noaudio.c | 4 +- audio/spiceaudio.c | 4 +- audio/wavaudio.c | 2 +- backends/baum.c | 16 +- block.c | 46 ++- block/backup.c | 4 +- block/commit.c | 2 +- block/iscsi.c | 14 +- block/mirror.c | 10 +- block/qcow2.c | 5 +- block/qed.c | 10 +- block/stream.c | 2 +- block/vmdk.c | 52 +-- block/win32-aio.c | 10 +- blockdev.c | 8 +- blockjob.c | 4 +- configure | 37 ++ cpus.c | 138 +++++--- dma-helpers.c | 1 + hmp.c | 8 +- hw/acpi/core.c | 8 +- hw/acpi/piix4.c | 2 +- hw/alpha/typhoon.c | 2 +- hw/arm/omap1.c | 52 +-- hw/arm/pxa2xx.c | 61 ++-- hw/arm/spitz.c | 6 +- hw/arm/stellaris.c | 10 +- hw/arm/strongarm.c | 34 +- hw/audio/adlib.c | 2 +- hw/audio/intel-hda.c | 4 +- hw/audio/sb16.c | 6 +- hw/block/fdc.c | 6 +- hw/block/nvme.c | 20 +- hw/block/pflash_cfi01.c | 2 +- hw/block/pflash_cfi02.c | 10 +- hw/bt/hci-csr.c | 4 +- hw/bt/hci.c | 38 +- hw/bt/l2cap.c | 8 +- hw/char/cadence_uart.c | 12 +- hw/char/serial.c | 22 +- hw/char/virtio-serial-bus.c | 10 +- hw/core/ptimer.c | 18 +- hw/display/qxl-logger.c | 2 +- hw/display/qxl.c | 2 +- hw/display/vga.c | 6 +- hw/dma/pl330.c | 6 +- hw/dma/rc4030.c | 4 +- hw/dma/soc_dma.c | 8 +- hw/dma/xilinx_axidma.c | 1 + hw/i386/kvm/apic.c | 2 +- hw/i386/kvm/i8254.c | 6 +- hw/i386/xen_domainbuild.c | 6 +- hw/ide/core.c | 6 +- hw/input/hid.c | 10 +- hw/input/lm832x.c | 8 +- hw/input/tsc2005.c | 16 +- hw/input/tsc210x.c | 32 +- hw/intc/apic.c | 16 +- hw/intc/apic_common.c | 2 +- hw/intc/armv7m_nvic.c | 16 +- hw/intc/i8259.c | 4 +- hw/mips/cputimer.c | 16 +- hw/misc/arm_sysctl.c | 2 +- hw/misc/macio/cuda.c | 34 +- hw/misc/macio/macio.c | 4 +- hw/misc/vfio.c | 14 +- hw/net/dp8393x.c | 20 +- hw/net/e1000.c | 12 +- hw/net/lan9118.c | 4 +- hw/net/pcnet-pci.c | 4 +- hw/net/pcnet.c | 10 +- hw/net/rtl8139.c | 28 +- hw/net/virtio-net.c | 20 +- hw/openrisc/cputimer.c | 10 +- hw/ppc/ppc.c | 64 ++-- hw/ppc/ppc405_uc.c | 8 +- hw/ppc/ppc_booke.c | 10 +- hw/ppc/spapr.c | 8 +- hw/sd/sdhci.c | 28 +- hw/sparc64/sun4u.c | 24 +- hw/timer/arm_mptimer.c | 12 +- hw/timer/arm_timer.c | 1 + hw/timer/cadence_ttc.c | 6 +- hw/timer/etraxfs_timer.c | 2 +- hw/timer/exynos4210_mct.c | 3 +- hw/timer/exynos4210_pwm.c | 1 + hw/timer/grlib_gptimer.c | 2 + hw/timer/hpet.c | 20 +- hw/timer/i8254.c | 26 +- hw/timer/i8254_common.c | 4 +- hw/timer/imx_epit.c | 1 + hw/timer/imx_gpt.c | 1 + hw/timer/lm32_timer.c | 1 + hw/timer/m48t59.c | 18 +- hw/timer/mc146818rtc.c | 50 +-- hw/timer/omap_gptimer.c | 24 +- hw/timer/omap_synctimer.c | 2 +- hw/timer/pl031.c | 19 +- hw/timer/puv3_ost.c | 1 + hw/timer/pxa2xx_timer.c | 34 +- hw/timer/sh_timer.c | 1 + hw/timer/slavio_timer.c | 1 + hw/timer/tusb6010.c | 12 +- hw/timer/twl92230.c | 14 +- hw/timer/xilinx_timer.c | 1 + hw/tpm/tpm_tis.c | 1 + hw/usb/hcd-ehci.c | 10 +- hw/usb/hcd-musb.c | 6 +- hw/usb/hcd-ohci.c | 12 +- hw/usb/hcd-uhci.c | 15 +- hw/usb/hcd-xhci.c | 26 +- hw/usb/host-libusb.c | 6 +- hw/usb/host-linux.c | 6 +- hw/usb/redirect.c | 16 +- hw/virtio/virtio-balloon.c | 8 +- hw/virtio/virtio-rng.c | 14 +- hw/watchdog/wdt_i6300esb.c | 6 +- hw/watchdog/wdt_ib700.c | 10 +- hw/xtensa/pic_cpu.c | 10 +- include/block/aio.h | 52 ++- include/block/block_int.h | 4 + include/block/blockjob.h | 2 +- include/block/coroutine.h | 3 +- include/hw/acpi/acpi.h | 2 +- include/qemu/ratelimit.h | 2 +- include/qemu/timer.h | 676 ++++++++++++++++++++++++++++++++--- include/qemu/typedefs.h | 3 + include/sysemu/sysemu.h | 2 +- main-loop.c | 57 ++- migration-exec.c | 1 + migration-fd.c | 1 + migration-tcp.c | 1 + migration-unix.c | 1 + migration.c | 17 +- monitor.c | 8 +- nbd.c | 1 + net/dump.c | 2 +- net/net.c | 1 + net/socket.c | 1 + qemu-char.c | 2 +- qemu-coroutine-io.c | 1 + qemu-coroutine-sleep.c | 10 +- qemu-io-cmds.c | 1 + qemu-nbd.c | 1 + qemu-timer.c | 834 +++++++++++++++----------------------------- qtest.c | 10 +- savevm.c | 24 +- scripts/switch-timer-api | 178 ++++++++++ slirp/if.c | 2 +- slirp/misc.c | 1 + slirp/slirp.c | 4 +- stubs/clock-warp.c | 2 +- target-alpha/sys_helper.c | 12 +- target-arm/cpu.c | 4 +- target-arm/helper.c | 10 +- target-ppc/kvm.c | 8 +- target-ppc/kvm_ppc.c | 6 +- target-s390x/cpu.c | 4 +- target-s390x/misc_helper.c | 6 +- target-xtensa/op_helper.c | 2 +- tests/libqtest.h | 24 +- tests/test-aio.c | 132 +++++++ tests/test-thread-pool.c | 3 + thread-pool.c | 1 + ui/console.c | 30 +- ui/input.c | 6 +- ui/spice-core.c | 10 +- ui/vnc-auth-sasl.h | 1 + ui/vnc-auth-vencrypt.c | 2 +- ui/vnc-ws.c | 1 + vl.c | 14 +- xen-all.c | 12 +- 177 files changed, 2362 insertions(+), 1503 deletions(-) create mode 100755 scripts/switch-timer-api -- 1.8.3.1