Commit-ID: 7b9b46066107084279a3c9fada1737c151b5bff1
Gitweb: http://git.kernel.org/tip/7b9b46066107084279a3c9fada1737c151b5bff1
Author: Asias He <asias.hejun@xxxxxxxxx>
AuthorDate: Fri, 25 Nov 2011 19:59:56 +0800
Committer: Pekka Enberg <penberg@xxxxxxxxxx>
CommitDate: Fri, 25 Nov 2011 15:04:23 +0200
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@xxxxxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
---
tools/kvm/virtio/net.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tools/kvm/virtio/net.c b/tools/kvm/virtio/net.c
index 118517f..ce34555 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);
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|