kvm-s390: fix memsize >=4G on linus git head

PATCH In review Christian Borntraeger 2 participants 2 messages Sep 21, 2009

Subsystems (3)

KVM s390 KVM s390

lore

Share & tools

lore

Christian Borntraeger

author

2009-09-21 08:45 UTC #0 lore raw

PATCH 1/1 kvm-s390: fix memsize >=4G on linus git head

Avi, Marcelo,

commit 628eb9b8a8f3ef31d8316112a4596b1a21b38159
KVM: s390: streamline memslot handling

introduced kvm_s390_vcpu_get_memsize. This broke guests >=4G, since this function returned an int.

This patch changes the return value to a long.

Signed-off-by Christian Borntraeger <[email protected]>

---
 arch/s390/kvm/kvm-s390.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

arch/s390/kvm/kvm-s390.h +1 -1

Index: linux-2.6/arch/s390/kvm/kvm-s390.h
===================================================================
@@ -58,7 +58,7 @@ int kvm_s390_inject_vcpu(struct kvm_vcpu
 int kvm_s390_inject_program_int(struct kvm_vcpu *vcpu, u16 code);
 int kvm_s390_inject_sigp_stop(struct kvm_vcpu *vcpu, int action);
 
-static inline int kvm_s390_vcpu_get_memsize(struct kvm_vcpu *vcpu)
+static inline long kvm_s390_vcpu_get_memsize(struct kvm_vcpu *vcpu)
 {
 	return vcpu->arch.sie_block->gmslm
 		- vcpu->arch.sie_block->gmsor

Avi Kivity

2009-09-21 08:59 UTC #1 lore raw

Quoted 11 lines · Christian Borntraeger

Avi, Marcelo,
commit 628eb9b8a8f3ef31d8316112a4596b1a21b38159
KVM: s390: streamline memslot handling
introduced kvm_s390_vcpu_get_memsize. This broke guests>=4G, since this function returned an int.
This patch changes the return value to a long.

Applied and queued. Thanks.

Signature · 1 line

error compiling committee.c: too many arguments to function