From b3db211f3c80bb996a704d665fe275619f728bd4 Mon Sep 17 00:00:00 2001 From: Daniel P. Berrange Date: Fri, 30 Sep 2016 15:45:27 +0100 Subject: qapi: rename *qmp-*-visitor* to *qobject-*-visitor* The QMP visitors have no direct dependency on QMP. It is valid to use them anywhere that one has a QObject. Rename them to better reflect their functionality as a generic QObject to QAPI converter. This is the first of three parts: rename the files. The next two parts will rename C identifiers. The split is necessary to make git rename detection work. Reviewed-by: Kevin Wolf Reviewed-by: Eric Blake Signed-off-by: Daniel P. Berrange Reviewed-by: Markus Armbruster [Split into file and identifier rename, two comments touched up] Signed-off-by: Markus Armbruster --- include/qapi/qmp-input-visitor.h | 30 ------------------------------ include/qapi/qmp-output-visitor.h | 30 ------------------------------ include/qapi/qobject-input-visitor.h | 30 ++++++++++++++++++++++++++++++ include/qapi/qobject-output-visitor.h | 30 ++++++++++++++++++++++++++++++ include/qapi/visitor.h | 6 +++--- 5 files changed, 63 insertions(+), 63 deletions(-) delete mode 100644 include/qapi/qmp-input-visitor.h delete mode 100644 include/qapi/qmp-output-visitor.h create mode 100644 include/qapi/qobject-input-visitor.h create mode 100644 include/qapi/qobject-output-visitor.h (limited to 'include') diff --git a/include/qapi/qmp-input-visitor.h b/include/qapi/qmp-input-visitor.h deleted file mode 100644 index f3ff5f3e98..0000000000 --- a/include/qapi/qmp-input-visitor.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Input Visitor - * - * Copyright IBM, Corp. 2011 - * - * Authors: - * Anthony Liguori - * - * 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 QMP_INPUT_VISITOR_H -#define QMP_INPUT_VISITOR_H - -#include "qapi/visitor.h" -#include "qapi/qmp/qobject.h" - -typedef struct QmpInputVisitor QmpInputVisitor; - -/* - * Return a new input visitor that converts QMP to QAPI. - * - * Set @strict to reject a parse that doesn't consume all keys of a - * dictionary; otherwise excess input is ignored. - */ -Visitor *qmp_input_visitor_new(QObject *obj, bool strict); - -#endif diff --git a/include/qapi/qmp-output-visitor.h b/include/qapi/qmp-output-visitor.h deleted file mode 100644 index 040fdda142..0000000000 --- a/include/qapi/qmp-output-visitor.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Output Visitor - * - * Copyright IBM, Corp. 2011 - * - * Authors: - * Anthony Liguori - * - * 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 QMP_OUTPUT_VISITOR_H -#define QMP_OUTPUT_VISITOR_H - -#include "qapi/visitor.h" -#include "qapi/qmp/qobject.h" - -typedef struct QmpOutputVisitor QmpOutputVisitor; - -/* - * Create a new QMP output visitor. - * - * If everything else succeeds, pass @result to visit_complete() to - * collect the result of the visit. - */ -Visitor *qmp_output_visitor_new(QObject **result); - -#endif diff --git a/include/qapi/qobject-input-visitor.h b/include/qapi/qobject-input-visitor.h new file mode 100644 index 0000000000..cd7414c4c0 --- /dev/null +++ b/include/qapi/qobject-input-visitor.h @@ -0,0 +1,30 @@ +/* + * Input Visitor + * + * Copyright IBM, Corp. 2011 + * + * Authors: + * Anthony Liguori + * + * 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 QOBJECT_INPUT_VISITOR_H +#define QOBJECT_INPUT_VISITOR_H + +#include "qapi/visitor.h" +#include "qapi/qmp/qobject.h" + +typedef struct QmpInputVisitor QmpInputVisitor; + +/* + * Return a new input visitor that converts a QObject to a QAPI object. + * + * Set @strict to reject a parse that doesn't consume all keys of a + * dictionary; otherwise excess input is ignored. + */ +Visitor *qmp_input_visitor_new(QObject *obj, bool strict); + +#endif diff --git a/include/qapi/qobject-output-visitor.h b/include/qapi/qobject-output-visitor.h new file mode 100644 index 0000000000..f455245721 --- /dev/null +++ b/include/qapi/qobject-output-visitor.h @@ -0,0 +1,30 @@ +/* + * Output Visitor + * + * Copyright IBM, Corp. 2011 + * + * Authors: + * Anthony Liguori + * + * 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 QOBJECT_OUTPUT_VISITOR_H +#define QOBJECT_OUTPUT_VISITOR_H + +#include "qapi/visitor.h" +#include "qapi/qmp/qobject.h" + +typedef struct QmpOutputVisitor QmpOutputVisitor; + +/* + * Create a new QObject output visitor. + * + * If everything else succeeds, pass @result to visit_complete() to + * collect the result of the visit. + */ +Visitor *qmp_output_visitor_new(QObject **result); + +#endif diff --git a/include/qapi/visitor.h b/include/qapi/visitor.h index 6c77a913db..9bb6cba237 100644 --- a/include/qapi/visitor.h +++ b/include/qapi/visitor.h @@ -25,14 +25,14 @@ * for doing work at each node of a QAPI graph; it can also be used * for a virtual walk, where there is no actual QAPI C struct. * - * There are four kinds of visitor classes: input visitors (QMP, + * There are four kinds of visitor classes: input visitors (QObject, * string, and QemuOpts) parse an external representation and build - * the corresponding QAPI graph, output visitors (QMP and string) take + * the corresponding QAPI graph, output visitors (QObject and string) take * a completed QAPI graph and generate an external representation, the * dealloc visitor can take a QAPI graph (possibly partially * constructed) and recursively free its resources, and the clone * visitor performs a deep clone of one QAPI object to another. While - * the dealloc and QMP input/output visitors are general, the string, + * the dealloc and QObject input/output visitors are general, the string, * QemuOpts, and clone visitors have some implementation limitations; * see the documentation for each visitor for more details on what it * supports. Also, see visitor-impl.h for the callback contracts -- cgit v1.2.3-55-g7522