From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:35482) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uh1zD-0000bv-Pc for qemu-devel@nongnu.org; Mon, 27 May 2013 14:17:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uh1zB-0002hQ-D6 for qemu-devel@nongnu.org; Mon, 27 May 2013 14:17:35 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:54019) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uh1zB-0002h3-8k for qemu-devel@nongnu.org; Mon, 27 May 2013 14:17:33 -0400 From: Stefano Stabellini Date: Mon, 27 May 2013 19:17:11 +0100 Message-ID: <1369678631-821-2-git-send-email-stefano.stabellini@eu.citrix.com> In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH 2/2] xen: use pc_init_pci instead of pc_init_pci_no_kvmclock List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: anthony.perard@citrix.com, pbonzini@redhat.com, aliguori@us.ibm.com, xen-devel@lists.xensource.com, Stefano Stabellini 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 --- 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