From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59650) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1elMiX-0000SL-Da for qemu-devel@nongnu.org; Mon, 12 Feb 2018 17:36:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1elMiV-0008W1-Bi for qemu-devel@nongnu.org; Mon, 12 Feb 2018 17:36:57 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:43532 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 1elMiV-0008Vh-5l for qemu-devel@nongnu.org; Mon, 12 Feb 2018 17:36:55 -0500 References: <20180211093607.27351-1-armbru@redhat.com> <20180211093607.27351-28-armbru@redhat.com> From: Eric Blake Message-ID: Date: Mon, 12 Feb 2018 16:36:38 -0600 MIME-Version: 1.0 In-Reply-To: <20180211093607.27351-28-armbru@redhat.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 27/29] qapi: Move qapi-schema.json to qapi/, rename generated files List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster , qemu-devel@nongnu.org Cc: mdroth@linux.vnet.ibm.com, marcandre.lureau@redhat.com On 02/11/2018 03:36 AM, Markus Armbruster wrote: > Move qapi-schema.json to qapi/, so it's next to its modules, and all > files get generated to qapi/, not just the ones generated for modules. > > Consistently name the generated files qapi-MODULE.EXT: > qmp-commands.[ch] become qapi-commands.[ch], qapi-event.[ch] become > qapi-events.[ch], and qmp-introspect.[ch] become qapi-introspect.[ch]. > This gets rid of the temporary hacks in scripts/qapi/commands.py and > scripts/qapi/events.py. Ah, so my parallel series that proposed naming the file qapi/qmp-schema.qapi gets interesting, with your patch favoring the qapi- naming everywhere. I'll have to think about how much (or little) of my series to rebase on top of this (I like my notion of renaming to the .qapi suffix, though, as we really are using files that aren't JSON, but only resemble it). > > Signed-off-by: Markus Armbruster > --- > +++ b/.gitignore > @@ -29,8 +29,8 @@ > /qga/qapi-generated > /qapi-generated > /qapi-gen-timestamp > -/qapi-builtin-types.[ch] > -/qapi-builtin-visit.[ch] > +/qapi/qapi-builtin-types.[ch] > +/qapi/qapi-builtin-visit.[ch] Might be some interesting churn if you like my idea of using globs for easier maintenance of this file. > +++ b/tpm.c > @@ -182,7 +182,6 @@ int tpm_config_parse(QemuOptsList *opts_list, const char *optarg) > > /* > * Walk the list of active TPM backends and collect information about them > - * following the schema description in qapi-schema.json. > */ Should the overall comment keep the trailing '.'? Reviewed-by: Eric Blake -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org