From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37434) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VjXS8-0004F0-GB for qemu-devel@nongnu.org; Thu, 21 Nov 2013 11:50:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VjXS3-0005m5-5B for qemu-devel@nongnu.org; Thu, 21 Nov 2013 11:50:04 -0500 Received: from mail-ea0-x230.google.com ([2a00:1450:4013:c01::230]:55604) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VjXS2-0005lx-UT for qemu-devel@nongnu.org; Thu, 21 Nov 2013 11:49:59 -0500 Received: by mail-ea0-f176.google.com with SMTP id h14so2492702eaj.21 for ; Thu, 21 Nov 2013 08:49:58 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 21 Nov 2013 17:49:33 +0100 Message-Id: <1385052578-32352-7-git-send-email-pbonzini@redhat.com> In-Reply-To: <1385052578-32352-1-git-send-email-pbonzini@redhat.com> References: <1385052578-32352-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 06/11] target-i386: Fix build by providing stub kvm_arch_get_supported_cpuid() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , aliguori@amazon.com From: Peter Maydell Fix build failures with clang when KVM is not enabled by providing a stub version of kvm_arch_get_supported_cpuid(). We retain the compile time check that this function isn't called when CONFIG_KVM is not set by guarding the stub with ifndef __OPTIMIZE__ (we assume that an optimizing build will do sufficient constant folding and dead code elimination to remove the calls before linking). Signed-off-by: Peter Maydell Signed-off-by: Paolo Bonzini --- target-i386/kvm-stub.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/target-i386/kvm-stub.c b/target-i386/kvm-stub.c index 11429c4..2b9e801 100644 --- a/target-i386/kvm-stub.c +++ b/target-i386/kvm-stub.c @@ -16,3 +16,15 @@ bool kvm_allows_irq0_override(void) { return 1; } + +#ifndef __OPTIMIZE__ +/* This function is only called inside conditionals which we + * rely on the compiler to optimize out when CONFIG_KVM is not + * defined. + */ +uint32_t kvm_arch_get_supported_cpuid(KVMState *env, uint32_t function, + uint32_t index, int reg) +{ + abort(); +} +#endif -- 1.8.3.1