From patchwork Tue Oct 9 03:30:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Baron X-Patchwork-Id: 190189 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 239E32C0147 for ; Tue, 9 Oct 2012 15:11:36 +1100 (EST) Received: from localhost ([::1]:50827 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TLQXO-0002Lu-D5 for incoming@patchwork.ozlabs.org; Mon, 08 Oct 2012 23:31:18 -0400 Received: from eggs.gnu.org ([208.118.235.92]:57804) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TLQWm-00012F-Ox for qemu-devel@nongnu.org; Mon, 08 Oct 2012 23:30:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TLQWl-0001ry-V5 for qemu-devel@nongnu.org; Mon, 08 Oct 2012 23:30:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55168) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TLQWl-0001rg-NO for qemu-devel@nongnu.org; Mon, 08 Oct 2012 23:30:39 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q993UbkF011217 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 8 Oct 2012 23:30:37 -0400 Received: from redhat.com (dhcp-185-114.bos.redhat.com [10.16.185.114]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q993Uahg026306; Mon, 8 Oct 2012 23:30:36 -0400 Date: Mon, 8 Oct 2012 23:30:36 -0400 From: Jason Baron To: qemu-devel@nongnu.org Message-Id: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 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 v2 17/21] 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 Signed-off-by: Jan Kiszka Signed-off-by: Jason Baron Reviewed-by: Paolo Bonzini --- 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 b6a619a..48083bb 100644 --- a/hw/pc_q35.c +++ b/hw/pc_q35.c @@ -69,6 +69,7 @@ #include "mc146818rtc.h" #include "xen.h" #include "kvm.h" +#include "kvm/clock.h" #include "q35.h" #include "exec-memory.h" @@ -357,6 +358,8 @@ static void pc_q35_init(ram_addr_t ram_size, pc_cpus_init(cpu_model); + kvmclock_create(); + if (ram_size >= 0xb0000000) { above_4g_mem_size = ram_size - 0xb0000000; below_4g_mem_size = 0xb0000000;