From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Date: Mon, 27 May 2013 16:46:01 +0000 (+0000)
Subject: xen: use pc_init_pci instead of pc_init_pci_no_kvmclock
X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~1730^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9cdf79d068f52f7de347cb45cfd8903519410e4d;p=sdk%2Femulator%2Fqemu.git

xen: use pc_init_pci instead of pc_init_pci_no_kvmclock

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 <stefano.stabellini@eu.citrix.com>
---

diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 742544e..2653502 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