From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57639) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwxNT-0007Yv-Sg for qemu-devel@nongnu.org; Tue, 17 Jun 2014 13:41:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WwxNN-0004ue-7C for qemu-devel@nongnu.org; Tue, 17 Jun 2014 13:40:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:16291) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwxNM-0004uB-Sz for qemu-devel@nongnu.org; Tue, 17 Jun 2014 13:40:53 -0400 Date: Tue, 17 Jun 2014 20:41:14 +0300 From: "Michael S. Tsirkin" Message-ID: <1403021756-15960-82-git-send-email-mst@redhat.com> References: <1403021756-15960-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1403021756-15960-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 081/103] backend:hostmem: replace hostmemory with host_memory List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Hu Tao , Marcelo Tosatti , Anthony Liguori , Paolo Bonzini , Igor Mammedov From: Hu Tao ..to keep names consistant. Signed-off-by: Hu Tao Acked-by: Michael S. Tsirkin --- backends/hostmem.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/backends/hostmem.c b/backends/hostmem.c index 2f578ac..2d9fd00 100644 --- a/backends/hostmem.c +++ b/backends/hostmem.c @@ -17,8 +17,8 @@ #include "qom/object_interfaces.h" static void -hostmemory_backend_get_size(Object *obj, Visitor *v, void *opaque, - const char *name, Error **errp) +host_memory_backend_get_size(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) { HostMemoryBackend *backend = MEMORY_BACKEND(obj); uint64_t value = backend->size; @@ -27,8 +27,8 @@ hostmemory_backend_get_size(Object *obj, Visitor *v, void *opaque, } static void -hostmemory_backend_set_size(Object *obj, Visitor *v, void *opaque, - const char *name, Error **errp) +host_memory_backend_set_size(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) { HostMemoryBackend *backend = MEMORY_BACKEND(obj); Error *local_err = NULL; @@ -53,14 +53,14 @@ out: error_propagate(errp, local_err); } -static void hostmemory_backend_init(Object *obj) +static void host_memory_backend_init(Object *obj) { object_property_add(obj, "size", "int", - hostmemory_backend_get_size, - hostmemory_backend_set_size, NULL, NULL, NULL); + host_memory_backend_get_size, + host_memory_backend_set_size, NULL, NULL, NULL); } -static void hostmemory_backend_finalize(Object *obj) +static void host_memory_backend_finalize(Object *obj) { HostMemoryBackend *backend = MEMORY_BACKEND(obj); @@ -75,14 +75,14 @@ host_memory_backend_get_memory(HostMemoryBackend *backend, Error **errp) return memory_region_size(&backend->mr) ? &backend->mr : NULL; } -static const TypeInfo hostmemory_backend_info = { +static const TypeInfo host_memory_backend_info = { .name = TYPE_MEMORY_BACKEND, .parent = TYPE_OBJECT, .abstract = true, .class_size = sizeof(HostMemoryBackendClass), .instance_size = sizeof(HostMemoryBackend), - .instance_init = hostmemory_backend_init, - .instance_finalize = hostmemory_backend_finalize, + .instance_init = host_memory_backend_init, + .instance_finalize = host_memory_backend_finalize, .interfaces = (InterfaceInfo[]) { { TYPE_USER_CREATABLE }, { } @@ -91,7 +91,7 @@ static const TypeInfo hostmemory_backend_info = { static void register_types(void) { - type_register_static(&hostmemory_backend_info); + type_register_static(&host_memory_backend_info); } type_init(register_types); -- MST