[PATCH] Remove unnecessary linux/kvm.h include (v2)

[PATCH] Remove unnecessary linux/kvm.h include (v2)

[Anthony Liguori]

This removes an unnecessary include of linux/kvm.h which happens to silence
a warning introduced by my previous patch :-)  We have to move the ABI check
too until we've included libkvm.h.

Signed-off-by: Anthony Liguori <aliguori-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>

diff --git a/libkvm/libkvm.c b/libkvm/libkvm.c
index d798841..28df774 100644
--- a/libkvm/libkvm.c
+++ b/libkvm/libkvm.c
@@ -18,18 +18,6 @@
 #define __user /* temporary, until installed via make headers_install */
 #endif
 
-#if defined(__i386__) || defined(__x86_64__)
-#define CONFIG_X86
-#endif
-
-#include <linux/kvm.h>
-
-#define EXPECTED_KVM_API_VERSION 12
-
-#if EXPECTED_KVM_API_VERSION != KVM_API_VERSION
-#error libkvm: userspace and kernel version mismatch
-#endif
-
 #include <unistd.h>
 #include <fcntl.h>
 #include <stdio.h>
@@ -40,6 +28,12 @@
 #include <sys/ioctl.h>
 #include "libkvm.h"
 
+#define EXPECTED_KVM_API_VERSION 12
+
+#if EXPECTED_KVM_API_VERSION != KVM_API_VERSION
+#error libkvm: userspace and kernel version mismatch
+#endif
+
 #if defined(__x86_64__) || defined(__i386__)
 #include "kvm-x86.h"
 #endif

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/

Re: [PATCH] Remove unnecessary linux/kvm.h include (v2)

[Avi Kivity]

Anthony Liguori wrote:
> This removes an unnecessary include of linux/kvm.h which happens to silence
> a warning introduced by my previous patch :-)  We have to move the ABI check
> too until we've included libkvm.h.
>
>   

Doesn't apply, please check.

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


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/

Re: [PATCH] Remove unnecessary linux/kvm.h include (v2)

[Anthony Liguori]

Avi Kivity wrote:
> Anthony Liguori wrote:
>> This removes an unnecessary include of linux/kvm.h which happens to 
>> silence
>> a warning introduced by my previous patch :-)  We have to move the 
>> ABI check
>> too until we've included libkvm.h.
>>
>>   
>
> Doesn't apply, please check.

Did you apply "Remove -DCONFIG_X86 from qemu_cflags"?  I probably should 
have folded that patch too.  Look for my next note "Remove -DCONFIG_X86 
from qemu cflags (v2)".  You can just apply that.

Sorry for all the confusion, it was a long day yesterday :-)

Regards,

Anthony Liguori


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/