From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39688) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZZZwn-0007Lt-IJ for qemu-devel@nongnu.org; Wed, 09 Sep 2015 03:37:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZZZwi-00048A-DC for qemu-devel@nongnu.org; Wed, 09 Sep 2015 03:37:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37855) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZZZwi-00047q-4b for qemu-devel@nongnu.org; Wed, 09 Sep 2015 03:37:32 -0400 Date: Wed, 9 Sep 2015 09:37:24 +0200 From: Marc =?UTF-8?B?TWFyw60=?= Message-ID: <20150909093724.2297b4d2@markmb_rh> In-Reply-To: <20150909022713.GC21097@ad.nay.redhat.com> References: <1441720402-1778-1-git-send-email-markmb@redhat.com> <1441720402-1778-3-git-send-email-markmb@redhat.com> <20150909022713.GC21097@ad.nay.redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v2 2/2] Add dynamic generation of module_block.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Fam Zheng Cc: Stefan Hajnoczi , Michael Tokarev , qemu-devel@nongnu.org, Peter Maydell On Wed, 9 Sep 2015 10:27:13 +0800 Fam Zheng wrote: > On Tue, 09/08 15:53, Marc Mar=C3=AD wrote: > > diff --git a/include/qemu/module_block.h > > b/include/qemu/module_block.h deleted file mode 100644 > > index d725db8..0000000 > > --- a/include/qemu/module_block.h > > +++ /dev/null > > @@ -1,90 +0,0 @@ > > -/* 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. > > - * > > - */ > > - >=20 > Could you reorder the patches so you don't need to add them remove the > generated header? >=20 > > diff --git a/scripts/modules/module_block.py > > b/scripts/modules/module_block.py new file mode 100755 > > index 0000000..0846362 > > --- /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 > > +# > > +# 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, > > protocol_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 > > + * > > + * 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.stderr) > > + 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 > If we decide to parse c sources, I really want the parser as simple as > possible, while keeping the syntax explicit: >=20 > in block_int.h: >=20 > /* In order to allow dynamical loading, block modules should > specify which > * protocols and formats are supported with one or more of > following > * macros, which are parsed by code generator to create mappings > from > * format or protocol name to module name. > */ > #define BLOCK_PROTOCOL_MODULE(protocol, has_probe) > #define BLOCK_FORMAT_MODULE(format, has_probe) >=20 > in curl.c: > BLOCK_PROTOCOL_MODULE(http, false) > BLOCK_PROTOCOL_MODULE(https, false) > BLOCK_PROTOCOL_MODULE(ftp, false) > BLOCK_PROTOCOL_MODULE(ftps, false) > BLOCK_PROTOCOL_MODULE(tftp, false) >=20 > in dmg.c: > BLOCK_FORMAT_MODULE(dmg, true) >=20 > In generator.py, you can grep for "BLOCK_PROTOCOL_MODULE(*)" and > "BLOCK_FORMAT_MODULE(*)". >=20 Yes, that makes it simpler. The only drawback I see is that all drivers that want to be converted into modules will have to be touched, and the information from the struct duplicated. It is not a big drawback because this will make the parser really simple. Thanks Marc