[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RFC 2/7] hostmem: register properties against the cl
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH RFC 2/7] hostmem: register properties against the class instead of object |
Date: |
Wed, 26 Aug 2015 13:03:09 +0100 |
This converts the hostmem and hostmem-file objects to register
their properties against the class rather than object.
Signed-off-by: Daniel P. Berrange <address@hidden>
---
backends/hostmem-file.c | 26 +++++++++++---------------
backends/hostmem.c | 41 +++++++++++++++++++++--------------------
2 files changed, 32 insertions(+), 35 deletions(-)
diff --git a/backends/hostmem-file.c b/backends/hostmem-file.c
index 4b55361..4e528d9 100644
--- a/backends/hostmem-file.c
+++ b/backends/hostmem-file.c
@@ -59,14 +59,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);
@@ -108,21 +100,25 @@ static void file_memory_backend_set_share(Object *o, bool
value, Error **errp)
fb->share = value;
}
+
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, NULL);
+ object_class_property_add_str(oc, "mem-path", get_mem_path,
+ set_mem_path, NULL);
}
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_size = sizeof(HostMemoryBackendFile),
};
diff --git a/backends/hostmem.c b/backends/hostmem.c
index 41ba2af..ca5448b 100644
--- a/backends/hostmem.c
+++ b/backends/hostmem.c
@@ -228,26 +228,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 *
@@ -348,6 +328,27 @@ 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, NULL);
+ object_class_property_add_bool(oc, "dump",
+ host_memory_backend_get_dump,
+ host_memory_backend_set_dump, NULL);
+ object_class_property_add_bool(oc, "prealloc",
+ host_memory_backend_get_prealloc,
+ host_memory_backend_set_prealloc, NULL);
+ object_class_property_add(oc, "size", "int",
+ host_memory_backend_get_size,
+ host_memory_backend_set_size, NULL, NULL, NULL);
+ object_class_property_add(oc, "host-nodes", "int",
+ host_memory_backend_get_host_nodes,
+ host_memory_backend_set_host_nodes,
+ NULL, NULL, NULL);
+ object_class_property_add_enum(oc, "policy", "HostMemPolicy",
+ HostMemPolicy_lookup,
+ host_memory_backend_get_policy,
+ host_memory_backend_set_policy, NULL);
}
static const TypeInfo host_memory_backend_info = {
--
2.4.3
- [Qemu-devel] [PATCH RFC 0/7] Making QOM introspectable, Daniel P. Berrange, 2015/08/26
- [Qemu-devel] [PATCH RFC 3/7] rng: register properties against the class instead of object, Daniel P. Berrange, 2015/08/26
- [Qemu-devel] [PATCH RFC 4/7] tpm: register properties against the class instead of object, Daniel P. Berrange, 2015/08/26
- [Qemu-devel] [PATCH RFC 1/7] qom: allow properties to be registered against classes, Daniel P. Berrange, 2015/08/26
- [Qemu-devel] [PATCH RFC 2/7] hostmem: register properties against the class instead of object,
Daniel P. Berrange <=
- [Qemu-devel] [PATCH RFC 6/7] x86-cpu: register properties against the class instead of object, Daniel P. Berrange, 2015/08/26
- [Qemu-devel] [PATCH RFC 5/7] cpu: avoid using object instance state in property getter, Daniel P. Berrange, 2015/08/26
- [Qemu-devel] [PATCH RFC 7/7] machine: register properties against the class instead of object, Daniel P. Berrange, 2015/08/26