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.

Backports commit b3db211f3c80bb996a704d665fe275619f728bd4 from qemu
This commit is contained in:
Daniel P. Berrange 2018-02-26 15:42:25 -05:00 committed by Lioncash
parent 1a850bcb19
commit 228f122248
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
12 changed files with 24 additions and 24 deletions

View file

@ -201,8 +201,8 @@ copy $(SolutionDir)..\include\unicorn\*.h $(SolutionDir)distro\include\unicorn\
<ClCompile Include="..\..\..\qemu\qapi\qmp-clone-visitor.c" /> <ClCompile Include="..\..\..\qemu\qapi\qmp-clone-visitor.c" />
<ClCompile Include="..\..\..\qemu\qapi\qapi-dealloc-visitor.c" /> <ClCompile Include="..\..\..\qemu\qapi\qapi-dealloc-visitor.c" />
<ClCompile Include="..\..\..\qemu\qapi\qapi-visit-core.c" /> <ClCompile Include="..\..\..\qemu\qapi\qapi-visit-core.c" />
<ClCompile Include="..\..\..\qemu\qapi\qmp-input-visitor.c" /> <ClCompile Include="..\..\..\qemu\qapi\qobject-input-visitor.c" />
<ClCompile Include="..\..\..\qemu\qapi\qmp-output-visitor.c" /> <ClCompile Include="..\..\..\qemu\qapi\qobject-output-visitor.c" />
<ClCompile Include="..\..\..\qemu\qapi\string-input-visitor.c" /> <ClCompile Include="..\..\..\qemu\qapi\string-input-visitor.c" />
<ClCompile Include="..\..\..\qemu\qemu-timer.c" /> <ClCompile Include="..\..\..\qemu\qemu-timer.c" />
<ClCompile Include="..\..\..\qemu\qobject\qbool.c" /> <ClCompile Include="..\..\..\qemu\qobject\qbool.c" />
@ -316,8 +316,8 @@ copy $(SolutionDir)..\include\unicorn\*.h $(SolutionDir)distro\include\unicorn\
<ClInclude Include="..\..\..\qemu\include\qapi\dealloc-visitor.h" /> <ClInclude Include="..\..\..\qemu\include\qapi\dealloc-visitor.h" />
<ClInclude Include="..\..\..\qemu\include\qapi\error.h" /> <ClInclude Include="..\..\..\qemu\include\qapi\error.h" />
<ClInclude Include="..\..\..\qemu\include\qapi\opts-visitor.h" /> <ClInclude Include="..\..\..\qemu\include\qapi\opts-visitor.h" />
<ClInclude Include="..\..\..\qemu\include\qapi\qmp-input-visitor.h" /> <ClInclude Include="..\..\..\qemu\include\qapi\qobject-input-visitor.h" />
<ClInclude Include="..\..\..\qemu\include\qapi\qmp-output-visitor.h" /> <ClInclude Include="..\..\..\qemu\include\qapi\qobject-output-visitor.h" />
<ClInclude Include="..\..\..\qemu\include\qapi\qmp\qbool.h" /> <ClInclude Include="..\..\..\qemu\include\qapi\qmp\qbool.h" />
<ClInclude Include="..\..\..\qemu\include\qapi\qmp\qdict.h" /> <ClInclude Include="..\..\..\qemu\include\qapi\qmp\qdict.h" />
<ClInclude Include="..\..\..\qemu\include\qapi\qmp\qerror.h" /> <ClInclude Include="..\..\..\qemu\include\qapi\qmp\qerror.h" />

View file

