From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=34443 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PaSTt-0003ml-5n for qemu-devel@nongnu.org; Wed, 05 Jan 2011 07:28:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PaSTs-0003Ky-60 for qemu-devel@nongnu.org; Wed, 05 Jan 2011 07:28:45 -0500 Received: from fmmailgate03.web.de ([217.72.192.234]:57622) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PaSTr-0003Kq-MK for qemu-devel@nongnu.org; Wed, 05 Jan 2011 07:28:44 -0500 Message-ID: <4D2463FA.6030404@web.de> Date: Wed, 05 Jan 2011 13:28:42 +0100 From: Jan Kiszka MIME-Version: 1.0 References: In-Reply-To: Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Sender: jan.kiszka@web.de Subject: [Qemu-devel] [PATCH 22/21] kvm: x86: Only read/write MSR_KVM_ASYNC_PF_EN if supported List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Avi Kivity , Marcelo Tosatti Cc: Gleb Natapov , qemu-devel@nongnu.org, kvm@vger.kernel.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 | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 79a1da8..af79526 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -64,6 +64,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(int max) @@ -165,6 +168,7 @@ static int get_para_features(void) features |= (1 << para_features[i].feature); } } + has_msr_async_pf_en = features & (1 << KVM_FEATURE_ASYNC_PF); return features; } #endif @@ -917,7 +921,9 @@ 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 @@ -1149,7 +1155,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