From patchwork Thu Oct 27 17:06:25 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 122188 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 64E921007D8 for ; Fri, 28 Oct 2011 04:15:46 +1100 (EST) Received: from localhost ([::1]:41222 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RJTRw-0005v6-5Z for incoming@patchwork.ozlabs.org; Thu, 27 Oct 2011 13:09:04 -0400 Received: from eggs.gnu.org ([140.186.70.92]:42721) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RJTR8-00045U-Qm for qemu-devel@nongnu.org; Thu, 27 Oct 2011 13:08:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RJTR3-0000pb-6r for qemu-devel@nongnu.org; Thu, 27 Oct 2011 13:08:14 -0400 Received: from mout.perfora.net ([74.208.4.195]:60584) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RJTR3-0000pV-0M for qemu-devel@nongnu.org; Thu, 27 Oct 2011 13:08:09 -0400 Received: from illuin.austin.ibm.com ([32.97.110.59]) by mrelay.perfora.net (node=mrus0) with ESMTP (Nemesis) id 0LjpYX-1QheYq2l7h-00bbzB; Thu, 27 Oct 2011 13:07:02 -0400 From: Michael Roth To: qemu-devel@nongnu.org Date: Thu, 27 Oct 2011 12:06:25 -0500 Message-Id: <1319735193-4718-3-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1319735193-4718-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1319735193-4718-1-git-send-email-mdroth@linux.vnet.ibm.com> X-Provags-ID: V02:K0:xY5GWCZjvdIViUngaTFAlGNbfotJCA4r0cNzYy9eOLd 1qLHSYGg3Uidla7t22V9dmTMcEIMWH0W7T9SGF/IFt3JZ8z1M/ b5lu14cYzUfV5Uc8CPPyI/tCSa3dGqZc5mljFGpfWBTiDj0P6J GCffOudnDO3BZ6BGOfcbKsdV2w9rR4Eys13qHEuOGLlXIEJ3BN lvuDvntbjFeU8n8gfhUHsSUwTIvD0sQKhFhfr9ydjXbqVbrKoS y7uovFRu6czubjdYH+s94+cEm/dH7mzlD4i8mXMoEhm0mP0OIp E4dK8EVkuW3Ivg28E0pC1arNo+Csrm/JtxlcE5fow6CfuLMFpo DJa0nRl0ySUkZhk9zq3giiJc/hbdBUe2vsYMCYx5rVIkbWBXAt B33tUn5bGW2SFg0P48GWrC+fNlxw3bepwk= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 74.208.4.195 Cc: aliguori@us.ibm.com, mdroth@linux.vnet.ibm.com, quintela@redhat.com Subject: [Qemu-devel] [PATCH v2 02/10] qapi: add QemuFileOutputVisitor X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Visitor interface to write values to a QEMUFile. Signed-off-by: Michael Roth --- Makefile.objs | 19 +-- qapi/qemu-file-output-visitor.c | 328 +++++++++++++++++++++++++++++++++++++++ qapi/qemu-file-output-visitor.h | 26 +++ 3 files changed, 363 insertions(+), 10 deletions(-) create mode 100644 qapi/qemu-file-output-visitor.c create mode 100644 qapi/qemu-file-output-visitor.h diff --git a/Makefile.objs b/Makefile.objs index 01587c8..0229140 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -20,6 +20,12 @@ coroutine-obj-$(CONFIG_POSIX) += coroutine-gthread.o endif coroutine-obj-$(CONFIG_WIN32) += coroutine-win32.o +###################################################################### +# qapi +qapi-nested-y = qapi-visit-core.o qmp-input-visitor.o qmp-output-visitor.o qapi-dealloc-visitor.o +qapi-nested-y += qmp-registry.o qmp-dispatch.o +qapi-obj-y = $(addprefix qapi/, $(qapi-nested-y)) + ####################################################################### # block-obj-y is code used by both qemu system emulation and qemu-img @@ -73,6 +79,9 @@ fsdev-obj-$(CONFIG_VIRTFS) += $(addprefix fsdev/, $(fsdev-nested-y)) # CPUs and machines. common-obj-y = $(block-obj-y) blockdev.o +common-obj-y += qmp-marshal.o qapi-visit.o qapi-types.o $(qapi-obj-y) +common-obj-y += qmp.o hmp.o +common-obj-y += qapi/qemu-file-output-visitor.o common-obj-y += $(net-obj-y) common-obj-y += $(qobject-obj-y) common-obj-$(CONFIG_LINUX) += $(fsdev-obj-$(CONFIG_LINUX)) @@ -401,16 +410,6 @@ $(trace-obj-y): $(GENERATED_HEADERS) libcacard-y = cac.o event.o vcard.o vreader.o vcard_emul_nss.o vcard_emul_type.o card_7816.o ###################################################################### -# qapi - -qapi-nested-y = qapi-visit-core.o qmp-input-visitor.o qmp-output-visitor.o qapi-dealloc-visitor.o -qapi-nested-y += qmp-registry.o qmp-dispatch.o -qapi-obj-y = $(addprefix qapi/, $(qapi-nested-y)) - -common-obj-y += qmp-marshal.o qapi-visit.o qapi-types.o $(qapi-obj-y) -common-obj-y += qmp.o hmp.o - -###################################################################### # guest agent qga-nested-y = guest-agent-commands.o guest-agent-command-state.o diff --git a/qapi/qemu-file-output-visitor.c b/qapi/qemu-file-output-visitor.c new file mode 100644 index 0000000..43a0b15 --- /dev/null +++ b/qapi/qemu-file-output-visitor.c @@ -0,0 +1,328 @@ +/* + * QEMUFile Output Visitor + * + * Copyright IBM, Corp. 2011 + * + * Authors: + * Michael Roth + * + * This work is licensed under the terms of the GNU LGPL, version 2.1 or later. + * See the COPYING.LIB file in the top-level directory. + * + */ + +#include "qemu-file-output-visitor.h" +#include "qemu-queue.h" +#include "qemu-common.h" +#include "qemu-objects.h" +#include "hw/hw.h" +#include "qerror.h" + +typedef struct { + size_t elem_count; + size_t elem_size; + size_t pos; +} ArrayInfo; + +typedef struct StackEntry +{ + enum { + QFOV_ARRAY, + QFOV_LIST, + QFOV_STRUCT, + } type; + ArrayInfo array_info; + bool is_list_head; + QTAILQ_ENTRY(StackEntry) node; +} StackEntry; + +struct QemuFileOutputVisitor +{ + Visitor visitor; + QTAILQ_HEAD(, StackEntry) stack; + QEMUFile *file; +}; + +static QemuFileOutputVisitor *to_ov(Visitor *v) +{ + return container_of(v, QemuFileOutputVisitor, visitor); +} + +static void qemu_file_output_push(QemuFileOutputVisitor *ov, StackEntry *e) +{ + QTAILQ_INSERT_HEAD(&ov->stack, e, node); +} + +static void qemu_file_output_push_array(QemuFileOutputVisitor *ov, ArrayInfo ai) +{ + StackEntry *e = g_malloc0(sizeof(*e)); + e->type = QFOV_ARRAY; + e->array_info = ai; + qemu_file_output_push(ov, e); +} + +static void qemu_file_output_push_list(QemuFileOutputVisitor *ov) +{ + StackEntry *e = g_malloc0(sizeof(*e)); + e->type = QFOV_LIST; + e->is_list_head = true; + qemu_file_output_push(ov, e); +} + +static void qemu_file_output_push_struct(QemuFileOutputVisitor *ov) +{ + StackEntry *e = g_malloc0(sizeof(*e)); + e->type = QFOV_STRUCT; + qemu_file_output_push(ov, e); +} + +static StackEntry *qemu_file_output_pop(QemuFileOutputVisitor *ov) +{ + StackEntry *e = QTAILQ_FIRST(&ov->stack); + QTAILQ_REMOVE(&ov->stack, e, node); + return e; +} + +static bool qemu_file_output_is_array(QemuFileOutputVisitor *ov) +{ + StackEntry *e = QTAILQ_FIRST(&ov->stack); + return e && e->type == QFOV_ARRAY; +} + +static bool qemu_file_output_is_list(QemuFileOutputVisitor *ov) +{ + StackEntry *e = QTAILQ_FIRST(&ov->stack); + return e && e->type == QFOV_LIST; +} + +static void qemu_file_output_start_struct(Visitor *v, void **obj, + const char *kind, const char *name, + size_t unused, Error **errp) +{ + QemuFileOutputVisitor *ov = to_ov(v); + + qemu_file_output_push_struct(ov); +} + +static void qemu_file_output_end_struct(Visitor *v, Error **errp) +{ + QemuFileOutputVisitor *ov = to_ov(v); + StackEntry *e = qemu_file_output_pop(ov); + + if (!e || e->type != QFOV_STRUCT) { + error_set(errp, QERR_UNDEFINED_ERROR); + return; + } + g_free(e); +} + +static void qemu_file_output_start_list(Visitor *v, const char *name, + Error **errp) +{ + QemuFileOutputVisitor *ov = to_ov(v); + qemu_file_output_push_list(ov); +} + +static GenericList *qemu_file_output_next_list(Visitor *v, GenericList **list, + Error **errp) +{ + QemuFileOutputVisitor *ov = to_ov(v); + GenericList *entry = *list; + StackEntry *e = QTAILQ_FIRST(&ov->stack); + + if (!entry || !qemu_file_output_is_list(ov)) { + error_set(errp, QERR_UNDEFINED_ERROR); + } + + /* The way the list iterator is currently used unfortunately clobbers + * **list by subseqently assigning our return value to the same container. + * This can cause an infinite loop, but we can get around this by tracking + * a bit of state to note when we should pass back the next entry rather + * than the current one. + */ + if (e->is_list_head) { + e->is_list_head = false; + return entry; + } + + *list = entry->next; + return entry->next; +} + +static void qemu_file_output_end_list(Visitor *v, Error **errp) +{ + QemuFileOutputVisitor *ov = to_ov(v); + StackEntry *e = qemu_file_output_pop(ov); + if (!e || e->type != QFOV_LIST) { + error_set(errp, QERR_UNDEFINED_ERROR); + } + g_free(e); +} + +static void qemu_file_output_start_array(Visitor *v, void **obj, + const char *name, + size_t elem_count, + size_t elem_size, Error **errp) +{ + QemuFileOutputVisitor *ov = to_ov(v); + ArrayInfo ai = { + .elem_count = elem_count, + .elem_size = elem_size, + .pos = 0 + }; + qemu_file_output_push_array(ov, ai); +} + +static void qemu_file_output_next_array(Visitor *v, Error **errp) +{ + QemuFileOutputVisitor *ov = to_ov(v); + StackEntry *e = QTAILQ_FIRST(&ov->stack); + if (!qemu_file_output_is_array(ov) || + e->array_info.pos >= e->array_info.elem_count) { + error_set(errp, QERR_UNDEFINED_ERROR); + } + + e->array_info.pos++; +} + +static void qemu_file_output_end_array(Visitor *v, Error **errp) +{ + QemuFileOutputVisitor *ov = to_ov(v); + StackEntry *e = qemu_file_output_pop(ov); + if (!e || e->type != QFOV_ARRAY) { + error_set(errp, QERR_UNDEFINED_ERROR); + return; + } + g_free(e); +} + +static void qemu_file_output_type_str(Visitor *v, char **obj, const char *name, + Error **errp) +{ + if (obj) { + g_free(*obj); + } +} + +static void qemu_file_output_type_uint8(Visitor *v, uint8_t *obj, + const char *name, + Error **errp) +{ + QemuFileOutputVisitor *ov = container_of(v, QemuFileOutputVisitor, visitor); + qemu_put_byte(ov->file, *obj); +} + +static void qemu_file_output_type_uint16(Visitor *v, uint16_t *obj, + const char *name, Error **errp) +{ + QemuFileOutputVisitor *ov = container_of(v, QemuFileOutputVisitor, visitor); + qemu_put_be16(ov->file, *obj); +} + +static void qemu_file_output_type_uint32(Visitor *v, uint32_t *obj, + const char *name, Error **errp) +{ + QemuFileOutputVisitor *ov = container_of(v, QemuFileOutputVisitor, visitor); + qemu_put_be32(ov->file, *obj); +} + +static void qemu_file_output_type_uint64(Visitor *v, uint64_t *obj, + const char *name, Error **errp) +{ + QemuFileOutputVisitor *ov = container_of(v, QemuFileOutputVisitor, visitor); + qemu_put_be64(ov->file, *obj); +} + +static void qemu_file_output_type_int8(Visitor *v, int8_t *obj, + const char *name, Error **errp) +{ + QemuFileOutputVisitor *ov = container_of(v, QemuFileOutputVisitor, visitor); + qemu_put_sbyte(ov->file, *obj); +} + +static void qemu_file_output_type_int16(Visitor *v, int16_t *obj, + const char *name, Error **errp) +{ + QemuFileOutputVisitor *ov = container_of(v, QemuFileOutputVisitor, visitor); + qemu_put_sbe16(ov->file, *obj); +} + +static void qemu_file_output_type_int32(Visitor *v, int32_t *obj, + const char *name, Error **errp) +{ + QemuFileOutputVisitor *ov = container_of(v, QemuFileOutputVisitor, visitor); + qemu_put_sbe32(ov->file, *obj); +} + +static void qemu_file_output_type_int64(Visitor *v, int64_t *obj, + const char *name, Error **errp) +{ + QemuFileOutputVisitor *ov = container_of(v, QemuFileOutputVisitor, visitor); + qemu_put_be64(ov->file, *obj); +} + +static void qemu_file_output_type_bool(Visitor *v, bool *obj, const char *name, + Error **errp) +{ + uint8_t val = *obj; + qemu_file_output_type_uint8(v, &val, name, errp); +} + +static void qemu_file_output_type_number(Visitor *v, double *obj, + const char *name, Error **errp) +{ + uint64_t *val = (uint64_t *)obj; + qemu_file_output_type_uint64(v, val, name, errp); +} + +static void qemu_file_output_type_enum(Visitor *v, int *obj, + const char *strings[], + const char *kind, const char *name, + Error **errp) +{ +} + +Visitor *qemu_file_output_get_visitor(QemuFileOutputVisitor *v) +{ + return &v->visitor; +} + +void qemu_file_output_visitor_cleanup(QemuFileOutputVisitor *ov) +{ + g_free(ov); +} + +QemuFileOutputVisitor *qemu_file_output_visitor_new(QEMUFile *f) +{ + QemuFileOutputVisitor *v; + + v = g_malloc0(sizeof(*v)); + + v->file = f; + + v->visitor.start_struct = qemu_file_output_start_struct; + v->visitor.end_struct = qemu_file_output_end_struct; + v->visitor.start_list = qemu_file_output_start_list; + v->visitor.next_list = qemu_file_output_next_list; + v->visitor.end_list = qemu_file_output_end_list; + v->visitor.start_array = qemu_file_output_start_array; + v->visitor.next_array = qemu_file_output_next_array; + v->visitor.end_array = qemu_file_output_end_array; + v->visitor.type_enum = qemu_file_output_type_enum; + v->visitor.type_int = qemu_file_output_type_int64; + v->visitor.type_uint8 = qemu_file_output_type_uint8; + v->visitor.type_uint16 = qemu_file_output_type_uint16; + v->visitor.type_uint32 = qemu_file_output_type_uint32; + v->visitor.type_uint64 = qemu_file_output_type_uint64; + v->visitor.type_int8 = qemu_file_output_type_int8; + v->visitor.type_int16 = qemu_file_output_type_int16; + v->visitor.type_int32 = qemu_file_output_type_int32; + v->visitor.type_int64 = qemu_file_output_type_int64; + v->visitor.type_bool = qemu_file_output_type_bool; + v->visitor.type_str = qemu_file_output_type_str; + v->visitor.type_number = qemu_file_output_type_number; + + QTAILQ_INIT(&v->stack); + + return v; +} diff --git a/qapi/qemu-file-output-visitor.h b/qapi/qemu-file-output-visitor.h new file mode 100644 index 0000000..e446f08 --- /dev/null +++ b/qapi/qemu-file-output-visitor.h @@ -0,0 +1,26 @@ +/* + * QEMUFile Visitor + * + * Copyright IBM, Corp. 2011 + * + * Authors: + * Michael Roth + * + * This work is licensed under the terms of the GNU LGPL, version 2.1 or later. + * See the COPYING.LIB file in the top-level directory. + * + */ + +#ifndef QEMU_FILE_OUTPUT_VISITOR_H +#define QEMU_FILE_OUTPUT_VISITOR_H + +#include "qapi-visit-core.h" + +typedef struct QemuFileOutputVisitor QemuFileOutputVisitor; + +QemuFileOutputVisitor *qemu_file_output_visitor_new(QEMUFile *f); +void qemu_file_output_visitor_cleanup(QemuFileOutputVisitor *d); + +Visitor *qemu_file_output_get_visitor(QemuFileOutputVisitor *v); + +#endif