From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42057) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDXnW-0007NH-Ot for qemu-devel@nongnu.org; Thu, 16 Jun 2016 09:57:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bDXnV-0005oe-Dp for qemu-devel@nongnu.org; Thu, 16 Jun 2016 09:57:30 -0400 References: <1466016055-31351-1-git-send-email-clord@redhat.com> <1466016055-31351-2-git-send-email-clord@redhat.com> <20160616045939.GB12178@ad.usersys.redhat.com> From: Colin Lord Message-ID: <8cb1eec8-a583-9cdc-068c-d015fe58abcb@redhat.com> Date: Thu, 16 Jun 2016 09:57:20 -0400 MIME-Version: 1.0 In-Reply-To: <20160616045939.GB12178@ad.usersys.redhat.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 1/2] blockdev: Add dynamic generation of module_block.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Fam Zheng Cc: kwolf@redhat.com, markmb@redhat.com, qemu-devel@nongnu.org, qemu-block@nongnu.org, mreitz@redhat.com On 06/16/2016 12:59 AM, Fam Zheng wrote: > On Wed, 06/15 14:40, Colin Lord wrote: >> From: Marc Mari >> >> To simplify the addition of new block modules, add a script that gener= ates >> include/qemu/module_block.h automatically from the modules' source cod= e. >> >> This script assumes that the QEMU coding style rules are followed. >> >> Signed-off-by: Marc Mar=ED >> Signed-off-by: Colin Lord >> --- >> .gitignore | 1 + >> Makefile | 8 +++ >> scripts/modules/module_block.py | 134 +++++++++++++++++++++++++++++++= +++++++++ >> 3 files changed, 143 insertions(+) >> create mode 100644 scripts/modules/module_block.py >> >> diff --git a/.gitignore b/.gitignore >> index 38ee1c5..06aa064 100644 >> --- a/.gitignore >> +++ b/.gitignore >> @@ -110,3 +110,4 @@ tags >> TAGS >> docker-src.* >> *~ >> +/include/qemu/module_block.h >> diff --git a/Makefile b/Makefile >> index ed4032a..8f8b6a2 100644 >> --- a/Makefile >> +++ b/Makefile >> @@ -76,6 +76,8 @@ GENERATED_HEADERS +=3D trace/generated-ust-provider.= h >> GENERATED_SOURCES +=3D trace/generated-ust.c >> endif >> =20 >> +GENERATED_HEADERS +=3D include/qemu/module_block.h >> + >> # Don't try to regenerate Makefile or configure >> # We don't generate any of them >> Makefile: ; >> @@ -352,6 +354,12 @@ ivshmem-client$(EXESUF): $(ivshmem-client-obj-y) = libqemuutil.a libqemustub.a >> ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) libqemuutil.a libqem= ustub.a >> $(call LINK, $^) >> =20 >> +include/qemu/module_block.h: $(SRC_PATH)/scripts/modules/module_block= .py config-host.mak >> + $(call quiet-command,$(PYTHON) \ >> +$(SRC_PATH)/scripts/modules/module_block.py \ >> + $(SRC_PATH)/"./include/qemu/" $(addprefix $(SRC_PATH)/,$(patsubst %.= mo,%.c,$(block-obj-m))), \ >> + " GEN $@") >> + >> clean: >> # avoid old build problems by removing potentially incorrect old file= s >> rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm= .h gen-op-arm.h >> diff --git a/scripts/modules/module_block.py b/scripts/modules/module_= block.py >> new file mode 100644 >> index 0000000..005bc49 >> --- /dev/null >> +++ b/scripts/modules/module_block.py >> @@ -0,0 +1,134 @@ >> +#!/usr/bin/python >> +# >> +# Module information generator >> +# >> +# Copyright Red Hat, Inc. 2015 >> +# >> +# Authors: >> +# Marc Mari >=20 > Address hidden seems like a mistake during copy from web. :) >=20 > One more below.. >=20 Yep, I didn't have the original emails (only the web archives) and I didn't realize it wasn't supposed to look like that until I sent it out. I'll fix it for the next version. >> +# >> +# This work is licensed under the terms of the GNU GPL, version 2. >> +# See the COPYING file in the top-level directory. >> + >> +from __future__ import print_function >> +import sys >> +import os >> + >> +def get_string_struct(line): >> + data =3D line.split() >> + >> + # data[0] -> struct element name >> + # data[1] -> =3D >> + # data[2] -> value >> + >> + return data[2].replace('"', '')[:-1] >> + >> +def add_module(fhader, library, format_name, protocol_name, >> + probe, probe_device): >> + lines =3D [] >> + lines.append('.library_name =3D "' + library + '",') >> + if format_name !=3D "": >> + lines.append('.format_name =3D "' + format_name + '",') >> + if protocol_name !=3D "": >> + lines.append('.protocol_name =3D "' + protocol_name + '",') >> + if probe: >> + lines.append('.has_probe =3D true,') >> + if probe_device: >> + lines.append('.has_probe_device =3D true,') >> + >> + text =3D '\n\t'.join(lines) >> + fheader.write('\n\t{\n\t' + text + '\n\t},') >> + >> +def process_file(fheader, filename): >> + # This parser assumes the coding style rules are being followed >> + with open(filename, "r") as cfile: >> + found_something =3D False >> + found_start =3D False >> + library, _ =3D os.path.splitext(os.path.basename(filename)) >> + for line in cfile: >> + if found_start: >> + line =3D line.replace('\n', '') >> + if line.find(".format_name") !=3D -1: >> + format_name =3D get_string_struct(line) >> + elif line.find(".protocol_name") !=3D -1: >> + protocol_name =3D get_string_struct(line) >> + elif line.find(".bdrv_probe") !=3D -1: >> + probe =3D True >> + elif line.find(".bdrv_probe_device") !=3D -1: >> + probe_device =3D True >> + elif line =3D=3D "};": >> + add_module(fheader, library, format_name, protoco= l_name, >> + probe, probe_device) >> + found_start =3D False >> + elif line.find("static BlockDriver") !=3D -1: >> + found_something =3D True >> + found_start =3D True >> + format_name =3D "" >> + protocol_name =3D "" >> + probe =3D False >> + probe_device =3D False >> + >> + if not found_something: >> + print("No BlockDriver struct found in " + filename + ". \ >> + Is this really a module?", file=3Dsys.stderr) >> + sys.exit(1) >> + >> +def print_top(fheader): >> + fheader.write('''/* AUTOMATICALLY GENERATED, DO NOT MODIFY */ >> +/* >> + * QEMU Block Module Infrastructure >> + * >> + * Copyright Red Hat, Inc. 2015 >> + * >> + * Authors: >> + * Marc Mari >=20 > Here! >=20 >> + * >> + * This work is licensed under the terms of the GNU GPL, version 2. = See >> + * the COPYING file in the top-level directory. >> + * >> + */ >> + >> +''') >> + >> + fheader.write('''#ifndef QEMU_MODULE_BLOCK_H >> +#define QEMU_MODULE_BLOCK_H >> + >> +#include "qemu-common.h" >> + >> +static const struct { >> + const char *format_name; >> + const char *protocol_name; >> + const char *library_name; >> + bool has_probe; >> + bool has_probe_device; >> +} block_driver_modules[] =3D {''') >> + >> +def print_bottom(fheader): >> + fheader.write(''' >> +}; >> + >> +#endif >> +''') >> + >> +# First argument: output folder >> +# All other arguments: modules source files (.c) >> +output_dir =3D sys.argv[1] >> +if not os.path.isdir(output_dir): >> + print("Folder " + output_dir + " does not exist", file=3Dsys.stde= rr) >> + sys.exit(1) >> + >> +path =3D output_dir + 'module_block.h' >> + >> +with open(path, 'w') as fheader: >> + print_top(fheader) >> + >> + for filename in sys.argv[2:]: >> + if os.path.isfile(filename): >> + process_file(fheader, filename) >> + else: >> + print("File " + filename + " does not exist.", file=3Dsys= .stderr) >> + sys.exit(1) >> + >> + print_bottom(fheader) >> + >> +sys.exit(0) >> --=20 >> 2.5.5 >> >> >=20 Colin