@ -77,10 +77,10 @@
<ClCompile Include="..\..\..\qemu\qapi\qapi-visit-core.c"> <ClCompile Include="..\..\..\qemu\qapi\qapi-visit-core.c">
<Filter>qemu\qapi</Filter> <Filter>qemu\qapi</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\qemu\qapi\qmp-input-visitor.c"> <ClCompile Include="..\..\..\qemu\qapi\qobject-input-visitor.c">
<Filter>qemu\qapi</Filter> <Filter>qemu\qapi</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\qemu\qapi\qmp-output-visitor.c"> <ClCompile Include="..\..\..\qemu\qapi\qobject-output-visitor.c">
<Filter>qemu\qapi</Filter> <Filter>qemu\qapi</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\qemu\qapi\string-input-visitor.c"> <ClCompile Include="..\..\..\qemu\qapi\string-input-visitor.c">
@ -382,10 +382,10 @@
<ClInclude Include="..\..\..\qemu\include\qapi\opts-visitor.h"> <ClInclude Include="..\..\..\qemu\include\qapi\opts-visitor.h">
<Filter>qemu\include\qapi</Filter> <Filter>qemu\include\qapi</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\..\qemu\include\qapi\qmp-input-visitor.h"> <ClInclude Include="..\..\..\qemu\include\qapi\qobject-input-visitor.h">
<Filter>qemu\include\qapi</Filter> <Filter>qemu\include\qapi</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\..\qemu\include\qapi\qmp-output-visitor.h"> <ClInclude Include="..\..\..\qemu\include\qapi\qobject-output-visitor.h">
<Filter>qemu\include\qapi</Filter> <Filter>qemu\include\qapi</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\..\qemu\include\qapi\string-input-visitor.h"> <ClInclude Include="..\..\..\qemu\include\qapi\string-input-visitor.h">

View file

@ -29,8 +29,8 @@
<ClCompile Include="..\..\..\qemu\qapi\qapi-clone-visitor.c" /> <ClCompile Include="..\..\..\qemu\qapi\qapi-clone-visitor.c" />
<ClCompile Include="..\..\..\qemu\qapi\qapi-dealloc-visitor.c" /> <ClCompile Include="..\..\..\qemu\qapi\qapi-dealloc-visitor.c" />
<ClCompile Include="..\..\..\qemu\qapi\qapi-visit-core.c" /> <ClCompile Include="..\..\..\qemu\qapi\qapi-visit-core.c" />
<ClCompile Include="..\..\..\qemu\qapi\qmp-input-visitor.c" /> <ClCompile Include="..\..\..\qemu\qapi\qobject-input-visitor.c" />
<ClCompile Include="..\..\..\qemu\qapi\qmp-output-visitor.c" /> <ClCompile Include="..\..\..\qemu\qapi\qobject-output-visitor.c" />
<ClCompile Include="..\..\..\qemu\qapi\string-input-visitor.c" /> <ClCompile Include="..\..\..\qemu\qapi\string-input-visitor.c" />
<ClCompile Include="..\..\..\qemu\qemu-timer.c" /> <ClCompile Include="..\..\..\qemu\qemu-timer.c" />
<ClCompile Include="..\..\..\qemu\qobject\qbool.c" /> <ClCompile Include="..\..\..\qemu\qobject\qbool.c" />
@ -130,8 +130,8 @@
<ClInclude Include="..\..\..\qemu\include\qapi\dealloc-visitor.h" /> <ClInclude Include="..\..\..\qemu\include\qapi\dealloc-visitor.h" />
<ClInclude Include="..\..\..\qemu\include\qapi\error.h" /> <ClInclude Include="..\..\..\qemu\include\qapi\error.h" />
<ClInclude Include="..\..\..\qemu\include\qapi\opts-visitor.h" /> <ClInclude Include="..\..\..\qemu\include\qapi\opts-visitor.h" />
<ClInclude Include="..\..\..\qemu\include\qapi\qmp-input-visitor.h" /> <ClInclude Include="..\..\..\qemu\include\qapi\qobject-input-visitor.h" />
<ClInclude Include="..\..\..\qemu\include\qapi\qmp-output-visitor.h" /> <ClInclude Include="..\..\..\qemu\include\qapi\qobject-output-visitor.h" />
<ClInclude Include="..\..\..\qemu\include\qapi\qmp\qbool.h" /> <ClInclude Include="..\..\..\qemu\include\qapi\qmp\qbool.h" />
<ClInclude Include="..\..\..\qemu\include\qapi\qmp\qdict.h" /> <ClInclude Include="..\..\..\qemu\include\qapi\qmp\qdict.h" />
<ClInclude Include="..\..\..\qemu\include\qapi\qmp\qerror.h" /> <ClInclude Include="..\..\..\qemu\include\qapi\qmp\qerror.h" />

View file

