yannick.naumann/RT-Task-Generator-QEMU
1
0
Fork 0
forked from alwin.berger/FRET-qemu
Code Pull Requests Activity

softmmu/ioport.c: allocate MemoryRegionPortioList ports on the heap

Browse Source 
In order to facilitate a conversion of MemoryRegionPortioList to a QOM object
move the allocation of MemoryRegionPortioList ports to the heap instead of
using a variable-length member at the end of the MemoryRegionPortioList
structure.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230419151652.362717-2-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Mark Cave-Ayland 2023-04-19 16:16:50 +01:00 committed by Paolo Bonzini
parent 6301460ce9
commit d2f07b75ae
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
softmmu/ioport.c
View File

@ -35,7 +35,7 @@
typedef struct MemoryRegionPortioList { typedef struct MemoryRegionPortioList {
MemoryRegion mr; MemoryRegion mr;
void *portio_opaque; void *portio_opaque;
MemoryRegionPortio ports[]; MemoryRegionPortio *ports;
} MemoryRegionPortioList; } MemoryRegionPortioList;
static uint64_t unassigned_io_read(void *opaque, hwaddr addr, unsigned size) static uint64_t unassigned_io_read(void *opaque, hwaddr addr, unsigned size)
@ -147,6 +147,7 @@ void portio_list_destroy(PortioList *piolist)
for (i = 0; i < piolist->nr; ++i) { for (i = 0; i < piolist->nr; ++i) {
mrpio = container_of(piolist->regions[i], MemoryRegionPortioList, mr); mrpio = container_of(piolist->regions[i], MemoryRegionPortioList, mr);
object_unparent(OBJECT(&mrpio->mr)); object_unparent(OBJECT(&mrpio->mr));
g_free(mrpio->ports);
g_free(mrpio); g_free(mrpio);
} }
g_free(piolist->regions); g_free(piolist->regions);
@ -227,9 +228,9 @@ static void portio_list_add_1(PortioList *piolist,
unsigned i; unsigned i;
/* Copy the sub-list and null-terminate it. */ /* Copy the sub-list and null-terminate it. */
mrpio = g_malloc0(sizeof(MemoryRegionPortioList) + mrpio = g_malloc0(sizeof(MemoryRegionPortioList));
sizeof(MemoryRegionPortio) * (count + 1));
mrpio->portio_opaque = piolist->opaque; mrpio->portio_opaque = piolist->opaque;
mrpio->ports = g_malloc0(sizeof(MemoryRegionPortio) * (count + 1));
memcpy(mrpio->ports, pio_init, sizeof(MemoryRegionPortio) * count); memcpy(mrpio->ports, pio_init, sizeof(MemoryRegionPortio) * count);
memset(mrpio->ports + count, 0, sizeof(MemoryRegionPortio)); memset(mrpio->ports + count, 0, sizeof(MemoryRegionPortio));