From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36519) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZRFUd-0002PB-On for qemu-devel@nongnu.org; Mon, 17 Aug 2015 04:10:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZRFUc-000054-5z for qemu-devel@nongnu.org; Mon, 17 Aug 2015 04:10:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35835) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZRFUb-0008VL-Ve for qemu-devel@nongnu.org; Mon, 17 Aug 2015 04:10:06 -0400 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 AEB799D782 for ; Mon, 17 Aug 2015 08:10:05 +0000 (UTC) From: =?UTF-8?q?Marc=20Mar=C3=AD?= Date: Mon, 17 Aug 2015 10:09:35 +0200 Message-Id: <1439798975-2488-3-git-send-email-markmb@redhat.com> In-Reply-To: <1439798975-2488-1-git-send-email-markmb@redhat.com> References: <1439798975-2488-1-git-send-email-markmb@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 2/2] Add dynamic generation of module_block.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel Cc: =?UTF-8?q?Marc=20Mar=C3=AD?= To simplify the addition of new block modules, add a script that generate= s include/qemu/module_block.h automatically from the modules' source code. This script assumes that the QEMU coding style rules are followed. Signed-off-by: Marc Mar=C3=AD --- .gitignore | 1 + Makefile | 10 ++- scripts/modules/module_block.py | 132 ++++++++++++++++++++++++++++++++++= ++++++ 3 files changed, 140 insertions(+), 3 deletions(-) create mode 100755 scripts/modules/module_block.py diff --git a/.gitignore b/.gitignore index 61bc492..8a37067 100644 --- a/.gitignore +++ b/.gitignore @@ -105,3 +105,4 @@ cscope.* tags TAGS *~ +/include/qemu/module_block.h diff --git a/Makefile b/Makefile index 340d9c8..47d593e 100644 --- a/Makefile +++ b/Makefile @@ -73,6 +73,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: ; @@ -219,9 +221,6 @@ Makefile: $(version-obj-y) $(version-lobj-y) libqemustub.a: $(stub-obj-y) libqemuutil.a: $(util-obj-y) =20 -block-modules =3D $(foreach o,$(block-obj-m),"$(basename $(subst /,-,$o)= )",) NULL -util/module.o-cflags =3D -D'CONFIG_BLOCK_MODULES=3D$(block-modules)' - ###################################################################### =20 qemu-img.o: qemu-img-cmds.h @@ -313,6 +312,11 @@ msi: @echo MSI build not configured or dependency resolution failed (reconfi= gure with --enable-guest-agent-msi option) endif =20 +include/qemu/module_block.h: $(SRC_PATH)/scripts/modules/module_block.py + $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/modules/module_block= .py \ + "./include/qemu/" $(patsubst %.mo,%.c,$(block-obj-m)), \ + " GEN $@") + clean: # avoid old build problems by removing potentially incorrect old files 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_blo= ck.py new file mode 100755 index 0000000..a9a9412 --- /dev/null +++ b/scripts/modules/module_block.py @@ -0,0 +1,132 @@ +#!/usr/bin/python +# +# Module information generator +# +# Copyright Red Hat, Inc. 2015 +# +# Authors: +# Marc Mari +# +# This work is licensed under the terms of the GNU GPL, version 2. +# See the COPYING file in the top-level directory. + +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, protocol_n= ame, + 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?") + 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 + * + * 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_module[] =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") + 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.") + sys.exit(1) + + print_bottom(fheader) + +sys.exit(0) --=20 2.4.3