Revision 7267c094 kvm-all.c
b/kvm-all.c | ||
---|---|---|
400 | 400 |
size = ALIGN(((mem->memory_size) >> TARGET_PAGE_BITS), |
401 | 401 |
/*HOST_LONG_BITS*/ 64) / 8; |
402 | 402 |
if (!d.dirty_bitmap) { |
403 |
d.dirty_bitmap = qemu_malloc(size);
|
|
403 |
d.dirty_bitmap = g_malloc(size);
|
|
404 | 404 |
} else if (size > allocated_size) { |
405 |
d.dirty_bitmap = qemu_realloc(d.dirty_bitmap, size);
|
|
405 |
d.dirty_bitmap = g_realloc(d.dirty_bitmap, size);
|
|
406 | 406 |
} |
407 | 407 |
allocated_size = size; |
408 | 408 |
memset(d.dirty_bitmap, 0, allocated_size); |
... | ... | |
419 | 419 |
mem->start_addr, mem->memory_size); |
420 | 420 |
start_addr = mem->start_addr + mem->memory_size; |
421 | 421 |
} |
422 |
qemu_free(d.dirty_bitmap);
|
|
422 |
g_free(d.dirty_bitmap);
|
|
423 | 423 |
|
424 | 424 |
return ret; |
425 | 425 |
} |
... | ... | |
702 | 702 |
int ret; |
703 | 703 |
int i; |
704 | 704 |
|
705 |
s = qemu_mallocz(sizeof(KVMState));
|
|
705 |
s = g_malloc0(sizeof(KVMState));
|
|
706 | 706 |
|
707 | 707 |
#ifdef KVM_CAP_SET_GUEST_DEBUG |
708 | 708 |
QTAILQ_INIT(&s->kvm_sw_breakpoints); |
... | ... | |
804 | 804 |
close(s->fd); |
805 | 805 |
} |
806 | 806 |
} |
807 |
qemu_free(s);
|
|
807 |
g_free(s);
|
|
808 | 808 |
|
809 | 809 |
return ret; |
810 | 810 |
} |
... | ... | |
1188 | 1188 |
return 0; |
1189 | 1189 |
} |
1190 | 1190 |
|
1191 |
bp = qemu_malloc(sizeof(struct kvm_sw_breakpoint));
|
|
1191 |
bp = g_malloc(sizeof(struct kvm_sw_breakpoint));
|
|
1192 | 1192 |
if (!bp) { |
1193 | 1193 |
return -ENOMEM; |
1194 | 1194 |
} |
... | ... | |
1197 | 1197 |
bp->use_count = 1; |
1198 | 1198 |
err = kvm_arch_insert_sw_breakpoint(current_env, bp); |
1199 | 1199 |
if (err) { |
1200 |
qemu_free(bp);
|
|
1200 |
g_free(bp);
|
|
1201 | 1201 |
return err; |
1202 | 1202 |
} |
1203 | 1203 |
|
... | ... | |
1243 | 1243 |
} |
1244 | 1244 |
|
1245 | 1245 |
QTAILQ_REMOVE(¤t_env->kvm_state->kvm_sw_breakpoints, bp, entry); |
1246 |
qemu_free(bp);
|
|
1246 |
g_free(bp);
|
|
1247 | 1247 |
} else { |
1248 | 1248 |
err = kvm_arch_remove_hw_breakpoint(addr, len, type); |
1249 | 1249 |
if (err) { |
... | ... | |
1316 | 1316 |
return kvm_vcpu_ioctl(env, KVM_SET_SIGNAL_MASK, NULL); |
1317 | 1317 |
} |
1318 | 1318 |
|
1319 |
sigmask = qemu_malloc(sizeof(*sigmask) + sizeof(*sigset));
|
|
1319 |
sigmask = g_malloc(sizeof(*sigmask) + sizeof(*sigset));
|
|
1320 | 1320 |
|
1321 | 1321 |
sigmask->len = 8; |
1322 | 1322 |
memcpy(sigmask->sigset, sigset, sizeof(*sigset)); |
1323 | 1323 |
r = kvm_vcpu_ioctl(env, KVM_SET_SIGNAL_MASK, sigmask); |
1324 |
qemu_free(sigmask);
|
|
1324 |
g_free(sigmask);
|
|
1325 | 1325 |
|
1326 | 1326 |
return r; |
1327 | 1327 |
} |
Also available in: Unified diff