]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'sstabellini/for_1.1_rc3' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 29 May 2012 09:32:13 +0000 (04:32 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 29 May 2012 09:32:13 +0000 (04:32 -0500)
* sstabellini/for_1.1_rc3:
  Call xc_domain_shutdown with the reboot flag when the guest requests a reboot.
  xen: Fix PV-on-HVM
  xen_disk: properly update stats in ioreq_release()
  xen_disk: use bdrv_aio_flush instead of bdrv_flush
  xen_disk: remove syncwrite option
  xen: disable rtc_clock
  xen: do not initialize the interval timer and PCSPK emulator

1  2 
hw/pc.c

diff --cc hw/pc.c
Simple merge