From nobody Mon Feb 9 16:02:07 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1518342532048196.41887472391534; Sun, 11 Feb 2018 01:48:52 -0800 (PST) Received: from localhost ([::1]:40807 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ekoFf-0008WN-7L for importer@patchew.org; Sun, 11 Feb 2018 04:48:51 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54277) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eko3l-0007Bu-Pj for qemu-devel@nongnu.org; Sun, 11 Feb 2018 04:36:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eko3d-0006RY-OW for qemu-devel@nongnu.org; Sun, 11 Feb 2018 04:36:33 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:36023 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eko3d-0006Pm-0i for qemu-devel@nongnu.org; Sun, 11 Feb 2018 04:36:25 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 70821EAEA6; Sun, 11 Feb 2018 09:36:16 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-43.ams2.redhat.com [10.36.116.43]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 25EDF2024CA1; Sun, 11 Feb 2018 09:36:16 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id E5B721138669; Sun, 11 Feb 2018 10:36:07 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Sun, 11 Feb 2018 10:35:56 +0100 Message-Id: <20180211093607.27351-19-armbru@redhat.com> In-Reply-To: <20180211093607.27351-1-armbru@redhat.com> References: <20180211093607.27351-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Sun, 11 Feb 2018 09:36:16 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Sun, 11 Feb 2018 09:36:16 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'armbru@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v2 18/29] qapi: Rename generated qmp-marshal.c to qmp-commands.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: marcandre.lureau@redhat.com, mdroth@linux.vnet.ibm.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" All generated .c are named like their .h, except for qmp-marshal.c and qmp-commands.h. To add to the confusion, tests-qmp-commands.c falsely matches generated test-qmp-commands.h. Get rid of this unnecessary complication. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Michael Roth --- .gitignore | 3 +-- Makefile | 6 +++--- Makefile.objs | 2 +- docs/devel/qapi-code-gen.txt | 6 +++--- qga/Makefile.objs | 2 +- scripts/qapi/commands.py | 2 +- tests/.gitignore | 5 ++--- tests/Makefile.include | 10 +++++----- tests/{test-qmp-commands.c =3D> test-qmp-cmds.c} | 0 9 files changed, 17 insertions(+), 19 deletions(-) rename tests/{test-qmp-commands.c =3D> test-qmp-cmds.c} (100%) diff --git a/.gitignore b/.gitignore index 2f9a92f6cc..7d783e6e66 100644 --- a/.gitignore +++ b/.gitignore @@ -33,9 +33,8 @@ /qapi-visit.[ch] /qapi-event.[ch] /qapi-doc.texi -/qmp-commands.h +/qmp-commands.[ch] /qmp-introspect.[ch] -/qmp-marshal.c /qemu-doc.html /qemu-doc.info /qemu-doc.txt diff --git a/Makefile b/Makefile index bd781c6aad..164a38578e 100644 --- a/Makefile +++ b/Makefile @@ -91,7 +91,7 @@ include $(SRC_PATH)/rules.mak =20 GENERATED_FILES =3D qemu-version.h config-host.h qemu-options.def GENERATED_FILES +=3D qmp-commands.h qapi-types.h qapi-visit.h qapi-event.h -GENERATED_FILES +=3D qmp-marshal.c qapi-types.c qapi-visit.c qapi-event.c +GENERATED_FILES +=3D qmp-commands.c qapi-types.c qapi-visit.c qapi-event.c GENERATED_FILES +=3D qmp-introspect.h GENERATED_FILES +=3D qmp-introspect.c GENERATED_FILES +=3D qapi-doc.texi @@ -496,7 +496,7 @@ $(SRC_PATH)/scripts/qapi-gen.py =20 qga/qapi-generated/qga-qapi-types.c qga/qapi-generated/qga-qapi-types.h \ qga/qapi-generated/qga-qapi-visit.c qga/qapi-generated/qga-qapi-visit.h \ -qga/qapi-generated/qga-qmp-commands.h qga/qapi-generated/qga-qmp-marshal.c= \ +qga/qapi-generated/qga-qmp-commands.h qga/qapi-generated/qga-qmp-commands.= c \ qga/qapi-generated/qga-qapi-doc.texi: \ qga/qapi-generated/qapi-gen-timestamp ; qga/qapi-generated/qapi-gen-timestamp: $(SRC_PATH)/qga/qapi-schema.json $(= qapi-py) @@ -522,7 +522,7 @@ qapi-modules =3D $(SRC_PATH)/qapi-schema.json $(SRC_PAT= H)/qapi/common.json \ =20 qapi-types.c qapi-types.h \ qapi-visit.c qapi-visit.h \ -qmp-commands.h qmp-marshal.c \ +qmp-commands.h qmp-commands.c \ qapi-event.c qapi-event.h \ qmp-introspect.h qmp-introspect.c \ qapi-doc.texi: \ diff --git a/Makefile.objs b/Makefile.objs index 2efba6d768..d255aaf194 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -78,7 +78,7 @@ common-obj-$(CONFIG_FDT) +=3D device_tree.o ###################################################################### # qapi =20 -common-obj-y +=3D qmp-marshal.o +common-obj-y +=3D qmp-commands.o common-obj-y +=3D qmp-introspect.o common-obj-y +=3D qmp.o hmp.o endif diff --git a/docs/devel/qapi-code-gen.txt b/docs/devel/qapi-code-gen.txt index 1a1cbaea7b..ba1dc73298 100644 --- a/docs/devel/qapi-code-gen.txt +++ b/docs/devel/qapi-code-gen.txt @@ -1147,8 +1147,8 @@ declares qmp_COMMAND() that the user must implement. =20 The following files are generated: =20 -$(prefix)qmp-marshal.c: Command marshal/dispatch functions for each - QMP command defined in the schema +$(prefix)qmp-commands.c: Command marshal/dispatch functions for each + QMP command defined in the schema =20 $(prefix)qmp-commands.h: Function prototypes for the QMP commands specified in the schema @@ -1170,7 +1170,7 @@ Example: void qmp_marshal_my_command(QDict *args, QObject **ret, Error **errp); =20 #endif - $ cat qapi-generated/example-qmp-marshal.c + $ cat qapi-generated/example-qmp-commands.c [Uninteresting stuff omitted...] =20 static void qmp_marshal_output_UserDefOne(UserDefOne *ret_in, QObject = **ret_out, Error **errp) diff --git a/qga/Makefile.objs b/qga/Makefile.objs index 1c5986c0bb..6151378ae4 100644 --- a/qga/Makefile.objs +++ b/qga/Makefile.objs @@ -3,6 +3,6 @@ qga-obj-$(CONFIG_POSIX) +=3D commands-posix.o channel-posix= .o qga-obj-$(CONFIG_WIN32) +=3D commands-win32.o channel-win32.o service-win3= 2.o qga-obj-$(CONFIG_WIN32) +=3D vss-win32.o qga-obj-y +=3D qapi-generated/qga-qapi-types.o qapi-generated/qga-qapi-vis= it.o -qga-obj-y +=3D qapi-generated/qga-qmp-marshal.o +qga-obj-y +=3D qapi-generated/qga-qmp-commands.o =20 qga-vss-dll-obj-$(CONFIG_QGA_VSS) +=3D vss-win32/ diff --git a/scripts/qapi/commands.py b/scripts/qapi/commands.py index a744611d58..05fe33a03b 100644 --- a/scripts/qapi/commands.py +++ b/scripts/qapi/commands.py @@ -289,5 +289,5 @@ void %(c_prefix)sqmp_init_marshal(QmpCommandList *cmds); schema.visit(vis) genc.add(vis.defn) genh.add(vis.decl) - genc.write(output_dir, prefix + 'qmp-marshal.c') + genc.write(output_dir, prefix + 'qmp-commands.c') genh.write(output_dir, prefix + 'qmp-commands.h') diff --git a/tests/.gitignore b/tests/.gitignore index e5c744b7ed..2629cfc2f9 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -70,13 +70,12 @@ test-qdist test-qga test-qht test-qht-par -test-qmp-commands -test-qmp-commands.h +test-qmp-cmds +test-qmp-commands.[ch] test-qmp-event test-qobject-input-strict test-qobject-input-visitor test-qmp-introspect.[ch] -test-qmp-marshal.c test-qobject-output-visitor test-rcu-list test-replication diff --git a/tests/Makefile.include b/tests/Makefile.include index b406531b34..9a21ed7ee9 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -61,8 +61,8 @@ check-unit-y +=3D tests/test-clone-visitor$(EXESUF) gcov-files-test-clone-visitor-y =3D qapi/qapi-clone-visitor.c check-unit-y +=3D tests/test-qobject-input-visitor$(EXESUF) gcov-files-test-qobject-input-visitor-y =3D qapi/qobject-input-visitor.c -check-unit-y +=3D tests/test-qmp-commands$(EXESUF) -gcov-files-test-qmp-commands-y =3D qapi/qmp-dispatch.c +check-unit-y +=3D tests/test-qmp-cmds$(EXESUF) +gcov-files-test-qmp-cmds-y =3D qapi/qmp-dispatch.c check-unit-y +=3D tests/test-string-input-visitor$(EXESUF) gcov-files-test-string-input-visitor-y =3D qapi/string-input-visitor.c check-unit-y +=3D tests/test-string-output-visitor$(EXESUF) @@ -576,7 +576,7 @@ test-obj-y =3D tests/check-qnum.o tests/check-qstring.o= tests/check-qdict.o \ tests/test-string-input-visitor.o tests/test-qobject-output-visitor.o \ tests/test-clone-visitor.o \ tests/test-qobject-input-visitor.o \ - tests/test-qmp-commands.o tests/test-visitor-serialization.o \ + tests/test-qmp-cmds.o tests/test-visitor-serialization.o \ tests/test-x86-cpuid.o tests/test-mul64.o tests/test-int128.o \ tests/test-opts-visitor.o tests/test-qmp-event.o \ tests/rcutorture.o tests/test-rcu-list.o \ @@ -656,7 +656,7 @@ tests/test-replication$(EXESUF): tests/test-replication= .o $(test-util-obj-y) \ =20 tests/test-qapi-types.c tests/test-qapi-types.h \ tests/test-qapi-visit.c tests/test-qapi-visit.h \ -tests/test-qmp-commands.h tests/test-qmp-marshal.c \ +tests/test-qmp-commands.h tests/test-qmp-commands.c \ tests/test-qapi-event.c tests/test-qapi-event.h \ tests/test-qmp-introspect.c tests/test-qmp-introspect.h: \ tests/test-qapi-gen-timestamp ; @@ -679,7 +679,7 @@ tests/test-qmp-event$(EXESUF): tests/test-qmp-event.o $= (test-qapi-obj-y) tests/test-qobject-output-visitor$(EXESUF): tests/test-qobject-output-visi= tor.o $(test-qapi-obj-y) tests/test-clone-visitor$(EXESUF): tests/test-clone-visitor.o $(test-qapi-= obj-y) tests/test-qobject-input-visitor$(EXESUF): tests/test-qobject-input-visito= r.o $(test-qapi-obj-y) -tests/test-qmp-commands$(EXESUF): tests/test-qmp-commands.o tests/test-qmp= -marshal.o $(test-qapi-obj-y) +tests/test-qmp-cmds$(EXESUF): tests/test-qmp-cmds.o tests/test-qmp-command= s.o $(test-qapi-obj-y) tests/test-visitor-serialization$(EXESUF): tests/test-visitor-serializatio= n.o $(test-qapi-obj-y) tests/test-opts-visitor$(EXESUF): tests/test-opts-visitor.o $(test-qapi-ob= j-y) =20 diff --git a/tests/test-qmp-commands.c b/tests/test-qmp-cmds.c similarity index 100% rename from tests/test-qmp-commands.c rename to tests/test-qmp-cmds.c --=20 2.13.6