From: Pekka Enberg <penberg@kernel.org>
Date: Thu, 16 Jun 2011 14:04:31 +0000 (+0300)
Subject: kvm tools: Fix 'kvm run' on 32-bit machines with >2 GB of RAM
X-Git-Tag: next-20110824~3^2~206
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1a9a01959bd5f2425ddc5239d5625dfbb3f63aac;p=karo-tx-linux.git

kvm tools: Fix 'kvm run' on 32-bit machines with >2 GB of RAM

This patch fixes the following nasty 'kvm run' startup problem that's caused by
'long' and 'u64' mixup in the code:

  $ ./kvm run
    Fatal: out of memory

Signed-off-by: Pekka Enberg <penberg@kernel.org>
---

diff --git a/tools/kvm/include/kvm/kvm.h b/tools/kvm/include/kvm/kvm.h
index 4eeed87f2787..7d90d356e3e0 100644
--- a/tools/kvm/include/kvm/kvm.h
+++ b/tools/kvm/include/kvm/kvm.h
@@ -43,7 +43,7 @@ struct kvm {
 	int                     nr_disks;
 };
 
-struct kvm *kvm__init(const char *kvm_dev, unsigned long ram_size);
+struct kvm *kvm__init(const char *kvm_dev, u64 ram_size);
 int kvm__max_cpus(struct kvm *kvm);
 void kvm__init_ram(struct kvm *kvm);
 void kvm__delete(struct kvm *kvm);
diff --git a/tools/kvm/kvm-run.c b/tools/kvm/kvm-run.c
index f121a2b81756..6ad55aa1d83c 100644
--- a/tools/kvm/kvm-run.c
+++ b/tools/kvm/kvm-run.c
@@ -324,8 +324,8 @@ static u64 host_ram_size(void)
 
 static u64 get_ram_size(int nr_cpus)
 {
-	long available;
-	long ram_size;
+	u64 available;
+	u64 ram_size;
 
 	ram_size	= 64 * (nr_cpus + 3);
 
diff --git a/tools/kvm/kvm.c b/tools/kvm/kvm.c
index 2c56a7928033..8874cf9192b8 100644
--- a/tools/kvm/kvm.c
+++ b/tools/kvm/kvm.c
@@ -236,7 +236,7 @@ int kvm__max_cpus(struct kvm *kvm)
 	return ret;
 }
 
-struct kvm *kvm__init(const char *kvm_dev, unsigned long ram_size)
+struct kvm *kvm__init(const char *kvm_dev, u64 ram_size)
 {
 	struct kvm_pit_config pit_config = { .flags = 0, };
 	struct kvm *kvm;