From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39472) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VqimL-0004he-FG for qemu-devel@nongnu.org; Wed, 11 Dec 2013 07:20:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VqimC-0007VD-OQ for qemu-devel@nongnu.org; Wed, 11 Dec 2013 07:20:37 -0500 Received: from mail-qe0-x22f.google.com ([2607:f8b0:400d:c02::22f]:52622) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VqimC-0007V0-JD for qemu-devel@nongnu.org; Wed, 11 Dec 2013 07:20:28 -0500 Received: by mail-qe0-f47.google.com with SMTP id t7so5198414qeb.20 for ; Wed, 11 Dec 2013 04:20:28 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 11 Dec 2013 13:19:20 +0100 Message-Id: <1386764361-15260-14-git-send-email-pbonzini@redhat.com> In-Reply-To: <1386764361-15260-1-git-send-email-pbonzini@redhat.com> References: <1386764361-15260-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [RFC PATCH 13/14] add memdev backend infrastructure List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: imammedo@redhat.com, gaowanlong@cn.fujitsu.com, stefanha@redhat.com From: Igor Mammedov Provides framework for splitting host RAM allocation/ policies into a separate backend that could be used by devices. Initially only legacy RAM backend is provided, which uses memory_region_init_ram() allocator and compatible with every CLI option that affects memory_region_init_ram(). Signed-off-by: Igor Mammedov Signed-off-by: Paolo Bonzini --- backends/Makefile.objs | 2 + backends/hostmem-ram.c | 46 +++++++++++++++++++ backends/hostmem.c | 116 +++++++++++++++++++++++++++++++++++++++++++++++ include/sysemu/hostmem.h | 63 +++++++++++++++++++++++++ 4 files changed, 227 insertions(+) create mode 100644 backends/hostmem-ram.c create mode 100644 backends/hostmem.c create mode 100644 include/sysemu/hostmem.h diff --git a/backends/Makefile.objs b/backends/Makefile.objs index 42557d5..e6bdc11 100644 --- a/backends/Makefile.objs +++ b/backends/Makefile.objs @@ -6,3 +6,5 @@ common-obj-$(CONFIG_BRLAPI) += baum.o $(obj)/baum.o: QEMU_CFLAGS += $(SDL_CFLAGS) common-obj-$(CONFIG_TPM) += tpm.o + +common-obj-y += hostmem.o hostmem-ram.o diff --git a/backends/hostmem-ram.c b/backends/hostmem-ram.c new file mode 100644 index 0000000..3860cee --- /dev/null +++ b/backends/hostmem-ram.c @@ -0,0 +1,46 @@ +/* + * QEMU Host Memory Backend + * + * Copyright (C) 2013 Red Hat Inc + * + * Authors: + * Igor Mammedov + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ +#include "sysemu/hostmem.h" + +#define TYPE_MEMORY_BACKEND_RAM "memory-ram" + + +static void +ram_backend_memory_init(HostMemoryBackend *backend, Error **errp) +{ + if (!memory_region_size(&backend->mr)) { + memory_region_init_ram(&backend->mr, OBJECT(backend), + object_get_canonical_path(OBJECT(backend)), + backend->size); + } +} + +static void +ram_backend_class_init(ObjectClass *oc, void *data) +{ + HostMemoryBackendClass *bc = MEMORY_BACKEND_CLASS(oc); + + bc->memory_init = ram_backend_memory_init; +} + +static const TypeInfo ram_backend_info = { + .name = TYPE_MEMORY_BACKEND_RAM, + .parent = TYPE_MEMORY_BACKEND, + .class_init = ram_backend_class_init, +}; + +static void register_types(void) +{ + type_register_static(&ram_backend_info); +} + +type_init(register_types); diff --git a/backends/hostmem.c b/backends/hostmem.c new file mode 100644 index 0000000..91066e1 --- /dev/null +++ b/backends/hostmem.c @@ -0,0 +1,116 @@ +/* + * QEMU Host Memory Backend + * + * Copyright (C) 2013 Red Hat Inc + * + * Authors: + * Igor Mammedov + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ +#include "sysemu/hostmem.h" +#include "sysemu/sysemu.h" +#include "qapi/visitor.h" +#include "qapi/qmp/qerror.h" +#include "qemu/config-file.h" + +static void +hostmemory_backend_get_size(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) +{ + HostMemoryBackend *backend = MEMORY_BACKEND(obj); + uint64_t value = backend->size; + + visit_type_size(v, &value, name, errp); +} + +static void +hostmemory_backend_set_size(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) +{ + HostMemoryBackend *backend = MEMORY_BACKEND(obj); + uint64_t value; + + if (memory_region_size(&backend->mr)) { + error_setg(errp, "cannot change property value\n"); + return; + } + + visit_type_size(v, &value, name, errp); + if (error_is_set(errp)) { + return; + } + if (!value) { + error_setg(errp, "Property '%s.%s' doesn't take value '%" PRIu64 "'", + object_get_typename(obj), name , value); + return; + } + backend->size = value; +} + +static void hostmemory_backend_initfn(Object *obj) +{ + object_property_add(obj, "size", "int", + hostmemory_backend_get_size, + hostmemory_backend_set_size, NULL, NULL, NULL); +} + +static void hostmemory_backend_finalize(Object *obj) +{ + HostMemoryBackend *backend = MEMORY_BACKEND(obj); + + if (memory_region_size(&backend->mr)) { + memory_region_destroy(&backend->mr); + } +} + +static void +hostmemory_backend_memory_init(HostMemoryBackend *backend, Error **errp) +{ + error_setg(errp, "memory_init is not implemented for type [%s]", + object_get_typename(OBJECT(backend))); +} + +MemoryRegion * +host_memory_backend_get_memory(HostMemoryBackend *backend, Error **errp) +{ + HostMemoryBackendClass *bc = MEMORY_BACKEND_GET_CLASS(backend); + Object *obj = OBJECT(backend); + + if (!backend->size) { + error_setg(errp, "Invalid property [%s.size] value: %" PRIu64, + object_get_typename(obj), backend->size); + return NULL; + } + + bc->memory_init(backend, errp); + + return memory_region_size(&backend->mr) ? &backend->mr : NULL; +} + +static void +hostmemory_backend_class_init(ObjectClass *oc, void *data) +{ + HostMemoryBackendClass *bc = MEMORY_BACKEND_CLASS(oc); + + bc->memory_init = hostmemory_backend_memory_init; +} + +static const TypeInfo hostmemory_backend_info = { + .name = TYPE_MEMORY_BACKEND, + .parent = TYPE_OBJECT, + .abstract = true, + .class_size = sizeof(HostMemoryBackendClass), + .class_init = hostmemory_backend_class_init, + .instance_size = sizeof(HostMemoryBackend), + .instance_init = hostmemory_backend_initfn, + .instance_finalize = hostmemory_backend_finalize, +}; + +static void register_types(void) +{ + type_register_static(&hostmemory_backend_info); +} + +type_init(register_types); diff --git a/include/sysemu/hostmem.h b/include/sysemu/hostmem.h new file mode 100644 index 0000000..e047e45 --- /dev/null +++ b/include/sysemu/hostmem.h @@ -0,0 +1,63 @@ +/* + * QEMU Host Memory Backend + * + * Copyright (C) 2013 Red Hat Inc + * + * Authors: + * Igor Mammedov + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ +#ifndef QEMU_RAM_H +#define QEMU_RAM_H + +#include "qom/object.h" +#include "qapi/error.h" +#include "exec/memory.h" +#include "qemu/option.h" + +#define TYPE_MEMORY_BACKEND "memory" +#define MEMORY_BACKEND(obj) \ + OBJECT_CHECK(HostMemoryBackend, (obj), TYPE_MEMORY_BACKEND) +#define MEMORY_BACKEND_GET_CLASS(obj) \ + OBJECT_GET_CLASS(HostMemoryBackendClass, (obj), TYPE_MEMORY_BACKEND) +#define MEMORY_BACKEND_CLASS(klass) \ + OBJECT_CLASS_CHECK(HostMemoryBackendClass, (klass), TYPE_MEMORY_BACKEND) + +typedef struct HostMemoryBackend HostMemoryBackend; +typedef struct HostMemoryBackendClass HostMemoryBackendClass; + +/** + * HostMemoryBackendClass: + * @parent_class: opaque parent class container + * @memory_init: hook for derived classes to perform memory allocation + */ +struct HostMemoryBackendClass { + ObjectClass parent_class; + + void (*memory_init)(HostMemoryBackend *backend, Error **errp); +}; + +/** + * @HostMemoryBackend + * + * @parent: opaque parent object container + * @size: amount of memory backend provides + * @id: unique identification string in memdev namespace + * @mr: MemoryRegion representing host memory belonging to backend + */ +struct HostMemoryBackend { + /* private */ + Object parent; + + /* protected */ + uint64_t size; + + MemoryRegion mr; +}; + +MemoryRegion *host_memory_backend_get_memory(HostMemoryBackend *backend, + Error **errp); + +#endif -- 1.8.4.2