[patch] today's qemu-kvm build fix

[patch] today's qemu-kvm build fix

[Jes Sorensen]

[-- Attachment #1: Type: text/plain, Size: 241 bytes --]

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

[-- Attachment #2: 0008-qemu-cpuid-cleanup.patch --]
[-- Type: text/x-patch, Size: 688 bytes --]

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 <jes@sgi.com>

---
 qemu-kvm.c |    6 ------
 1 file changed, 6 deletions(-)

Index: qemu-kvm/qemu-kvm.c
===================================================================
--- qemu-kvm.orig/qemu-kvm.c
+++ 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);
-}

Re: [patch] today's qemu-kvm build fix

[Avi Kivity]

Jes Sorensen wrote:
> 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.

-- 
error compiling committee.c: too many arguments to function

Re: [patch] today's qemu-kvm build fix

[Jes Sorensen]

[-- Attachment #1: Type: text/plain, Size: 169 bytes --]

Avi Kivity wrote:
> 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


[-- Attachment #2: 0008-qemu-cpuid-cleanup.patch --]
[-- Type: text/x-patch, Size: 1117 bytes --]

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 <jes@sgi.com>

---
 qemu-kvm-x86.c |    6 ++++++
 qemu-kvm.c     |    6 ------
 2 files changed, 6 insertions(+), 6 deletions(-)

Index: qemu-kvm/qemu-kvm-x86.c
===================================================================
--- qemu-kvm.orig/qemu-kvm-x86.c
+++ 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);
+}
Index: qemu-kvm/qemu-kvm.c
===================================================================
--- qemu-kvm.orig/qemu-kvm.c
+++ 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);
-}

Re: [patch] today's qemu-kvm build fix

[Avi Kivity]

Jes Sorensen wrote:
> Avi Kivity wrote:
>> 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.

-- 
error compiling committee.c: too many arguments to function