From patchwork Tue Oct 30 02:11:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Baron X-Patchwork-Id: 195259 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 452C32C008C for ; Tue, 30 Oct 2012 13:39:23 +1100 (EST) Received: from localhost ([::1]:34234 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TT1KL-0000yI-36 for incoming@patchwork.ozlabs.org; Mon, 29 Oct 2012 22:13:13 -0400 Received: from eggs.gnu.org ([208.118.235.92]:34636) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TT1Im-0005gF-KD for qemu-devel@nongnu.org; Mon, 29 Oct 2012 22:11:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TT1Ih-0001SI-Hq for qemu-devel@nongnu.org; Mon, 29 Oct 2012 22:11:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:27543) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TT1Ih-0001Rp-91 for qemu-devel@nongnu.org; Mon, 29 Oct 2012 22:11:31 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q9U2BTLf032653 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 29 Oct 2012 22:11:29 -0400 Received: from redhat.com (dhcp-185-114.bos.redhat.com [10.16.185.114]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q9U2BSQq001575; Mon, 29 Oct 2012 22:11:28 -0400 Date: Mon, 29 Oct 2012 22:11:28 -0400 From: Jason Baron To: qemu-devel@nongnu.org Message-Id: <1689c3c33a9cd8a99b7cdad2ad70155ee2b98ca4.1351561225.git.jbaron@redhat.com> In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: aliguori@us.ibm.com, juzhang@redhat.com, mst@redhat.com, jan.kiszka@siemens.com, armbru@redhat.com, agraf@suse.de, blauwirbel@gmail.com, yamahata@valinux.co.jp, alex.williamson@redhat.com, kevin@koconnor.net, avi@redhat.com, mkletzan@redhat.com, pbonzini@redhat.com, lcapitulino@redhat.com, afaerber@suse.de, kraxel@redhat.com Subject: [Qemu-devel] [PATCH v1 09/13] q35: Add kvmclock support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Jan Kiszka Reviewed-by: Paolo Bonzini Signed-off-by: Jan Kiszka Signed-off-by: Jason Baron --- hw/pc_q35.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/hw/pc_q35.c b/hw/pc_q35.c index cf0d361..1f31486 100644 --- a/hw/pc_q35.c +++ b/hw/pc_q35.c @@ -52,6 +52,7 @@ #include "mc146818rtc.h" #include "xen.h" #include "kvm.h" +#include "kvm/clock.h" #include "q35.h" #include "exec-memory.h" @@ -233,6 +234,8 @@ static void pc_q35_init(QEMUMachineInitArgs *args) pc_cpus_init(cpu_model); + kvmclock_create(); + if (ram_size >= 0xb0000000) { above_4g_mem_size = ram_size - 0xb0000000; below_4g_mem_size = 0xb0000000;