Revision 7267c094 hw/vhost.c
| b/hw/vhost.c | ||
|---|---|---|
| 252 | 252 |
uint64_t log_base; |
| 253 | 253 |
int r; |
| 254 | 254 |
if (size) {
|
| 255 |
log = qemu_mallocz(size * sizeof *log);
|
|
| 255 |
log = g_malloc0(size * sizeof *log);
|
|
| 256 | 256 |
} else {
|
| 257 | 257 |
log = NULL; |
| 258 | 258 |
} |
| ... | ... | |
| 262 | 262 |
vhost_client_sync_dirty_bitmap(&dev->client, 0, |
| 263 | 263 |
(target_phys_addr_t)~0x0ull); |
| 264 | 264 |
if (dev->log) {
|
| 265 |
qemu_free(dev->log);
|
|
| 265 |
g_free(dev->log);
|
|
| 266 | 266 |
} |
| 267 | 267 |
dev->log = log; |
| 268 | 268 |
dev->log_size = size; |
| ... | ... | |
| 348 | 348 |
uint64_t log_size; |
| 349 | 349 |
int r; |
| 350 | 350 |
|
| 351 |
dev->mem = qemu_realloc(dev->mem, s);
|
|
| 351 |
dev->mem = g_realloc(dev->mem, s);
|
|
| 352 | 352 |
|
| 353 | 353 |
if (log_dirty) {
|
| 354 | 354 |
flags = IO_MEM_UNASSIGNED; |
| ... | ... | |
| 485 | 485 |
return r; |
| 486 | 486 |
} |
| 487 | 487 |
if (dev->log) {
|
| 488 |
qemu_free(dev->log);
|
|
| 488 |
g_free(dev->log);
|
|
| 489 | 489 |
} |
| 490 | 490 |
dev->log = NULL; |
| 491 | 491 |
dev->log_size = 0; |
| ... | ... | |
| 669 | 669 |
hdev->client.migration_log = vhost_client_migration_log; |
| 670 | 670 |
hdev->client.log_start = NULL; |
| 671 | 671 |
hdev->client.log_stop = NULL; |
| 672 |
hdev->mem = qemu_mallocz(offsetof(struct vhost_memory, regions));
|
|
| 672 |
hdev->mem = g_malloc0(offsetof(struct vhost_memory, regions));
|
|
| 673 | 673 |
hdev->log = NULL; |
| 674 | 674 |
hdev->log_size = 0; |
| 675 | 675 |
hdev->log_enabled = false; |
| ... | ... | |
| 686 | 686 |
void vhost_dev_cleanup(struct vhost_dev *hdev) |
| 687 | 687 |
{
|
| 688 | 688 |
cpu_unregister_phys_memory_client(&hdev->client); |
| 689 |
qemu_free(hdev->mem);
|
|
| 689 |
g_free(hdev->mem);
|
|
| 690 | 690 |
close(hdev->control); |
| 691 | 691 |
} |
| 692 | 692 |
|
| ... | ... | |
| 734 | 734 |
if (hdev->log_enabled) {
|
| 735 | 735 |
hdev->log_size = vhost_get_log_size(hdev); |
| 736 | 736 |
hdev->log = hdev->log_size ? |
| 737 |
qemu_mallocz(hdev->log_size * sizeof *hdev->log) : NULL;
|
|
| 737 |
g_malloc0(hdev->log_size * sizeof *hdev->log) : NULL;
|
|
| 738 | 738 |
r = ioctl(hdev->control, VHOST_SET_LOG_BASE, |
| 739 | 739 |
(uint64_t)(unsigned long)hdev->log); |
| 740 | 740 |
if (r < 0) {
|
| ... | ... | |
| 782 | 782 |
assert (r >= 0); |
| 783 | 783 |
|
| 784 | 784 |
hdev->started = false; |
| 785 |
qemu_free(hdev->log);
|
|
| 785 |
g_free(hdev->log);
|
|
| 786 | 786 |
hdev->log = NULL; |
| 787 | 787 |
hdev->log_size = 0; |
| 788 | 788 |
} |
Also available in: Unified diff