[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/11] target-i386: Fix build by providing stub kvm_a
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 06/11] target-i386: Fix build by providing stub kvm_arch_get_supported_cpuid() |
Date: |
Thu, 21 Nov 2013 17:49:33 +0100 |
From: Peter Maydell <address@hidden>
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 <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
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
- [Qemu-devel] [PULL for-1.7 00/11] Miscellaneous -rc patches, Paolo Bonzini, 2013/11/21
- [Qemu-devel] [PULL 01/11] sun4m: Add FCode ROM for TCX framebuffer, Paolo Bonzini, 2013/11/21
- [Qemu-devel] [PULL 02/11] configure: Explicitly set ARFLAGS so we can build with GNU Make 4.0, Paolo Bonzini, 2013/11/21
- [Qemu-devel] [PULL 04/11] atomic.h: Fix build with clang, Paolo Bonzini, 2013/11/21
- [Qemu-devel] [PULL 06/11] target-i386: Fix build by providing stub kvm_arch_get_supported_cpuid(),
Paolo Bonzini <=
- [Qemu-devel] [PULL 05/11] vfio-pci: Fix multifunction=on, Paolo Bonzini, 2013/11/21
- [Qemu-devel] [PULL 08/11] rng-egd: offset the point when repeatedly read from the buffer, Paolo Bonzini, 2013/11/21
- [Qemu-devel] [PULL 09/11] target-i386: yield to another VCPU on PAUSE, Paolo Bonzini, 2013/11/21
- [Qemu-devel] [PULL 07/11] rng-egd: remove redundant free, Paolo Bonzini, 2013/11/21
- [Qemu-devel] [PULL 10/11] mips jazz: do not raise data bus exception when accessing invalid addresses, Paolo Bonzini, 2013/11/21
- [Qemu-devel] [PULL 11/11] qga: Fix compiler warnings (missing format attribute, wrong format strings), Paolo Bonzini, 2013/11/21
- [Qemu-devel] [PULL 03/11] pc: get rid of builtin pvpanic for "-M pc-1.5", Paolo Bonzini, 2013/11/21
- Re: [Qemu-devel] [PULL for-1.7 00/11] Miscellaneous -rc patches, Paolo Bonzini, 2013/11/25