From patchwork Tue Feb 1 21:15:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 524111 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p11LHxLR000732 for ; Tue, 1 Feb 2011 21:19:06 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752590Ab1BAVRf (ORCPT ); Tue, 1 Feb 2011 16:17:35 -0500 Received: from fmmailgate03.web.de ([217.72.192.234]:59153 "EHLO fmmailgate03.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752378Ab1BAVR3 (ORCPT ); Tue, 1 Feb 2011 16:17:29 -0500 Received: from smtp05.web.de ( [172.20.4.166]) by fmmailgate03.web.de (Postfix) with ESMTP id 15281186EC16E; Tue, 1 Feb 2011 22:16:09 +0100 (CET) Received: from [88.65.41.52] (helo=localhost.localdomain) by smtp05.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #2) id 1PkNa4-0006FM-01; Tue, 01 Feb 2011 22:16:08 +0100 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Cc: kvm@vger.kernel.org, qemu-devel@nongnu.org Subject: [PATCH v2 01/24] kvm: x86: Fix build in absence of KVM_CAP_ASYNC_PF Date: Tue, 1 Feb 2011 22:15:41 +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: V01U2FsdGVkX18KanaBkqcuA6EpDIECarI+Ef3zsiHxZ4KlXecQ svwlAlO8hXkWmCsdRDPSOFNffViNqccKB866K7ySPfQ3a1ETDG eUfRB8xKo= Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 01 Feb 2011 21:19:06 +0000 (UTC) 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