[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/2] xen: use pc_init_pci instead of pc_init_pci_no_
From: |
Stefano Stabellini |
Subject: |
[Qemu-devel] [PATCH 2/2] xen: use pc_init_pci instead of pc_init_pci_no_kvmclock |
Date: |
Mon, 27 May 2013 19:17:11 +0100 |
Call kvmclock_create only if kvmclock_enabled.
Use pc_init_pci on Xen rather than pc_init_pci_no_kvmclock.
Signed-off-by: Stefano Stabellini <address@hidden>
---
hw/i386/pc_piix.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 1ef4cbf..4308031 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -98,7 +98,7 @@ 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();
}
@@ -323,7 +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);
+ pc_init_pci(args);
}
#endif
--
1.7.2.5