Revision 7267c094 hw/ivshmem.c
| b/hw/ivshmem.c | ||
|---|---|---|
| 351 | 351 |
close(s->peers[posn].eventfds[i]); |
| 352 | 352 |
} |
| 353 | 353 |
|
| 354 |
qemu_free(s->peers[posn].eventfds);
|
|
| 354 |
g_free(s->peers[posn].eventfds);
|
|
| 355 | 355 |
s->peers[posn].nb_eventfds = 0; |
| 356 | 356 |
} |
| 357 | 357 |
|
| ... | ... | |
| 383 | 383 |
s->nb_peers = s->nb_peers * 2; |
| 384 | 384 |
|
| 385 | 385 |
IVSHMEM_DPRINTF("bumping storage to %d guests\n", s->nb_peers);
|
| 386 |
s->peers = qemu_realloc(s->peers, s->nb_peers * sizeof(Peer));
|
|
| 386 |
s->peers = g_realloc(s->peers, s->nb_peers * sizeof(Peer));
|
|
| 387 | 387 |
|
| 388 | 388 |
/* zero out new pointers */ |
| 389 | 389 |
for (j = old_nb_alloc; j < s->nb_peers; j++) {
|
| ... | ... | |
| 467 | 467 |
|
| 468 | 468 |
if (guest_max_eventfd == 0) {
|
| 469 | 469 |
/* one eventfd per MSI vector */ |
| 470 |
s->peers[incoming_posn].eventfds = (int *) qemu_malloc(s->vectors *
|
|
| 470 |
s->peers[incoming_posn].eventfds = (int *) g_malloc(s->vectors *
|
|
| 471 | 471 |
sizeof(int)); |
| 472 | 472 |
} |
| 473 | 473 |
|
| ... | ... | |
| 557 | 557 |
} |
| 558 | 558 |
|
| 559 | 559 |
/* allocate Qemu char devices for receiving interrupts */ |
| 560 |
s->eventfd_table = qemu_mallocz(s->vectors * sizeof(EventfdEntry));
|
|
| 560 |
s->eventfd_table = g_malloc0(s->vectors * sizeof(EventfdEntry));
|
|
| 561 | 561 |
} |
| 562 | 562 |
|
| 563 | 563 |
static void ivshmem_save(QEMUFile* f, void *opaque) |
| ... | ... | |
| 691 | 691 |
s->vm_id = -1; |
| 692 | 692 |
|
| 693 | 693 |
/* allocate/initialize space for interrupt handling */ |
| 694 |
s->peers = qemu_mallocz(s->nb_peers * sizeof(Peer));
|
|
| 694 |
s->peers = g_malloc0(s->nb_peers * sizeof(Peer));
|
|
| 695 | 695 |
|
| 696 | 696 |
pci_register_bar(&s->dev, 2, |
| 697 | 697 |
PCI_BASE_ADDRESS_SPACE_MEMORY, &s->ivshmem); |
| 698 | 698 |
|
| 699 |
s->eventfd_chr = qemu_mallocz(s->vectors * sizeof(CharDriverState *));
|
|
| 699 |
s->eventfd_chr = g_malloc0(s->vectors * sizeof(CharDriverState *));
|
|
| 700 | 700 |
|
| 701 | 701 |
qemu_chr_add_handlers(s->server_chr, ivshmem_can_receive, ivshmem_read, |
| 702 | 702 |
ivshmem_event, s); |
Also available in: Unified diff