From patchwork Wed Nov 14 20:54:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Baron X-Patchwork-Id: 199032 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 3C0E72C0090 for ; Thu, 15 Nov 2012 08:57:56 +1100 (EST) Received: from localhost ([::1]:50903 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TYjz3-0008TJ-Jo for incoming@patchwork.ozlabs.org; Wed, 14 Nov 2012 15:54:53 -0500 Received: from eggs.gnu.org ([208.118.235.92]:53134) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TYjyR-0006wp-Md for qemu-devel@nongnu.org; Wed, 14 Nov 2012 15:54:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TYjyO-0004SE-GF for qemu-devel@nongnu.org; Wed, 14 Nov 2012 15:54:15 -0500 Received: from mx1.redhat.com ([209.132.183.28]:12554) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TYjyO-0004S4-8q for qemu-devel@nongnu.org; Wed, 14 Nov 2012 15:54:12 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qAEKs9Ya014919 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 14 Nov 2012 15:54:09 -0500 Received: from redhat.com (dhcp-185-114.bos.redhat.com [10.16.185.114]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id qAEKs8XO001330; Wed, 14 Nov 2012 15:54:09 -0500 Date: Wed, 14 Nov 2012 15:54:08 -0500 From: Jason Baron To: anthony@codemonkey.ws, qemu-devel@nongnu.org Message-Id: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: alex.williamson@redhat.com, mst@redhat.com, jan.kiszka@siemens.com, armbru@redhat.com, agraf@suse.de, blauwirbel@gmail.com, yamahata@valinux.co.jp, juzhang@redhat.com, kevin@koconnor.net, kraxel@redhat.com, gsomlo@gmail.com, mkletzan@redhat.com, pbonzini@redhat.com, lcapitulino@redhat.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH v4 12/14] 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 142bf8a..3429a9a 100644 --- a/hw/pc_q35.c +++ b/hw/pc_q35.c @@ -34,6 +34,7 @@ #include "mc146818rtc.h" #include "xen.h" #include "kvm.h" +#include "kvm/clock.h" #include "q35.h" #include "exec-memory.h" #include "ich9.h" @@ -87,6 +88,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;