aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2009-10-07 13:19:22 +0200
committerAvi Kivity <avi@redhat.com>2009-10-08 15:22:06 +0200
commit168534e77c3a8bed7609c60922bd118f60e6756e (patch)
tree10b63e194e2698c96ea97d10f5c269554b597c15 /qemu-kvm.c
parentqemu-kvm: fix build with KVM_CAP_SET_GUEST_DEBUG (diff)
downloadqemu-kvm-168534e77c3a8bed7609c60922bd118f60e6756e.tar.gz
qemu-kvm-168534e77c3a8bed7609c60922bd118f60e6756e.tar.bz2
qemu-kvm-168534e77c3a8bed7609c60922bd118f60e6756e.zip
qemu-kvm: fix build on 32 bit
Fix build on 32 bit system: cast 64 bit integer to pointer through pointer-sized integer. Without this, I get: qemu-kvm.c:1557: error: cast to pointer from integer of different size Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'qemu-kvm.c')
-rw-r--r--qemu-kvm.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/qemu-kvm.c b/qemu-kvm.c
index a4a90edc4..62ca0503b 100644
--- a/qemu-kvm.c
+++ b/qemu-kvm.c
@@ -588,7 +588,7 @@ int kvm_register_phys_mem(kvm_context_t kvm,
struct kvm_userspace_memory_region memory = {
.memory_size = len,
.guest_phys_addr = phys_start,
- .userspace_addr = (unsigned long) (intptr_t) userspace_addr,
+ .userspace_addr = (unsigned long) (uintptr_t) userspace_addr,
.flags = log ? KVM_MEM_LOG_DIRTY_PAGES : 0,
};
int r;
@@ -1554,7 +1554,8 @@ static void sigbus_handler(int n, struct qemu_signalfd_siginfo *siginfo,
CPUState *cenv;
/* Hope we are lucky for AO MCE */
- if (do_qemu_ram_addr_from_host((void *)siginfo->ssi_addr, &paddr)) {
+ if (do_qemu_ram_addr_from_host((void *)(intptr_t)siginfo->ssi_addr,
+ &paddr)) {
fprintf(stderr, "Hardware memory error for memory used by "
"QEMU itself instead of guest system!: %llx\n",
(unsigned long long)siginfo->ssi_addr);