From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55555) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bwC8M-00041j-NQ for qemu-devel@nongnu.org; Mon, 17 Oct 2016 13:55:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bwC8J-0003cc-3H for qemu-devel@nongnu.org; Mon, 17 Oct 2016 13:55:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39214) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bwC8I-0003cS-S5 for qemu-devel@nongnu.org; Mon, 17 Oct 2016 13:55:31 -0400 From: Eduardo Habkost Date: Mon, 17 Oct 2016 15:55:17 -0200 Message-Id: <1476726918-16039-5-git-send-email-ehabkost@redhat.com> In-Reply-To: <1476726918-16039-1-git-send-email-ehabkost@redhat.com> References: <1476726918-16039-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PULL 4/5] hostmem: Register TYPE_MEMORY_BACKEND properties as class properties List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Peter Maydell Cc: Igor Mammedov , Marcel Apfelbaum 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.c | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/backends/hostmem.c b/backends/hostmem.c index b7a208d..4256d24 100644 --- a/backends/hostmem.c +++ b/backends/hostmem.c @@ -241,26 +241,6 @@ static void host_memory_backend_init(Object *obj) backend->merge = machine_mem_merge(machine); backend->dump = machine_dump_guest_core(machine); backend->prealloc = mem_prealloc; - - object_property_add_bool(obj, "merge", - host_memory_backend_get_merge, - host_memory_backend_set_merge, NULL); - object_property_add_bool(obj, "dump", - host_memory_backend_get_dump, - host_memory_backend_set_dump, NULL); - object_property_add_bool(obj, "prealloc", - host_memory_backend_get_prealloc, - host_memory_backend_set_prealloc, NULL); - object_property_add(obj, "size", "int", - host_memory_backend_get_size, - host_memory_backend_set_size, NULL, NULL, NULL); - object_property_add(obj, "host-nodes", "int", - host_memory_backend_get_host_nodes, - host_memory_backend_set_host_nodes, NULL, NULL, NULL); - object_property_add_enum(obj, "policy", "HostMemPolicy", - HostMemPolicy_lookup, - host_memory_backend_get_policy, - host_memory_backend_set_policy, NULL); } MemoryRegion * @@ -375,6 +355,28 @@ host_memory_backend_class_init(ObjectClass *oc, void *data) ucc->complete = host_memory_backend_memory_complete; ucc->can_be_deleted = host_memory_backend_can_be_deleted; + + object_class_property_add_bool(oc, "merge", + host_memory_backend_get_merge, + host_memory_backend_set_merge, &error_abort); + object_class_property_add_bool(oc, "dump", + host_memory_backend_get_dump, + host_memory_backend_set_dump, &error_abort); + object_class_property_add_bool(oc, "prealloc", + host_memory_backend_get_prealloc, + host_memory_backend_set_prealloc, &error_abort); + object_class_property_add(oc, "size", "int", + host_memory_backend_get_size, + host_memory_backend_set_size, + NULL, NULL, &error_abort); + object_class_property_add(oc, "host-nodes", "int", + host_memory_backend_get_host_nodes, + host_memory_backend_set_host_nodes, + NULL, NULL, &error_abort); + object_class_property_add_enum(oc, "policy", "HostMemPolicy", + HostMemPolicy_lookup, + host_memory_backend_get_policy, + host_memory_backend_set_policy, &error_abort); } static const TypeInfo host_memory_backend_info = { -- 2.7.4