@ -105,10 +105,10 @@
<ClCompile Include="..\..\..\qemu\qapi\qapi-visit-core.c"> <ClCompile Include="..\..\..\qemu\qapi\qapi-visit-core.c">
<Filter>qemu\qapi</Filter> <Filter>qemu\qapi</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\qemu\qapi\qmp-input-visitor.c"> <ClCompile Include="..\..\..\qemu\qapi\qobject-input-visitor.c">
<Filter>qemu\qapi</Filter> <Filter>qemu\qapi</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\qemu\qapi\qmp-output-visitor.c"> <ClCompile Include="..\..\..\qemu\qapi\qobject-output-visitor.c">
<Filter>qemu\qapi</Filter> <Filter>qemu\qapi</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\qemu\qapi\string-input-visitor.c"> <ClCompile Include="..\..\..\qemu\qapi\string-input-visitor.c">
@ -372,10 +372,10 @@
<ClInclude Include="..\..\..\qemu\include\qapi\opts-visitor.h"> <ClInclude Include="..\..\..\qemu\include\qapi\opts-visitor.h">
<Filter>qemu\include\qapi</Filter> <Filter>qemu\include\qapi</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\..\qemu\include\qapi\qmp-input-visitor.h"> <ClInclude Include="..\..\..\qemu\include\qapi\qobject-input-visitor.h">
<Filter>qemu\include\qapi</Filter> <Filter>qemu\include\qapi</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\..\qemu\include\qapi\qmp-output-visitor.h"> <ClInclude Include="..\..\..\qemu\include\qapi\qobject-output-visitor.h">
<Filter>qemu\include\qapi</Filter> <Filter>qemu\include\qapi</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\..\qemu\include\qapi\string-input-visitor.h"> <ClInclude Include="..\..\..\qemu\include\qapi\string-input-visitor.h">

View file

@ -1,4 +1,4 @@
util-obj-y = qapi-visit-core.o qapi-dealloc-visitor.o qmp-input-visitor.o util-obj-y = qapi-visit-core.o qapi-dealloc-visitor.o qobject-input-visitor.o
util-obj-y += qapi-clone-visitor.o util-obj-y += qapi-clone-visitor.o
util-obj-y += qmp-output-visitor.o util-obj-y += qobject-output-visitor.o
util-obj-y += string-input-visitor.o util-obj-y += string-input-visitor.o

View file

@ -110,7 +110,7 @@ static void qapi_clone_type_str(Visitor *v, const char *name, char **obj,
assert(qcv->depth); assert(qcv->depth);
/* /*
* Pointer was already cloned by g_memdup; create fresh copy. * Pointer was already cloned by g_memdup; create fresh copy.
* Note that as long as qmp-output-visitor accepts NULL instead of * Note that as long as qobject-output-visitor accepts NULL instead of
* "", then we must do likewise. However, we want to obey the * "", then we must do likewise. However, we want to obey the
* input visitor semantics of never producing NULL when the empty * input visitor semantics of never producing NULL when the empty
* string is intended. * string is intended.

View file

@ -13,7 +13,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qmp-input-visitor.h" #include "qapi/qobject-input-visitor.h"
#include "qapi/visitor-impl.h" #include "qapi/visitor-impl.h"
#include "qemu/queue.h" #include "qemu/queue.h"
#include "qemu-common.h" #include "qemu-common.h"

View file

@ -13,7 +13,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qmp-output-visitor.h" #include "qapi/qobject-output-visitor.h"
#include "qapi/visitor-impl.h" #include "qapi/visitor-impl.h"
#include "qemu/queue.h" #include "qemu/queue.h"
#include "qemu-common.h" #include "qemu-common.h"

View file

@ -15,8 +15,8 @@
#include "qom/object.h" #include "qom/object.h"
#include "qom/qom-qobject.h" #include "qom/qom-qobject.h"
#include "qapi/visitor.h" #include "qapi/visitor.h"
#include "qapi/qmp-input-visitor.h" #include "qapi/qobject-input-visitor.h"
#include "qapi/qmp-output-visitor.h" #include "qapi/qobject-output-visitor.h"
void object_property_set_qobject(struct uc_struct *uc, Object *obj, QObject *value, void object_property_set_qobject(struct uc_struct *uc, Object *obj, QObject *value,
const char *name, Error **errp) const char *name, Error **errp)

View file

@ -206,7 +206,7 @@ fdef.write(mcgen('''
#include "qemu-common.h" #include "qemu-common.h"
#include "%(prefix)sqapi-event.h" #include "%(prefix)sqapi-event.h"
#include "%(prefix)sqapi-visit.h" #include "%(prefix)sqapi-visit.h"
#include "qapi/qmp-output-visitor.h" #include "qapi/qobject-output-visitor.h"
#include "qapi/qmp-event.h" #include "qapi/qmp-event.h"
''', ''',