This allows the superclass to set various policies on the memory region that the subclass creates. Drops hostmem-ram's complete method accordingly.
While at file hostmem.c, s/hostmemory/host_memory/ to keep names consistant. Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> Signed-off-by: Hu Tao <hu...@cn.fujitsu.com> --- backends/hostmem-ram.c | 7 +++---- backends/hostmem.c | 40 ++++++++++++++++++++++++++++++---------- include/sysemu/hostmem.h | 2 ++ 3 files changed, 35 insertions(+), 14 deletions(-) diff --git a/backends/hostmem-ram.c b/backends/hostmem-ram.c index bba2ebc..d9a8290 100644 --- a/backends/hostmem-ram.c +++ b/backends/hostmem-ram.c @@ -16,9 +16,8 @@ static void -ram_backend_memory_init(UserCreatable *uc, Error **errp) +ram_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) { - HostMemoryBackend *backend = MEMORY_BACKEND(uc); char *path; if (!backend->size) { @@ -35,9 +34,9 @@ ram_backend_memory_init(UserCreatable *uc, Error **errp) static void ram_backend_class_init(ObjectClass *oc, void *data) { - UserCreatableClass *ucc = USER_CREATABLE_CLASS(oc); + HostMemoryBackendClass *bc = MEMORY_BACKEND_CLASS(oc); - ucc->complete = ram_backend_memory_init; + bc->alloc = ram_backend_memory_alloc; } static const TypeInfo ram_backend_info = { diff --git a/backends/hostmem.c b/backends/hostmem.c index 2f578ac..cc57c13 100644 --- a/backends/hostmem.c +++ b/backends/hostmem.c @@ -17,7 +17,7 @@ #include "qom/object_interfaces.h" static void -hostmemory_backend_get_size(Object *obj, Visitor *v, void *opaque, +host_memory_backend_get_size(Object *obj, Visitor *v, void *opaque, const char *name, Error **errp) { HostMemoryBackend *backend = MEMORY_BACKEND(obj); @@ -27,7 +27,7 @@ hostmemory_backend_get_size(Object *obj, Visitor *v, void *opaque, } static void -hostmemory_backend_set_size(Object *obj, Visitor *v, void *opaque, +host_memory_backend_set_size(Object *obj, Visitor *v, void *opaque, const char *name, Error **errp) { HostMemoryBackend *backend = MEMORY_BACKEND(obj); @@ -53,14 +53,14 @@ out: error_propagate(errp, local_err); } -static void hostmemory_backend_init(Object *obj) +static void host_memory_backend_init(Object *obj) { object_property_add(obj, "size", "int", - hostmemory_backend_get_size, - hostmemory_backend_set_size, NULL, NULL, NULL); + host_memory_backend_get_size, + host_memory_backend_set_size, NULL, NULL, NULL); } -static void hostmemory_backend_finalize(Object *obj) +static void host_memory_backend_finalize(Object *obj) { HostMemoryBackend *backend = MEMORY_BACKEND(obj); @@ -75,14 +75,34 @@ host_memory_backend_get_memory(HostMemoryBackend *backend, Error **errp) return memory_region_size(&backend->mr) ? &backend->mr : NULL; } -static const TypeInfo hostmemory_backend_info = { +static void +host_memory_backend_memory_complete(UserCreatable *uc, Error **errp) +{ + HostMemoryBackend *backend = MEMORY_BACKEND(uc); + HostMemoryBackendClass *bc = MEMORY_BACKEND_GET_CLASS(uc); + + if (bc->alloc) { + bc->alloc(backend, errp); + } +} + +static void +host_memory_backend_class_init(ObjectClass *oc, void *data) +{ + UserCreatableClass *ucc = USER_CREATABLE_CLASS(oc); + + ucc->complete = host_memory_backend_memory_complete; +} + +static const TypeInfo host_memory_backend_info = { .name = TYPE_MEMORY_BACKEND, .parent = TYPE_OBJECT, .abstract = true, .class_size = sizeof(HostMemoryBackendClass), + .class_init = host_memory_backend_class_init, .instance_size = sizeof(HostMemoryBackend), - .instance_init = hostmemory_backend_init, - .instance_finalize = hostmemory_backend_finalize, + .instance_init = host_memory_backend_init, + .instance_finalize = host_memory_backend_finalize, .interfaces = (InterfaceInfo[]) { { TYPE_USER_CREATABLE }, { } @@ -91,7 +111,7 @@ static const TypeInfo hostmemory_backend_info = { static void register_types(void) { - type_register_static(&hostmemory_backend_info); + type_register_static(&host_memory_backend_info); } type_init(register_types); diff --git a/include/sysemu/hostmem.h b/include/sysemu/hostmem.h index 4fc081e..923f672 100644 --- a/include/sysemu/hostmem.h +++ b/include/sysemu/hostmem.h @@ -34,6 +34,8 @@ typedef struct HostMemoryBackendClass HostMemoryBackendClass; */ struct HostMemoryBackendClass { ObjectClass parent_class; + + void (*alloc)(HostMemoryBackend *backend, Error **errp); }; /** -- 1.9.3