From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:57877) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv2oM-0002IF-33 for qemu-devel@nongnu.org; Tue, 15 Jan 2013 04:28:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tv2oL-0000bo-3P for qemu-devel@nongnu.org; Tue, 15 Jan 2013 04:28:01 -0500 Received: from cantor2.suse.de ([195.135.220.15]:41026 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv2oK-0000bf-UH for qemu-devel@nongnu.org; Tue, 15 Jan 2013 04:28:01 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 15 Jan 2013 10:27:26 +0100 Message-Id: <1358242058-1404-9-git-send-email-afaerber@suse.de> In-Reply-To: <1358242058-1404-1-git-send-email-afaerber@suse.de> References: <1358242058-1404-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 08/20] kvm: Add fake KVM constants to avoid #ifdefs on KVM-specific code List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Eduardo Habkost , =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Eduardo Habkost Any KVM-specific code that use these constants must check if kvm_enabled() is true before using them. Signed-off-by: Eduardo Habkost Reviewed-by: Gleb Natapov Signed-off-by: Andreas F=C3=A4rber --- include/sysemu/kvm.h | 14 ++++++++++++++ 1 Datei ge=C3=A4ndert, 14 Zeilen hinzugef=C3=BCgt(+) diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index 2fe8f8a..6bdd513 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -22,6 +22,20 @@ #ifdef CONFIG_KVM #include #include +#else +/* These constants must never be used at runtime if kvm_enabled() is fal= se. + * They exist so we don't need #ifdefs around KVM-specific code that alr= eady + * 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 =20 extern int kvm_allowed; --=20 1.7.10.4