aboutsummaryrefslogtreecommitdiff
path: root/softmmu
diff options
context:
space:
mode:
authorMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>2023-04-19 16:16:50 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2023-05-25 10:18:33 +0200
commitd2f07b75aea5f49533c169592f951fd09f77037b (patch)
tree447120e18c4b66d275568582292dff36eae3b198 /softmmu
parent6301460ce9f59885e8feb65185bcfb6b128c8eff (diff)
downloadqemu-d2f07b75aea5f49533c169592f951fd09f77037b.zip
qemu-d2f07b75aea5f49533c169592f951fd09f77037b.tar.gz
qemu-d2f07b75aea5f49533c169592f951fd09f77037b.tar.bz2
softmmu/ioport.c: allocate MemoryRegionPortioList ports on the heap
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>
Diffstat (limited to 'softmmu')
-rw-r--r--softmmu/ioport.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/softmmu/ioport.c b/softmmu/ioport.c
index cb8adb0..d0d5b0b 100644
--- a/softmmu/ioport.c
+++ b/softmmu/ioport.c
@@ -35,7 +35,7 @@
typedef struct MemoryRegionPortioList {
MemoryRegion mr;
void *portio_opaque;
- MemoryRegionPortio ports[];
+ MemoryRegionPortio *ports;
} MemoryRegionPortioList;
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) {
mrpio = container_of(piolist->regions[i], MemoryRegionPortioList, mr);
object_unparent(OBJECT(&mrpio->mr));
+ g_free(mrpio->ports);
g_free(mrpio);
}
g_free(piolist->regions);
@@ -227,9 +228,9 @@ static void portio_list_add_1(PortioList *piolist,
unsigned i;
/* Copy the sub-list and null-terminate it. */
- mrpio = g_malloc0(sizeof(MemoryRegionPortioList) +
- sizeof(MemoryRegionPortio) * (count + 1));
+ mrpio = g_malloc0(sizeof(MemoryRegionPortioList));
mrpio->portio_opaque = piolist->opaque;
+ mrpio->ports = g_malloc0(sizeof(MemoryRegionPortio) * (count + 1));
memcpy(mrpio->ports, pio_init, sizeof(MemoryRegionPortio) * count);
memset(mrpio->ports + count, 0, sizeof(MemoryRegionPortio));