Skip to contentSkip to conversation

SIMPLE_ATTRIBUTE_GETTER compile fix

PATCH Andrea Arcangeli 2 participants 3 messages Feb 12, 2008 KVM

lore
Share & tools
lore
#0 lore raw

Hello,

this GETTER stuff looks a bit tricky... (we've just to cope with it).

Anyway this allows building again and perhaps there's something good in the patch (not sure about the >= 2.6.25 side that I didn't touch)

kernel/external-module-compat.h +1 -1
index 3b45999..fe6108c 100644
@@ -658,7 +664,7 @@ static inline struct page *__kvm_vm_fault(struct vm_area_struct *vma,
 	{				      \
 		u64 ret = 0;		      \
 					      \
-		__##x(v, &ret);		      \
+		__##x(v);		      \
 		return ret;		      \
 	}
 
kernel/hack-module.awk +1 -1
index 126957a..c98666e 100644
@@ -40,7 +40,7 @@
     $0 = "\t.VMA_OPS_FAULT(fault) = VMA_OPS_FAULT_FUNC(" fcn "),"
 }
 
-/^static int .*_stat_get/ {
+/^static .*_stat_get/ {
     $3 = "__" $3
 }
 

-------------------------------------------------------------------------
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/

#1 lore raw
Quoted 14 lines · Andrea Arcangeli

Hello,

this GETTER stuff looks a bit tricky... (we've just to cope with it).

Anyway this allows building again and perhaps there's something good in the patch (not sure about the >= 2.6.25 side that I didn't touch)

kernel/external-module-compat.h +0 -0
index 3b45999..fe6108c 100644

kernel/external-module-compat.h static inline struct page *__kvm_vm_fault(struct vm_area_struct *vma, · line 670

Quoted 8 lines
kernel/external-module-compat.h +1 -1
@@ -658,7 +664,7 @@ static inline struct page *__kvm_vm_fault(struct vm_area_struct *vma,
 	{				      \
 		u64 ret = 0;		      \
 					      \
-		__##x(v, &ret);		      \
+		__##x(v);		      \
 		return ret;		      \
 	}
 

But, getters are defined as

Quoted 1 line

static int vm_stat_get(void *_offset, u64 *val)

Perhaps you have an old kvm.git?

Signature · 7 lines
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/
#2 lore raw
Quoted 1 line · Avi Kivity

Perhaps you have an old kvm.git?

ouch good point! Ignore it then, I've been deferring any change to kvm.git updates until I tracked down my kvm-userland troubles, I'll try again after a kvm.git pull and I'll let you know if there's any further trouble. Thanks!

-------------------------------------------------------------------------
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/