Skip to contentSkip to conversation

today's qemu-kvm build fix

PATCH Applied Jes Sorensen 2 participants 4 messages May 11, 2009 KVM

lore
Share & tools
lore

Jes Sorensen

author
#0 lore raw

PATCH 1/1 today's qemu-kvm build fix

Hi,

This one is a bit strange, somehow we ended up with a kvm_get_supported_cpuid() in qemu-kvm.c, where it should never have been given it's in target-i386/kvm.c and called only from libkvm-x86.c

With this I can build again.

Cheers,
Jes

kvm_arch_get_supported_cpuid() is already defined in target-i386/kvm.c we don't need another copy in qemu-kvm.c, especially as this is x86 specific.

Signed-off-by Jes Sorensen <[email protected]>
---
 qemu-kvm.c |    6 ------
 1 file changed, 6 deletions(-)
qemu-kvm.c +0 -6
Index: qemu-kvm/qemu-kvm.c
===================================================================
@@ -1400,9 +1400,3 @@
     if (kvm_enabled())
         env->kvm_cpu_state.stopped = 1;
 }
-
-uint32_t kvm_arch_get_supported_cpuid(CPUState *env, uint32_t function,
-                                      int reg)
-{
-    return kvm_get_supported_cpuid(kvm_context, function, reg);
-}
#1 lore raw
Quoted 6 lines · Jes Sorensen

Hi,

This one is a bit strange, somehow we ended up with a kvm_get_supported_cpuid() in qemu-kvm.c, where it should never have been given it's in target-i386/kvm.c and called only from libkvm-x86.c

kvm.c is not (yet) built in qemu-kvm.git. Please move the function to qemu-kvm-x86.c instead.

Signature · 1 line
error compiling committee.c: too many arguments to function
author
#2 lore raw
Quoted 2 lines · Avi Kivity

kvm.c is not (yet) built in qemu-kvm.git. Please move the function to qemu-kvm-x86.c instead.

Ok,

Grossness is now in qemu-kvm-x86.c.

Jes

kvm_arch_get_supported_cpuid() doesn't belong in qemu-kvm.c as it is just an x86 specific build workaround.

Signed-off-by Jes Sorensen <[email protected]>
---
 qemu-kvm-x86.c |    6 ++++++
 qemu-kvm.c     |    6 ------
 2 files changed, 6 insertions(+), 6 deletions(-)
qemu-kvm-x86.c +6 -0
Index: qemu-kvm/qemu-kvm-x86.c
===================================================================
@@ -910,3 +910,9 @@
         return true;
     return false;
 }
+
+uint32_t kvm_arch_get_supported_cpuid(CPUState *env, uint32_t function,
+                                      int reg)
+{
+    return kvm_get_supported_cpuid(kvm_context, function, reg);
+}
qemu-kvm.c +0 -6
Index: qemu-kvm/qemu-kvm.c
===================================================================
@@ -1400,9 +1400,3 @@
     if (kvm_enabled())
         env->kvm_cpu_state.stopped = 1;
 }
-
-uint32_t kvm_arch_get_supported_cpuid(CPUState *env, uint32_t function,
-                                      int reg)
-{
-    return kvm_get_supported_cpuid(kvm_context, function, reg);
-}
Applied
#3 lore raw
Quoted 9 lines · Jes Sorensen
Quoted 3 lines · Avi Kivity

kvm.c is not (yet) built in qemu-kvm.git. Please move the function to qemu-kvm-x86.c instead.

Ok,

Grossness is now in qemu-kvm-x86.c.

Thanks, applied.

Signature · 1 line
error compiling committee.c: too many arguments to function