mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-12-11 16:00:50 -07:00
Use glib memory allocation and free functions
qemu_malloc/qemu_free no longer exist after this commit. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
14015304b6
commit
7267c0947d
357 changed files with 1672 additions and 1674 deletions
12
hw/msix.c
12
hw/msix.c
|
|
@ -219,10 +219,10 @@ int msix_init(struct PCIDevice *dev, unsigned short nentries,
|
|||
if (nentries > MSIX_MAX_ENTRIES)
|
||||
return -EINVAL;
|
||||
|
||||
dev->msix_entry_used = qemu_mallocz(MSIX_MAX_ENTRIES *
|
||||
dev->msix_entry_used = g_malloc0(MSIX_MAX_ENTRIES *
|
||||
sizeof *dev->msix_entry_used);
|
||||
|
||||
dev->msix_table_page = qemu_mallocz(MSIX_PAGE_SIZE);
|
||||
dev->msix_table_page = g_malloc0(MSIX_PAGE_SIZE);
|
||||
msix_mask_all(dev, nentries);
|
||||
|
||||
memory_region_init_io(&dev->msix_mmio, &msix_mmio_ops, dev,
|
||||
|
|
@ -240,9 +240,9 @@ int msix_init(struct PCIDevice *dev, unsigned short nentries,
|
|||
err_config:
|
||||
dev->msix_entries_nr = 0;
|
||||
memory_region_destroy(&dev->msix_mmio);
|
||||
qemu_free(dev->msix_table_page);
|
||||
g_free(dev->msix_table_page);
|
||||
dev->msix_table_page = NULL;
|
||||
qemu_free(dev->msix_entry_used);
|
||||
g_free(dev->msix_entry_used);
|
||||
dev->msix_entry_used = NULL;
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -268,9 +268,9 @@ int msix_uninit(PCIDevice *dev, MemoryRegion *bar)
|
|||
dev->msix_entries_nr = 0;
|
||||
memory_region_del_subregion(bar, &dev->msix_mmio);
|
||||
memory_region_destroy(&dev->msix_mmio);
|
||||
qemu_free(dev->msix_table_page);
|
||||
g_free(dev->msix_table_page);
|
||||
dev->msix_table_page = NULL;
|
||||
qemu_free(dev->msix_entry_used);
|
||||
g_free(dev->msix_entry_used);
|
||||
dev->msix_entry_used = NULL;
|
||||
dev->cap_present &= ~QEMU_PCI_CAP_MSIX;
|
||||
return 0;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue