Commit b3db211f authored by Daniel P. Berrangé's avatar Daniel P. Berrangé Committed by Markus Armbruster
Browse files

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: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarDaniel P. Berrange <berrange@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
[Split into file and identifier rename, two comments touched up]
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent ebfd93b6

block/qapi.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#include "block/write-threshold.h"

#include "qmp-commands.h"

#include "qapi-visit.h"

#include "qapi/qmp-output-visitor.h"

#include "qapi/qobject-output-visitor.h"

#include "qapi/qmp/types.h"

#include "sysemu/block-backend.h"

#include "qemu/cutils.h"

blockdev.c

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
#include "qapi/qmp/types.h"

#include "qapi-visit.h"

#include "qapi/qmp/qerror.h"

#include "qapi/qmp-output-visitor.h"

#include "qapi/qobject-output-visitor.h"

#include "qapi/util.h"

#include "sysemu/sysemu.h"

#include "block/block_int.h"

include/qapi/qmp-input-visitor.h→include/qapi/qobject-input-visitor.h

+3 −3
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ 
 *

 */



#ifndef QMP_INPUT_VISITOR_H

#define QMP_INPUT_VISITOR_H

#ifndef QOBJECT_INPUT_VISITOR_H

#define QOBJECT_INPUT_VISITOR_H



#include "qapi/visitor.h"

#include "qapi/qmp/qobject.h"
@@ -20,7 +20,7 @@ 
typedef struct QmpInputVisitor QmpInputVisitor;



/*

 * Return a new input visitor that converts QMP to QAPI.

 * 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.

include/qapi/qmp-output-visitor.h→include/qapi/qobject-output-visitor.h

+3 −3
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ 
 *

 */



#ifndef QMP_OUTPUT_VISITOR_H

#define QMP_OUTPUT_VISITOR_H

#ifndef QOBJECT_OUTPUT_VISITOR_H

#define QOBJECT_OUTPUT_VISITOR_H



#include "qapi/visitor.h"

#include "qapi/qmp/qobject.h"
@@ -20,7 +20,7 @@ 
typedef struct QmpOutputVisitor QmpOutputVisitor;



/*

 * Create a new QMP output visitor.

 * Create a new QObject output visitor.

 *

 * If everything else succeeds, pass @result to visit_complete() to

 * collect the result of the visit.

include/qapi/visitor.h

+3 −3
Original line number Diff line number Diff line
@@ -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