From: Asias He <asias.hejun@gmail.com>
Date: Fri, 25 Nov 2011 11:59:56 +0000 (+0800)
Subject: kvm tools: Fix build in virtio/net.c
X-Git-Tag: next-20111128~2^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7b9b46066107084279a3c9fada1737c151b5bff1;p=karo-tx-linux.git

kvm tools: Fix build in virtio/net.c

virtio/net.c: In function ???virtio_net__vhost_init???:
virtio/net.c:476:22: error: cast from pointer to integer of different
size [-Werror=pointer-to-int-cast]
cc1: all warnings being treated as errors

Signed-off-by: Asias He <asias.hejun@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
---

diff --git a/tools/kvm/virtio/net.c b/tools/kvm/virtio/net.c
index 118517fcbf0d..ce34555e8d54 100644
--- a/tools/kvm/virtio/net.c
+++ b/tools/kvm/virtio/net.c
@@ -473,7 +473,7 @@ static void virtio_net__vhost_init(struct kvm *kvm, struct net_dev *ndev)
 	mem->regions[0] = (struct vhost_memory_region) {
 		.guest_phys_addr	= 0,
 		.memory_size		= kvm->ram_size,
-		.userspace_addr		= (u64)kvm->ram_start,
+		.userspace_addr		= (unsigned long)kvm->ram_start,
 	};
 
 	r = ioctl(ndev->vhost_fd, VHOST_SET_OWNER);