Re: [PATCH 01/11] qapi: Rename qjson.h to qobject-json.h
On 11/12/2015 00:53, Eric Blake wrote: > We have two different JSON visitors in the tree; and having both > named 'qjson.h' can cause include confusion. Rename the qapi > version. > > Kill trailing whitespace in the renamed tests/check-qobject-json.c > to keep checkpatch.pl happy. > > Signed-off-by: Eric Blake > --- > MAINTAINERS | 2 +- > balloon.c | 2 +- > block.c | 2 +- > block/archipelago.c | 2 +- > block/nbd.c | 2 +- > block/quorum.c| 2 +- > blockjob.c| 2 +- > hw/core/qdev.c| 2 +- > hw/misc/pvpanic.c | 2 +- > hw/net/virtio-net.c | 2 +- > include/qapi/qmp/{qjson.h => qobject-json.h} | 0 > include/qapi/qmp/types.h | 2 +- > monitor.c | 2 +- > qapi/qmp-event.c | 2 +- > qemu-img.c| 2 +- > qga/main.c| 2 +- > qobject/Makefile.objs | 3 ++- > qobject/{qjson.c => qobject-json.c} | 2 +- > target-s390x/kvm.c| 2 +- > tests/.gitignore | 2 +- > tests/Makefile| 8 > tests/{check-qjson.c => check-qobject-json.c} | 14 +++--- > tests/libqtest.c | 2 +- > ui/spice-core.c | 2 +- > vl.c | 2 +- > 25 files changed, 34 insertions(+), 33 deletions(-) > rename include/qapi/qmp/{qjson.h => qobject-json.h} (100%) > rename qobject/{qjson.c => qobject-json.c} (99%) > rename tests/{check-qjson.c => check-qobject-json.c} (99%) > > diff --git a/MAINTAINERS b/MAINTAINERS > index e8cee1e..c943ff4 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -1155,7 +1155,7 @@ X: include/qapi/qmp/dispatch.h > F: tests/check-qdict.c > F: tests/check-qfloat.c > F: tests/check-qint.c > -F: tests/check-qjson.c > +F: tests/check-qobject-json.c > F: tests/check-qlist.c > F: tests/check-qstring.c > T: git git://repo.or.cz/qemu/qmp-unstable.git queue/qmp > diff --git a/balloon.c b/balloon.c > index 0f45d1b..5983b4f 100644 > --- a/balloon.c > +++ b/balloon.c > @@ -31,7 +31,7 @@ > #include "trace.h" > #include "qmp-commands.h" > #include "qapi/qmp/qerror.h" > -#include "qapi/qmp/qjson.h" > +#include "qapi/qmp/qobject-json.h" > > static QEMUBalloonEvent *balloon_event_fn; > static QEMUBalloonStatus *balloon_stat_fn; > diff --git a/block.c b/block.c > index 9971976..e611002 100644 > --- a/block.c > +++ b/block.c > @@ -29,7 +29,7 @@ > #include "qemu/error-report.h" > #include "qemu/module.h" > #include "qapi/qmp/qerror.h" > -#include "qapi/qmp/qjson.h" > +#include "qapi/qmp/qobject-json.h" > #include "sysemu/block-backend.h" > #include "sysemu/sysemu.h" > #include "qemu/notify.h" > diff --git a/block/archipelago.c b/block/archipelago.c > index 855655c..80a1bb5 100644 > --- a/block/archipelago.c > +++ b/block/archipelago.c > @@ -56,7 +56,7 @@ > #include "qemu/thread.h" > #include "qapi/qmp/qint.h" > #include "qapi/qmp/qstring.h" > -#include "qapi/qmp/qjson.h" > +#include "qapi/qmp/qobject-json.h" > #include "qemu/atomic.h" > > #include > diff --git a/block/nbd.c b/block/nbd.c > index cd6a587..9009f4f 100644 > --- a/block/nbd.c > +++ b/block/nbd.c > @@ -32,7 +32,7 @@ > #include "qemu/module.h" > #include "qemu/sockets.h" > #include "qapi/qmp/qdict.h" > -#include "qapi/qmp/qjson.h" > +#include "qapi/qmp/qobject-json.h" > #include "qapi/qmp/qint.h" > #include "qapi/qmp/qstring.h" > > diff --git a/block/quorum.c b/block/quorum.c > index d162459..1e3a278 100644 > --- a/block/quorum.c > +++ b/block/quorum.c > @@ -18,7 +18,7 @@ > #include "qapi/qmp/qdict.h" > #include "qapi/qmp/qerror.h" > #include "qapi/qmp/qint.h" > -#include "qapi/qmp/qjson.h" > +#include "qapi/qmp/qobject-json.h" > #include "qapi/qmp/qlist.h" > #include "qapi/qmp/qstring.h" > #include "qapi-event.h" > diff --git a/blockjob.c b/blockjob.c > index 80adb9d..84361f7 100644 > --- a/blockjob.c > +++ b/blockjob.c > @@ -31,7 +31,7 @@ > #include "block/block_int.h" > #include "sysemu/block-backend.h" > #include "qapi/qmp/qerror.h" > -#include "qapi/qmp/qjson.h" > +#include "qapi/qmp/qobject-json.h" > #include "qemu/coroutine.h" > #include "qmp-commands.h" > #include "qemu/timer.h" > diff --git a/hw/core/qdev.c b/hw/core/qdev.c > index b3ad467..a98304d 100644 > --- a/hw/core/qdev.c > +++ b/hw/core/qdev.c > @@ -31,7 +31,7 @@ > #include "qapi/error.h" > #include "qapi/qmp/qerror.h" > #include "qapi/visitor.h" > -#include "qapi/qmp/qjson.h" > +#include "qapi/qmp/qobject-json.h" > #include "qemu/error-
[PATCH 01/11] qapi: Rename qjson.h to qobject-json.h
We have two different JSON visitors in the tree; and having both named 'qjson.h' can cause include confusion. Rename the qapi version. Kill trailing whitespace in the renamed tests/check-qobject-json.c to keep checkpatch.pl happy. Signed-off-by: Eric Blake --- MAINTAINERS | 2 +- balloon.c | 2 +- block.c | 2 +- block/archipelago.c | 2 +- block/nbd.c | 2 +- block/quorum.c| 2 +- blockjob.c| 2 +- hw/core/qdev.c| 2 +- hw/misc/pvpanic.c | 2 +- hw/net/virtio-net.c | 2 +- include/qapi/qmp/{qjson.h => qobject-json.h} | 0 include/qapi/qmp/types.h | 2 +- monitor.c | 2 +- qapi/qmp-event.c | 2 +- qemu-img.c| 2 +- qga/main.c| 2 +- qobject/Makefile.objs | 3 ++- qobject/{qjson.c => qobject-json.c} | 2 +- target-s390x/kvm.c| 2 +- tests/.gitignore | 2 +- tests/Makefile| 8 tests/{check-qjson.c => check-qobject-json.c} | 14 +++--- tests/libqtest.c | 2 +- ui/spice-core.c | 2 +- vl.c | 2 +- 25 files changed, 34 insertions(+), 33 deletions(-) rename include/qapi/qmp/{qjson.h => qobject-json.h} (100%) rename qobject/{qjson.c => qobject-json.c} (99%) rename tests/{check-qjson.c => check-qobject-json.c} (99%) diff --git a/MAINTAINERS b/MAINTAINERS index e8cee1e..c943ff4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1155,7 +1155,7 @@ X: include/qapi/qmp/dispatch.h F: tests/check-qdict.c F: tests/check-qfloat.c F: tests/check-qint.c -F: tests/check-qjson.c +F: tests/check-qobject-json.c F: tests/check-qlist.c F: tests/check-qstring.c T: git git://repo.or.cz/qemu/qmp-unstable.git queue/qmp diff --git a/balloon.c b/balloon.c index 0f45d1b..5983b4f 100644 --- a/balloon.c +++ b/balloon.c @@ -31,7 +31,7 @@ #include "trace.h" #include "qmp-commands.h" #include "qapi/qmp/qerror.h" -#include "qapi/qmp/qjson.h" +#include "qapi/qmp/qobject-json.h" static QEMUBalloonEvent *balloon_event_fn; static QEMUBalloonStatus *balloon_stat_fn; diff --git a/block.c b/block.c index 9971976..e611002 100644 --- a/block.c +++ b/block.c @@ -29,7 +29,7 @@ #include "qemu/error-report.h" #include "qemu/module.h" #include "qapi/qmp/qerror.h" -#include "qapi/qmp/qjson.h" +#include "qapi/qmp/qobject-json.h" #include "sysemu/block-backend.h" #include "sysemu/sysemu.h" #include "qemu/notify.h" diff --git a/block/archipelago.c b/block/archipelago.c index 855655c..80a1bb5 100644 --- a/block/archipelago.c +++ b/block/archipelago.c @@ -56,7 +56,7 @@ #include "qemu/thread.h" #include "qapi/qmp/qint.h" #include "qapi/qmp/qstring.h" -#include "qapi/qmp/qjson.h" +#include "qapi/qmp/qobject-json.h" #include "qemu/atomic.h" #include diff --git a/block/nbd.c b/block/nbd.c index cd6a587..9009f4f 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -32,7 +32,7 @@ #include "qemu/module.h" #include "qemu/sockets.h" #include "qapi/qmp/qdict.h" -#include "qapi/qmp/qjson.h" +#include "qapi/qmp/qobject-json.h" #include "qapi/qmp/qint.h" #include "qapi/qmp/qstring.h" diff --git a/block/quorum.c b/block/quorum.c index d162459..1e3a278 100644 --- a/block/quorum.c +++ b/block/quorum.c @@ -18,7 +18,7 @@ #include "qapi/qmp/qdict.h" #include "qapi/qmp/qerror.h" #include "qapi/qmp/qint.h" -#include "qapi/qmp/qjson.h" +#include "qapi/qmp/qobject-json.h" #include "qapi/qmp/qlist.h" #include "qapi/qmp/qstring.h" #include "qapi-event.h" diff --git a/blockjob.c b/blockjob.c index 80adb9d..84361f7 100644 --- a/blockjob.c +++ b/blockjob.c @@ -31,7 +31,7 @@ #include "block/block_int.h" #include "sysemu/block-backend.h" #include "qapi/qmp/qerror.h" -#include "qapi/qmp/qjson.h" +#include "qapi/qmp/qobject-json.h" #include "qemu/coroutine.h" #include "qmp-commands.h" #include "qemu/timer.h" diff --git a/hw/core/qdev.c b/hw/core/qdev.c index b3ad467..a98304d 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -31,7 +31,7 @@ #include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qapi/visitor.h" -#include "qapi/qmp/qjson.h" +#include "qapi/qmp/qobject-json.h" #include "qemu/error-report.h" #include "hw/hotplug.h" #include "hw/boards.h" diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c index 3709488..2571483 100644 --- a/hw/misc/pvpanic.c +++ b/hw/misc/pvpanic.c @@ -13,7 +13,7 @@ */ #include "qapi/qmp/qobject.h" -#include "qapi/qmp/qjson.h" +#include "qapi/qmp/qobject-json.h" #include "syse