diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-06-04 14:58:58 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-06-04 14:58:58 -0500 |
| commit | 8819c10b5d55d537d59a0ffd5d623f348fc36c47 (patch) | |
| tree | 21bc8ae625e1622834c3f0bf14da12c167619167 /hw/i386/pc_piix.c | |
| parent | a3416197447e7846a927b6ccb4f1edb3a1982443 (diff) | |
| parent | 9cdf79d068f52f7de347cb45cfd8903519410e4d (diff) | |
| download | focaccia-qemu-8819c10b5d55d537d59a0ffd5d623f348fc36c47.tar.gz focaccia-qemu-8819c10b5d55d537d59a0ffd5d623f348fc36c47.zip | |
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>
Diffstat (limited to 'hw/i386/pc_piix.c')
| -rw-r--r-- | hw/i386/pc_piix.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index d547548866..d6185705a6 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -98,13 +98,13 @@ static void pc_init1(MemoryRegion *system_memory, pc_cpus_init(cpu_model, icc_bridge); pc_acpi_init("acpi-dsdt.aml"); - if (kvmclock_enabled) { + if (kvm_enabled() && kvmclock_enabled) { kvmclock_create(); } - if (ram_size >= 0xe0000000 ) { - above_4g_mem_size = ram_size - 0xe0000000; - below_4g_mem_size = 0xe0000000; + if (ram_size >= QEMU_BELOW_4G_RAM_END ) { + above_4g_mem_size = ram_size - QEMU_BELOW_4G_RAM_END; + below_4g_mem_size = QEMU_BELOW_4G_RAM_END; } else { above_4g_mem_size = 0; below_4g_mem_size = ram_size; @@ -323,8 +323,7 @@ static void pc_xen_hvm_init(QEMUMachineInitArgs *args) if (xen_hvm_init() != 0) { hw_error("xen hardware virtual machine initialisation failed"); } - pc_init_pci_no_kvmclock(args); - xen_vcpu_init(); + pc_init_pci(args); } #endif |