From patchwork Mon Jan 7 18:20:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 210026 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9BF992C0098 for ; Tue, 8 Jan 2013 05:19:41 +1100 (EST) Received: from localhost ([::1]:55652 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsHIR-0001Fg-Jn for incoming@patchwork.ozlabs.org; Mon, 07 Jan 2013 13:19:39 -0500 Received: from eggs.gnu.org ([208.118.235.92]:51364) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsHI2-00018E-0q for qemu-devel@nongnu.org; Mon, 07 Jan 2013 13:19:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TsHHz-00070F-1q for qemu-devel@nongnu.org; Mon, 07 Jan 2013 13:19:13 -0500 Received: from mx1.redhat.com ([209.132.183.28]:7132) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsHHy-0006zq-QL for qemu-devel@nongnu.org; Mon, 07 Jan 2013 13:19:10 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r07IJ9nI023466 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 7 Jan 2013 13:19:09 -0500 Received: from blackpad.lan.raisama.net (vpn1-7-15.gru2.redhat.com [10.97.7.15]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r07IJ9un029362; Mon, 7 Jan 2013 13:19:09 -0500 Received: by blackpad.lan.raisama.net (Postfix, from userid 500) id 1A094203D0F; Mon, 7 Jan 2013 16:20:50 -0200 (BRST) From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Mon, 7 Jan 2013 16:20:42 -0200 Message-Id: <1357582848-16575-2-git-send-email-ehabkost@redhat.com> In-Reply-To: <1357582848-16575-1-git-send-email-ehabkost@redhat.com> References: <1357582848-16575-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kvm@vger.kernel.org, Gleb Natapov , "Michael S. Tsirkin" , libvir-list@redhat.com, Marcelo Tosatti , Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH qom-cpu 1/7] kvm: Add fake KVM constants to avoid #ifdefs on KVM-specific code 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 Any KVM-specific code that use these constants must check if kvm_enabled() is true before using them. Signed-off-by: Eduardo Habkost --- Cc: kvm@vger.kernel.org Cc: Michael S. Tsirkin Cc: Gleb Natapov Cc: Marcelo Tosatti --- include/sysemu/kvm.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index 3db19ff..15f9658 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -21,6 +21,20 @@ #ifdef CONFIG_KVM #include #include +#else +/* These constants must never be used at runtime if kvm_enabled() is false. + * They exist so we don't need #ifdefs around KVM-specific code that already + * checks kvm_enabled() properly. + */ +#define KVM_CPUID_SIGNATURE 0 +#define KVM_CPUID_FEATURES 0 +#define KVM_FEATURE_CLOCKSOURCE 0 +#define KVM_FEATURE_NOP_IO_DELAY 0 +#define KVM_FEATURE_MMU_OP 0 +#define KVM_FEATURE_CLOCKSOURCE2 0 +#define KVM_FEATURE_ASYNC_PF 0 +#define KVM_FEATURE_STEAL_TIME 0 +#define KVM_FEATURE_PV_EOI 0 #endif extern int kvm_allowed;