From 026ac483c70850c82fad849de656204b16f8415e Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Thu, 13 Oct 2016 18:18:41 -0300 Subject: [PATCH] hostmem-file: Register TYPE_MEMORY_BACKEND_FILE properties as class properties To do the conversion, the file_backend_class_init() was moved after the getter/setter functions. The old file_backend_instance_init() function was removed because it is not needed anymore. The NULL errp arguments on the property registration calls were changed to &error_abort. Reviewed-by: Igor Mammedov Signed-off-by: Eduardo Habkost --- backends/hostmem-file.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/backends/hostmem-file.c b/backends/hostmem-file.c index 5c4b808..42efb2f 100644 --- a/backends/hostmem-file.c +++ b/backends/hostmem-file.c @@ -64,14 +64,6 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) #endif } -static void -file_backend_class_init(ObjectClass *oc, void *data) -{ - HostMemoryBackendClass *bc = MEMORY_BACKEND_CLASS(oc); - - bc->alloc = file_backend_memory_alloc; -} - static char *get_mem_path(Object *o, Error **errp) { HostMemoryBackendFile *fb = MEMORY_BACKEND_FILE(o); @@ -112,13 +104,18 @@ static void file_memory_backend_set_share(Object *o, bool value, Error **errp) } static void -file_backend_instance_init(Object *o) +file_backend_class_init(ObjectClass *oc, void *data) { - object_property_add_bool(o, "share", - file_memory_backend_get_share, - file_memory_backend_set_share, NULL); - object_property_add_str(o, "mem-path", get_mem_path, - set_mem_path, NULL); + HostMemoryBackendClass *bc = MEMORY_BACKEND_CLASS(oc); + + bc->alloc = file_backend_memory_alloc; + + object_class_property_add_bool(oc, "share", + file_memory_backend_get_share, file_memory_backend_set_share, + &error_abort); + object_class_property_add_str(oc, "mem-path", + get_mem_path, set_mem_path, + &error_abort); } static void file_backend_instance_finalize(Object *o) @@ -132,7 +129,6 @@ static const TypeInfo file_backend_info = { .name = TYPE_MEMORY_BACKEND_FILE, .parent = TYPE_MEMORY_BACKEND, .class_init = file_backend_class_init, - .instance_init = file_backend_instance_init, .instance_finalize = file_backend_instance_finalize, .instance_size = sizeof(HostMemoryBackendFile), }; -- 2.7.4