From patchwork Tue Dec 22 00:30:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Blake X-Patchwork-Id: 7899651 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B31A4BEEE5 for ; Tue, 22 Dec 2015 00:31:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 38493205B6 for ; Tue, 22 Dec 2015 00:31:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6AB1F205B3 for ; Tue, 22 Dec 2015 00:31:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752544AbbLVAbV (ORCPT ); Mon, 21 Dec 2015 19:31:21 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55913 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752515AbbLVAbS (ORCPT ); Mon, 21 Dec 2015 19:31:18 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 50DCF8F262; Tue, 22 Dec 2015 00:31:17 +0000 (UTC) Received: from red.redhat.com (ovpn-113-191.phx2.redhat.com [10.3.113.191]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id tBM0VAd8007036; Mon, 21 Dec 2015 19:31:11 -0500 From: Eric Blake To: qemu-devel@nongnu.org Cc: armbru@redhat.com, pbonzini@redhat.com, Kevin Wolf , Chrysostomos Nanakos , Jeff Cody , Alberto Garcia , "Michael S. Tsirkin" , Jason Wang , Luiz Capitulino , Michael Roth , Christian Borntraeger , Cornelia Huck , Alexander Graf , Richard Henderson , Gerd Hoffmann , qemu-block@nongnu.org (open list:Block layer core), kvm@vger.kernel.org (open list:Overall) Subject: [PATCH v2 01/14] qapi: Rename (one) qjson.h to qobject-json.h Date: Mon, 21 Dec 2015 17:30:55 -0700 Message-Id: <1450744268-25052-2-git-send-email-eblake@redhat.com> In-Reply-To: <1450744268-25052-1-git-send-email-eblake@redhat.com> References: <1450744268-25052-1-git-send-email-eblake@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We have two different JSON visitors in the tree; and having both named 'qjson.h' can cause include confusion. Rename the qapi version. Why did I pick that one? A later patch plans on deleting the top-level qjson.c once we have a native JSON output visitor; we could have renamed that one for less overall churn. On the other hand, all of the QObject subtypes have their own qFOO.c file, but qjson.c makes it sound like we have a QTYPE_JSON subclass of QObject; the new name of qobject-json makes it obvious that the file is used for conversions between QObject and JSON, and not a QObject subtype. Kill trailing whitespace in the renamed tests/check-qobject-json.c to keep checkpatch.pl happy. Signed-off-by: Eric Blake Reviewed-by: Paolo Bonzini --- v2: retitle, enhance commit message, rebase to master --- 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 55a0fd8..81fd039 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 411edbf..0b7eb00 100644 --- a/block.c +++ b/block.c @@ -30,7 +30,7 @@ #include "qemu/module.h" #include "qapi/qmp/qerror.h" #include "qapi/qmp/qbool.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 416f42b..ef53083 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 6793f12..a64b40d 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 3447f93..149028d 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 "sysemu/sysemu.h" #include "qemu/log.h" diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index a877614..5988bd1 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -21,7 +21,7 @@ #include "hw/virtio/virtio-net.h" #include "net/vhost_net.h" #include "hw/virtio/virtio-bus.h" -#include "qapi/qmp/qjson.h" +#include "qapi/qmp/qobject-json.h" #include "qapi-event.h" #include "hw/virtio/virtio-access.h" diff --git a/include/qapi/qmp/qjson.h b/include/qapi/qmp/qobject-json.h similarity index 100% rename from include/qapi/qmp/qjson.h rename to include/qapi/qmp/qobject-json.h diff --git a/include/qapi/qmp/types.h b/include/qapi/qmp/types.h index 7782ec5..9109eda 100644 --- a/include/qapi/qmp/types.h +++ b/include/qapi/qmp/types.h @@ -20,6 +20,6 @@ #include "qapi/qmp/qstring.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qlist.h" -#include "qapi/qmp/qjson.h" +#include "qapi/qmp/qobject-json.h" #endif /* QEMU_OBJECTS_H */ diff --git a/monitor.c b/monitor.c index e7e7ae2..1dfd359 100644 --- a/monitor.c +++ b/monitor.c @@ -55,7 +55,7 @@ #include "qapi/qmp/qlist.h" #include "qapi/qmp/qbool.h" #include "qapi/qmp/qstring.h" -#include "qapi/qmp/qjson.h" +#include "qapi/qmp/qobject-json.h" #include "qapi/qmp/json-streamer.h" #include "qapi/qmp/json-parser.h" #include diff --git a/qapi/qmp-event.c b/qapi/qmp-event.c index c0e435f..800b1f3 100644 --- a/qapi/qmp-event.c +++ b/qapi/qmp-event.c @@ -16,7 +16,7 @@ #include "qemu-common.h" #include "qapi/qmp-event.h" #include "qapi/qmp/qstring.h" -#include "qapi/qmp/qjson.h" +#include "qapi/qmp/qobject-json.h" static QMPEventFuncEmit qmp_emit; diff --git a/qemu-img.c b/qemu-img.c index e5c7bae..d9a2c74 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -24,7 +24,7 @@ #include "qapi-visit.h" #include "qapi/qmp-output-visitor.h" #include "qapi/qmp/qerror.h" -#include "qapi/qmp/qjson.h" +#include "qapi/qmp/qobject-json.h" #include "qemu-common.h" #include "qemu/option.h" #include "qemu/error-report.h" diff --git a/qga/main.c b/qga/main.c index f83a97d..3cc0901 100644 --- a/qga/main.c +++ b/qga/main.c @@ -24,7 +24,7 @@ #include "qapi/qmp/json-streamer.h" #include "qapi/qmp/json-parser.h" #include "qapi/qmp/qint.h" -#include "qapi/qmp/qjson.h" +#include "qapi/qmp/qobject-json.h" #include "qga/guest-agent-core.h" #include "qemu/module.h" #include "signal.h" diff --git a/qobject/Makefile.objs b/qobject/Makefile.objs index bed5508..16a48ec 100644 --- a/qobject/Makefile.objs +++ b/qobject/Makefile.objs @@ -1,2 +1,3 @@ util-obj-y = qnull.o qint.o qstring.o qdict.o qlist.o qfloat.o qbool.o -util-obj-y += qjson.o qobject.o json-lexer.o json-streamer.o json-parser.o +util-obj-y += qobject-json.o qobject.o +util-obj-y += json-lexer.o json-streamer.o json-parser.o diff --git a/qobject/qjson.c b/qobject/qobject-json.c similarity index 99% rename from qobject/qjson.c rename to qobject/qobject-json.c index 41d9d65..8fc65a4 100644 --- a/qobject/qjson.c +++ b/qobject/qobject-json.c @@ -14,7 +14,7 @@ #include "qapi/qmp/json-lexer.h" #include "qapi/qmp/json-parser.h" #include "qapi/qmp/json-streamer.h" -#include "qapi/qmp/qjson.h" +#include "qapi/qmp/qobject-json.h" #include "qapi/qmp/qint.h" #include "qapi/qmp/qlist.h" #include "qapi/qmp/qbool.h" diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index 75a0e5d..40dd729 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -36,7 +36,7 @@ #include "hw/hw.h" #include "cpu.h" #include "sysemu/device_tree.h" -#include "qapi/qmp/qjson.h" +#include "qapi/qmp/qobject-json.h" #include "exec/gdbstub.h" #include "exec/address-spaces.h" #include "trace.h" diff --git a/tests/.gitignore b/tests/.gitignore index 787c95c..39bcdc0 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -1,8 +1,8 @@ check-qdict check-qfloat check-qint -check-qjson check-qlist +check-qobject-json check-qstring check-qom-interface check-qom-proplist diff --git a/tests/Makefile b/tests/Makefile index 7d2a0d3..1765d16 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -16,8 +16,8 @@ check-unit-y += tests/check-qstring$(EXESUF) gcov-files-check-qstring-y = qobject/qstring.c check-unit-y += tests/check-qlist$(EXESUF) gcov-files-check-qlist-y = qobject/qlist.c -check-unit-y += tests/check-qjson$(EXESUF) -gcov-files-check-qjson-y = qobject/qjson.c +check-unit-y += tests/check-qobject-json$(EXESUF) +gcov-files-check-qobject-json-y = qobject/qobject-json.c check-unit-y += tests/test-qmp-output-visitor$(EXESUF) gcov-files-test-qmp-output-visitor-y = qapi/qmp-output-visitor.c check-unit-y += tests/test-qmp-input-visitor$(EXESUF) @@ -368,7 +368,7 @@ GENERATED_HEADERS += tests/test-qapi-types.h tests/test-qapi-visit.h \ tests/test-qmp-introspect.h test-obj-y = tests/check-qint.o tests/check-qstring.o tests/check-qdict.o \ - tests/check-qlist.o tests/check-qfloat.o tests/check-qjson.o \ + tests/check-qlist.o tests/check-qfloat.o tests/check-qobject-json.o \ tests/test-coroutine.o tests/test-string-output-visitor.o \ tests/test-string-input-visitor.o tests/test-qmp-output-visitor.o \ tests/test-qmp-input-visitor.o tests/test-qmp-input-strict.o \ @@ -396,7 +396,7 @@ tests/check-qstring$(EXESUF): tests/check-qstring.o $(test-util-obj-y) tests/check-qdict$(EXESUF): tests/check-qdict.o $(test-util-obj-y) tests/check-qlist$(EXESUF): tests/check-qlist.o $(test-util-obj-y) tests/check-qfloat$(EXESUF): tests/check-qfloat.o $(test-util-obj-y) -tests/check-qjson$(EXESUF): tests/check-qjson.o $(test-util-obj-y) +tests/check-qobject-json$(EXESUF): tests/check-qobject-json.o $(test-util-obj-y) tests/check-qom-interface$(EXESUF): tests/check-qom-interface.o $(test-qom-obj-y) tests/check-qom-proplist$(EXESUF): tests/check-qom-proplist.o $(test-qom-obj-y) tests/test-coroutine$(EXESUF): tests/test-coroutine.o $(test-block-obj-y) diff --git a/tests/check-qjson.c b/tests/check-qobject-json.c similarity index 99% rename from tests/check-qjson.c rename to tests/check-qobject-json.c index 61e9bfb..9c4e53a 100644 --- a/tests/check-qjson.c +++ b/tests/check-qobject-json.c @@ -18,7 +18,7 @@ #include "qapi/qmp/qlist.h" #include "qapi/qmp/qfloat.h" #include "qapi/qmp/qbool.h" -#include "qapi/qmp/qjson.h" +#include "qapi/qmp/qobject-json.h" #include "qemu-common.h" @@ -63,7 +63,7 @@ static void escaped_string(void) g_assert(obj != NULL); g_assert(qobject_type(obj) == QTYPE_QSTRING); - + str = qobject_to_qstring(obj); g_assert_cmpstr(qstring_get_str(str), ==, test_cases[i].decoded); @@ -98,7 +98,7 @@ static void simple_string(void) g_assert(obj != NULL); g_assert(qobject_type(obj) == QTYPE_QSTRING); - + str = qobject_to_qstring(obj); g_assert(strcmp(qstring_get_str(str), test_cases[i].decoded) == 0); @@ -106,7 +106,7 @@ static void simple_string(void) g_assert(strcmp(qstring_get_str(str), test_cases[i].encoded) == 0); qobject_decref(obj); - + QDECREF(str); } } @@ -132,7 +132,7 @@ static void single_quote_string(void) g_assert(obj != NULL); g_assert(qobject_type(obj) == QTYPE_QSTRING); - + str = qobject_to_qstring(obj); g_assert(strcmp(qstring_get_str(str), test_cases[i].decoded) == 0); @@ -880,7 +880,7 @@ static void vararg_string(void) g_assert(obj != NULL); g_assert(qobject_type(obj) == QTYPE_QSTRING); - + str = qobject_to_qstring(obj); g_assert(strcmp(qstring_get_str(str), test_cases[i].decoded) == 0); @@ -1144,7 +1144,7 @@ static int compare_litqobj_to_qobj(LiteralQObject *lhs, QObject *rhs) helper.index = 0; helper.objs = lhs->value.qlist; helper.result = 1; - + qlist_iter(qobject_to_qlist(rhs), compare_helper, &helper); return helper.result; diff --git a/tests/libqtest.c b/tests/libqtest.c index fa314e1..149eb4c 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -32,7 +32,7 @@ #include "qemu/osdep.h" #include "qapi/qmp/json-parser.h" #include "qapi/qmp/json-streamer.h" -#include "qapi/qmp/qjson.h" +#include "qapi/qmp/qobject-json.h" #define MAX_IRQ 256 #define SOCKET_TIMEOUT 5 diff --git a/ui/spice-core.c b/ui/spice-core.c index 6a62d71..ceb18ae 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -32,7 +32,7 @@ #include "qapi/qmp/qint.h" #include "qapi/qmp/qbool.h" #include "qapi/qmp/qstring.h" -#include "qapi/qmp/qjson.h" +#include "qapi/qmp/qobject-json.h" #include "qemu/notify.h" #include "migration/migration.h" #include "hw/hw.h" diff --git a/vl.c b/vl.c index 200f3d5..29737f7 100644 --- a/vl.c +++ b/vl.c @@ -92,7 +92,7 @@ int main(int argc, char **argv) #include "audio/audio.h" #include "migration/migration.h" #include "sysemu/kvm.h" -#include "qapi/qmp/qjson.h" +#include "qapi/qmp/qobject-json.h" #include "qemu/option.h" #include "qemu/config-file.h" #include "qemu-options.h"