From patchwork Sun Feb 5 10:46:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 139622 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5F3AFB7259 for ; Sun, 5 Feb 2012 21:47:21 +1100 (EST) Received: from localhost ([::1]:51478 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rtzcs-0006w8-QL for incoming@patchwork.ozlabs.org; Sun, 05 Feb 2012 05:47:18 -0500 Received: from eggs.gnu.org ([140.186.70.92]:37992) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rtzch-0006l3-36 for qemu-devel@nongnu.org; Sun, 05 Feb 2012 05:47:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rtzcd-0006QX-Ac for qemu-devel@nongnu.org; Sun, 05 Feb 2012 05:47:07 -0500 Received: from fmmailgate01.web.de ([217.72.192.221]:42466) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rtzcc-0006QK-Ul for qemu-devel@nongnu.org; Sun, 05 Feb 2012 05:47:03 -0500 Received: from moweb001.kundenserver.de (moweb001.kundenserver.de [172.19.20.114]) by fmmailgate01.web.de (Postfix) with ESMTP id EC5B01A9BF027 for ; Sun, 5 Feb 2012 11:46:36 +0100 (CET) Received: from localhost.localdomain ([95.157.56.37]) by smtp.web.de (mrweb001) with ESMTPA (Nemesis) id 0M09uu-1ShXvc2oKy-00ubaF; Sun, 05 Feb 2012 11:46:36 +0100 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Date: Sun, 5 Feb 2012 11:46:29 +0100 Message-Id: <6776cc5c00f4d06d23c11b68d18fd96e27f71718.1328438750.git.jan.kiszka@web.de> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: References: In-Reply-To: References: X-Provags-ID: V02:K0:06rAQxYeWgyN3MxpmsPC9ckn7MfigExLhqh5yCZI311 r5JGgIlThbQwvFwsN853LBNkqWVqZYhcK4Z+/NJUGlwQASN9rd 52bFGB2+yEj253u+lsGjgqnpcseR8dHr2jhniR3Ax+LWFJRc4c /4A8JIRMqEQfY5WpvBLNlZ5QrqvKHM2VdtgKWKOz0V+U6ndlGH 5R+LLLSbn9oDJUhj+VBaw== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 217.72.192.221 Cc: Anthony Liguori , qemu-devel , kvm@vger.kernel.org Subject: [Qemu-devel] [PATCH 3/4] kvm: Add kvm_has_pit_state2 helper 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 To be used for in-kernel PIT emulation. Signed-off-by: Jan Kiszka --- kvm-all.c | 10 ++++++++++ kvm-stub.c | 5 +++++ kvm.h | 1 + 3 files changed, 16 insertions(+), 0 deletions(-) diff --git a/kvm-all.c b/kvm-all.c index c4babda..bddf922 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -75,6 +75,7 @@ struct KVMState struct kvm_sw_breakpoint_head kvm_sw_breakpoints; #endif int pit_in_kernel; + int pit_state2; int xsave, xcrs; int many_ioeventfds; int irqchip_inject_ioctl; @@ -954,6 +955,10 @@ int kvm_init(void) s->xcrs = kvm_check_extension(s, KVM_CAP_XCRS); #endif +#ifdef KVM_CAP_PIT_STATE2 + s->pit_state2 = kvm_check_extension(s, KVM_CAP_PIT_STATE2); +#endif + ret = kvm_arch_init(s); if (ret < 0) { goto err; @@ -1291,6 +1296,11 @@ int kvm_has_xcrs(void) return kvm_state->xcrs; } +int kvm_has_pit_state2(void) +{ + return kvm_state->pit_state2; +} + int kvm_has_many_ioeventfds(void) { if (!kvm_enabled()) { diff --git a/kvm-stub.c b/kvm-stub.c index f63a0d2..1f1c686 100644 --- a/kvm-stub.c +++ b/kvm-stub.c @@ -78,6 +78,11 @@ int kvm_allows_irq0_override(void) return 1; } +int kvm_has_pit_state2(void) +{ + return 0; +} + void kvm_setup_guest_memory(void *start, size_t size) { } diff --git a/kvm.h b/kvm.h index f9f1dc8..8ef4476 100644 --- a/kvm.h +++ b/kvm.h @@ -54,6 +54,7 @@ int kvm_has_robust_singlestep(void); int kvm_has_debugregs(void); int kvm_has_xsave(void); int kvm_has_xcrs(void); +int kvm_has_pit_state2(void); int kvm_has_many_ioeventfds(void); int kvm_has_gsi_routing(void);