mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-10-15 15:32:51 +00:00
softmmu/ioport.c: QOMify MemoryRegionPortioList
The aim of QOMification is so that the lifetime of the MemoryRegionPortioList structure can be managed using QOM's in-built refcounting instead of having to handle this manually. Due to the use of an opaque pointer it isn't possible to model the new TYPE_MEMORY_REGION_PORTIO_LIST directly using QOM properties, however since use of the new object is restricted to the portio API we can simply set the opaque pointer (and the heap-allocated port list) internally. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Message-Id: <20230419151652.362717-3-mark.cave-ayland@ilande.co.uk> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
d2f07b75ae
commit
28770689c5
|
@ -32,11 +32,16 @@
|
||||||
#include "exec/address-spaces.h"
|
#include "exec/address-spaces.h"
|
||||||
#include "trace.h"
|
#include "trace.h"
|
||||||
|
|
||||||
typedef struct MemoryRegionPortioList {
|
struct MemoryRegionPortioList {
|
||||||
|
Object obj;
|
||||||
|
|
||||||
MemoryRegion mr;
|
MemoryRegion mr;
|
||||||
void *portio_opaque;
|
void *portio_opaque;
|
||||||
MemoryRegionPortio *ports;
|
MemoryRegionPortio *ports;
|
||||||
} MemoryRegionPortioList;
|
};
|
||||||
|
|
||||||
|
#define TYPE_MEMORY_REGION_PORTIO_LIST "memory-region-portio-list"
|
||||||
|
OBJECT_DECLARE_SIMPLE_TYPE(MemoryRegionPortioList, MEMORY_REGION_PORTIO_LIST)
|
||||||
|
|
||||||
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,8 +152,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);
|
object_unref(mrpio);
|
||||||
g_free(mrpio);
|
|
||||||
}
|
}
|
||||||
g_free(piolist->regions);
|
g_free(piolist->regions);
|
||||||
}
|
}
|
||||||
|
@ -228,7 +232,8 @@ 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 = MEMORY_REGION_PORTIO_LIST(
|
||||||
|
object_new(TYPE_MEMORY_REGION_PORTIO_LIST));
|
||||||
mrpio->portio_opaque = piolist->opaque;
|
mrpio->portio_opaque = piolist->opaque;
|
||||||
mrpio->ports = g_malloc0(sizeof(MemoryRegionPortio) * (count + 1));
|
mrpio->ports = g_malloc0(sizeof(MemoryRegionPortio) * (count + 1));
|
||||||
memcpy(mrpio->ports, pio_init, sizeof(MemoryRegionPortio) * count);
|
memcpy(mrpio->ports, pio_init, sizeof(MemoryRegionPortio) * count);
|
||||||
|
@ -298,3 +303,24 @@ void portio_list_del(PortioList *piolist)
|
||||||
memory_region_del_subregion(piolist->address_space, &mrpio->mr);
|
memory_region_del_subregion(piolist->address_space, &mrpio->mr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void memory_region_portio_list_finalize(Object *obj)
|
||||||
|
{
|
||||||
|
MemoryRegionPortioList *mrpio = MEMORY_REGION_PORTIO_LIST(obj);
|
||||||
|
|
||||||
|
g_free(mrpio->ports);
|
||||||
|
}
|
||||||
|
|
||||||
|
static const TypeInfo memory_region_portio_list_info = {
|
||||||
|
.parent = TYPE_OBJECT,
|
||||||
|
.name = TYPE_MEMORY_REGION_PORTIO_LIST,
|
||||||
|
.instance_size = sizeof(MemoryRegionPortioList),
|
||||||
|
.instance_finalize = memory_region_portio_list_finalize,
|
||||||
|
};
|
||||||
|
|
||||||
|
static void ioport_register_types(void)
|
||||||
|
{
|
||||||
|
type_register_static(&memory_region_portio_list_info);
|
||||||
|
}
|
||||||
|
|
||||||
|
type_init(ioport_register_types)
|
||||||
|
|
Loading…
Reference in a new issue