From patchwork Fri Jan 21 20:48:22 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 79924 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id DABA9B70E9 for ; Sat, 22 Jan 2011 07:56:18 +1100 (EST) Received: from localhost ([127.0.0.1]:40682 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PgO1o-0000aj-6u for incoming@patchwork.ozlabs.org; Fri, 21 Jan 2011 15:56:16 -0500 Received: from [140.186.70.92] (port=53077 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PgNuL-00050v-PR for qemu-devel@nongnu.org; Fri, 21 Jan 2011 15:48:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PgNuJ-00040M-N3 for qemu-devel@nongnu.org; Fri, 21 Jan 2011 15:48:33 -0500 Received: from fmmailgate03.web.de ([217.72.192.234]:55722) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PgNuJ-0003zs-AJ for qemu-devel@nongnu.org; Fri, 21 Jan 2011 15:48:31 -0500 Received: from smtp02.web.de ( [172.20.0.184]) by fmmailgate03.web.de (Postfix) with ESMTP id 6FF2718467F10; Fri, 21 Jan 2011 21:48:30 +0100 (CET) Received: from [92.75.143.98] (helo=localhost.localdomain) by smtp02.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #2) id 1PgNuI-0007KF-01; Fri, 21 Jan 2011 21:48:30 +0100 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Date: Fri, 21 Jan 2011 21:48:22 +0100 Message-Id: X-Mailer: git-send-email 1.7.1 In-Reply-To: References: In-Reply-To: References: X-Sender: jan.kiszka@web.de X-Provags-ID: V01U2FsdGVkX1+O6npTfJ3COH/WmqUAXTwozG5e32OYrxDaDNUZ VwP/ewQimmFxbPQn9S9stKhgsaPOmlaorBwGr4NDBCW2p12HCR LQcUosgDc= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org Subject: [Qemu-devel] [PATCH 18/18] kvm: x86: Only read/write MSR_KVM_ASYNC_PF_EN if supported X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Jan Kiszka If the kernel does not support KVM_CAP_ASYNC_PF, it also does not know about the related MSR. So skip it during state synchronization in that case. Fixes annoying kernel warnings. Signed-off-by: Jan Kiszka --- target-i386/kvm.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/target-i386/kvm.c b/target-i386/kvm.c index b2c5ee0..8e8880a 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -63,6 +63,9 @@ const KVMCapabilityInfo kvm_arch_required_capabilities[] = { static bool has_msr_star; static bool has_msr_hsave_pa; +#if defined(CONFIG_KVM_PARA) && defined(KVM_CAP_ASYNC_PF) +static bool has_msr_async_pf_en; +#endif static int lm_capable_kernel; static struct kvm_cpuid2 *try_get_cpuid(KVMState *s, int max) @@ -164,6 +167,7 @@ static int get_para_features(CPUState *env) features |= (1 << para_features[i].feature); } } + has_msr_async_pf_en = features & (1 << KVM_FEATURE_ASYNC_PF); return features; } #endif @@ -828,7 +832,10 @@ static int kvm_put_msrs(CPUState *env, int level) env->system_time_msr); kvm_msr_entry_set(&msrs[n++], MSR_KVM_WALL_CLOCK, env->wall_clock_msr); #if defined(CONFIG_KVM_PARA) && defined(KVM_CAP_ASYNC_PF) - kvm_msr_entry_set(&msrs[n++], MSR_KVM_ASYNC_PF_EN, env->async_pf_en_msr); + if (has_msr_async_pf_en) { + kvm_msr_entry_set(&msrs[n++], MSR_KVM_ASYNC_PF_EN, + env->async_pf_en_msr); + } #endif } #ifdef KVM_CAP_MCE @@ -1064,7 +1071,9 @@ static int kvm_get_msrs(CPUState *env) msrs[n++].index = MSR_KVM_SYSTEM_TIME; msrs[n++].index = MSR_KVM_WALL_CLOCK; #if defined(CONFIG_KVM_PARA) && defined(KVM_CAP_ASYNC_PF) - msrs[n++].index = MSR_KVM_ASYNC_PF_EN; + if (has_msr_async_pf_en) { + msrs[n++].index = MSR_KVM_ASYNC_PF_EN; + } #endif #ifdef KVM_CAP_MCE