From patchwork Thu Jan 27 14:39:44 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 80703 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 16EF1B710D for ; Fri, 28 Jan 2011 01:40:29 +1100 (EST) Received: from localhost ([127.0.0.1]:60719 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PiT1K-0002YA-9L for incoming@patchwork.ozlabs.org; Thu, 27 Jan 2011 09:40:22 -0500 Received: from [140.186.70.92] (port=57139 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PiT0n-0002UO-FK for qemu-devel@nongnu.org; Thu, 27 Jan 2011 09:39:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PiT0m-0008Be-A4 for qemu-devel@nongnu.org; Thu, 27 Jan 2011 09:39:49 -0500 Received: from thoth.sbs.de ([192.35.17.2]:20994) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PiT0m-0008BU-1T for qemu-devel@nongnu.org; Thu, 27 Jan 2011 09:39:48 -0500 Received: from mail1.siemens.de (localhost [127.0.0.1]) by thoth.sbs.de (8.12.11.20060308/8.12.11) with ESMTP id p0REdjHQ001038; Thu, 27 Jan 2011 15:39:45 +0100 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p0REdiKi014508; Thu, 27 Jan 2011 15:39:45 +0100 Message-ID: <4D4183B0.4020305@siemens.com> Date: Thu, 27 Jan 2011 15:39:44 +0100 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: Marcelo Tosatti , Anthony Liguori References: In-Reply-To: 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] kvm: x86: Fix build in absence of KVM_CAP_ASYNC_PF 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 Reported by Stefan Hajnoczi. Signed-off-by: Jan Kiszka --- Build regression of "Only read/write MSR_KVM_ASYNC_PF_EN if supported". target-i386/kvm.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 8e8880a..05010bb 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -167,7 +167,9 @@ static int get_para_features(CPUState *env) features |= (1 << para_features[i].feature); } } +#ifdef KVM_CAP_ASYNC_PF has_msr_async_pf_en = features & (1 << KVM_FEATURE_ASYNC_PF); +#endif return features; } #endif