From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:57679) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1StnMw-0003gs-C6 for qemu-devel@nongnu.org; Tue, 24 Jul 2012 18:14:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1StnMu-0004Zx-To for qemu-devel@nongnu.org; Tue, 24 Jul 2012 18:14:18 -0400 Received: from e5.ny.us.ibm.com ([32.97.182.145]:44336) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1StnMu-0004Zo-PG for qemu-devel@nongnu.org; Tue, 24 Jul 2012 18:14:16 -0400 Received: from /spool/local by e5.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 24 Jul 2012 18:14:12 -0400 Received: from d01relay06.pok.ibm.com (d01relay06.pok.ibm.com [9.56.227.116]) by d01dlp01.pok.ibm.com (Postfix) with ESMTP id 15A6338C803A for ; Tue, 24 Jul 2012 18:13:32 -0400 (EDT) Received: from d01av03.pok.ibm.com (d01av03.pok.ibm.com [9.56.224.217]) by d01relay06.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q6OMDVAu20709396 for ; Tue, 24 Jul 2012 18:13:31 -0400 Received: from d01av03.pok.ibm.com (loopback [127.0.0.1]) by d01av03.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q6OMDUjL028070 for ; Tue, 24 Jul 2012 19:13:31 -0300 From: Anthony Liguori In-Reply-To: <1343150454-4677-5-git-send-email-mdroth@linux.vnet.ibm.com> References: <1343150454-4677-1-git-send-email-mdroth@linux.vnet.ibm.com> <1343150454-4677-5-git-send-email-mdroth@linux.vnet.ibm.com> Date: Tue, 24 Jul 2012 17:13:27 -0500 Message-ID: <87a9yolse0.fsf@codemonkey.ws> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Subject: Re: [Qemu-devel] [PATCH 04/22] qapi: qapi_visit.py, make code useable as module List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Michael Roth , qemu-devel@nongnu.org Cc: quintela@redhat.com, owasserm@redhat.com, yamahata@valinux.co.jp, pbonzini@redhat.com, akong@redhat.com, afaerber@suse.de Michael Roth writes: Reviewed-by: Anthony Liguori Regards, Anthony Liguori > Signed-off-by: Michael Roth > --- > scripts/qapi_visit.py | 143 +++++++++++++++++++++++++------------------------ > 1 file changed, 74 insertions(+), 69 deletions(-) > > diff --git a/scripts/qapi_visit.py b/scripts/qapi_visit.py > index 04ef7c4..25707f5 100644 > --- a/scripts/qapi_visit.py > +++ b/scripts/qapi_visit.py > @@ -224,55 +224,57 @@ void visit_type_%(name)s(Visitor *m, %(name)s * obj, const char *name, Error **e > ''', > name=name) > > -try: > - opts, args = getopt.gnu_getopt(sys.argv[1:], "chp:o:", > - ["source", "header", "prefix=", "output-dir="]) > -except getopt.GetoptError, err: > - print str(err) > - sys.exit(1) > - > -output_dir = "" > -prefix = "" > -c_file = 'qapi-visit.c' > -h_file = 'qapi-visit.h' > - > -do_c = False > -do_h = False > - > -for o, a in opts: > - if o in ("-p", "--prefix"): > - prefix = a > - elif o in ("-o", "--output-dir"): > - output_dir = a + "/" > - elif o in ("-c", "--source"): > +def main(argv=[]): > + try: > + opts, args = getopt.gnu_getopt(sys.argv[1:], "chp:o:", > + ["source", "header", "prefix=", > + "output-dir="]) > + except getopt.GetoptError, err: > + print str(err) > + sys.exit(1) > + > + output_dir = "" > + prefix = "" > + c_file = 'qapi-visit.c' > + h_file = 'qapi-visit.h' > + > + do_c = False > + do_h = False > + > + for o, a in opts: > + if o in ("-p", "--prefix"): > + prefix = a > + elif o in ("-o", "--output-dir"): > + output_dir = a + "/" > + elif o in ("-c", "--source"): > + do_c = True > + elif o in ("-h", "--header"): > + do_h = True > + > + if not do_c and not do_h: > do_c = True > - elif o in ("-h", "--header"): > do_h = True > > -if not do_c and not do_h: > - do_c = True > - do_h = True > + c_file = output_dir + prefix + c_file > + h_file = output_dir + prefix + h_file > > -c_file = output_dir + prefix + c_file > -h_file = output_dir + prefix + h_file > + try: > + os.makedirs(output_dir) > + except os.error, e: > + if e.errno != errno.EEXIST: > + raise > > -try: > - os.makedirs(output_dir) > -except os.error, e: > - if e.errno != errno.EEXIST: > - raise > - > -def maybe_open(really, name, opt): > - if really: > - return open(name, opt) > - else: > - import StringIO > - return StringIO.StringIO() > + def maybe_open(really, name, opt): > + if really: > + return open(name, opt) > + else: > + import StringIO > + return StringIO.StringIO() > > -fdef = maybe_open(do_c, c_file, 'w') > -fdecl = maybe_open(do_h, h_file, 'w') > + fdef = maybe_open(do_c, c_file, 'w') > + fdecl = maybe_open(do_h, h_file, 'w') > > -fdef.write(mcgen(''' > + fdef.write(mcgen(''' > /* THIS FILE IS AUTOMATICALLY GENERATED, DO NOT MODIFY */ > > /* > @@ -292,7 +294,7 @@ fdef.write(mcgen(''' > ''', > header=basename(h_file))) > > -fdecl.write(mcgen(''' > + fdecl.write(mcgen(''' > /* THIS FILE IS AUTOMATICALLY GENERATED, DO NOT MODIFY */ > > /* > @@ -316,37 +318,40 @@ fdecl.write(mcgen(''' > ''', > prefix=prefix, guard=guardname(h_file))) > > -exprs = parse_schema(sys.stdin) > + exprs = parse_schema(sys.stdin) > > -for expr in exprs: > - if expr.has_key('type'): > - ret = generate_visit_struct(expr['type'], expr['data']) > - ret += generate_visit_list(expr['type'], expr['data']) > - fdef.write(ret) > + for expr in exprs: > + if expr.has_key('type'): > + ret = generate_visit_struct(expr['type'], expr['data']) > + ret += generate_visit_list(expr['type'], expr['data']) > + fdef.write(ret) > > - ret = generate_declaration(expr['type'], expr['data']) > - fdecl.write(ret) > - elif expr.has_key('union'): > - ret = generate_visit_union(expr['union'], expr['data']) > - ret += generate_visit_list(expr['union'], expr['data']) > - fdef.write(ret) > + ret = generate_declaration(expr['type'], expr['data']) > + fdecl.write(ret) > + elif expr.has_key('union'): > + ret = generate_visit_union(expr['union'], expr['data']) > + ret += generate_visit_list(expr['union'], expr['data']) > + fdef.write(ret) > > - ret = generate_decl_enum('%sKind' % expr['union'], expr['data'].keys()) > - ret += generate_declaration(expr['union'], expr['data']) > - fdecl.write(ret) > - elif expr.has_key('enum'): > - ret = generate_visit_enum(expr['enum'], expr['data']) > - fdef.write(ret) > + ret = generate_decl_enum('%sKind' % expr['union'], expr['data'].keys()) > + ret += generate_declaration(expr['union'], expr['data']) > + fdecl.write(ret) > + elif expr.has_key('enum'): > + ret = generate_visit_enum(expr['enum'], expr['data']) > + fdef.write(ret) > > - ret = generate_decl_enum(expr['enum'], expr['data']) > - fdecl.write(ret) > + ret = generate_decl_enum(expr['enum'], expr['data']) > + fdecl.write(ret) > > -fdecl.write(''' > + fdecl.write(''' > #endif > -''') > + ''') > + > + fdecl.flush() > + fdecl.close() > > -fdecl.flush() > -fdecl.close() > + fdef.flush() > + fdef.close() > > -fdef.flush() > -fdef.close() > +if __name__ == '__main__': > + sys.exit(main(sys.argv)) > -- > 1.7.9.5