[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 06/16] hostmem: separate allocation from UserCrea
From: |
Hu Tao |
Subject: |
[Qemu-devel] [PATCH v5 06/16] hostmem: separate allocation from UserCreatable complete method |
Date: |
Tue, 10 Jun 2014 19:15:19 +0800 |
This allows the superclass to set various policies on the memory
region that the subclass creates. Drops hostmem-ram's complete method
accordingly.
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: Hu Tao <address@hidden>
---
backends/hostmem-ram.c | 7 +++----
backends/hostmem.c | 20 ++++++++++++++++++++
include/sysemu/hostmem.h | 2 ++
3 files changed, 25 insertions(+), 4 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 2d9fd00..1738774 100644
--- a/backends/hostmem.c
+++ b/backends/hostmem.c
@@ -75,11 +75,31 @@ host_memory_backend_get_memory(HostMemoryBackend *backend,
Error **errp)
return memory_region_size(&backend->mr) ? &backend->mr : NULL;
}
+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 = host_memory_backend_init,
.instance_finalize = host_memory_backend_finalize,
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
- [Qemu-devel] [PATCH v5 00/16] NUMA series v5, Hu Tao, 2014/06/10
- [Qemu-devel] [PATCH v5 01/16] fixup! NUMA: check if the total numa memory size is equal to ram_size, Hu Tao, 2014/06/10
- [Qemu-devel] [PATCH v5 02/16] vl: redo -object parsing, Hu Tao, 2014/06/10
- [Qemu-devel] [PATCH v5 03/16] fixup! qmp: improve error reporting for -object and object-add, Hu Tao, 2014/06/10
- [Qemu-devel] [PATCH v5 04/16] pc: pass MachineState to pc_memory_init, Hu Tao, 2014/06/10
- [Qemu-devel] [PATCH v5 05/16] backend:hostmem: replace hostmemory with host_memory, Hu Tao, 2014/06/10
- [Qemu-devel] [PATCH v5 06/16] hostmem: separate allocation from UserCreatable complete method,
Hu Tao <=
- [Qemu-devel] [PATCH v5 07/16] fixup! numa: add -numa node, memdev= option, Hu Tao, 2014/06/10
- [Qemu-devel] [PATCH v5 08/16] hostmem: add file-based HostMemoryBackend, Hu Tao, 2014/06/10
- [Qemu-devel] [PATCH v5 09/16] hostmem: add merge and dump properties, Hu Tao, 2014/06/10
- [Qemu-devel] [PATCH v5 10/16] hostmem: allow preallocation of any memory region, Hu Tao, 2014/06/10
- [Qemu-devel] [PATCH v5 11/16] hostmem: add property to map memory with MAP_SHARED, Hu Tao, 2014/06/10
- [Qemu-devel] [PATCH v5 12/16] hostmem: add properties for NUMA memory policy, Hu Tao, 2014/06/10
- [Qemu-devel] [PATCH v5 13/16] tests: fix memory leak in test of string input visitor, Hu Tao, 2014/06/10