]> git.proxmox.com Git - qemu.git/commit
Merge remote-tracking branch 'sstabellini/xen_fixes_20130603' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 4 Jun 2013 19:58:58 +0000 (14:58 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 4 Jun 2013 19:58:58 +0000 (14:58 -0500)
commit8819c10b5d55d537d59a0ffd5d623f348fc36c47
tree21bc8ae625e1622834c3f0bf14da12c167619167
parenta3416197447e7846a927b6ccb4f1edb3a1982443
parent9cdf79d068f52f7de347cb45cfd8903519410e4d
Merge remote-tracking branch 'sstabellini/xen_fixes_20130603' into staging

* sstabellini/xen_fixes_20130603:
  xen: use pc_init_pci instead of pc_init_pci_no_kvmclock
  xen: remove xen_vcpu_init
  xen: start PCI hole at 0xe0000000 (same as pc_init1 and qemu-xen-traditional)
  xen_machine_pv: do not create a dummy CPU in machine->init
  main_loop: do not set nonblocking if xen_enabled()
  xen: simplify xen_enabled

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
hw/i386/pc_piix.c
include/hw/i386/pc.h