From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39216) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YtAvW-0005pR-H3 for qemu-devel@nongnu.org; Fri, 15 May 2015 04:25:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YtAvU-0004YF-Lh for qemu-devel@nongnu.org; Fri, 15 May 2015 04:25:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49950) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YtAvU-0004Xj-B5 for qemu-devel@nongnu.org; Fri, 15 May 2015 04:25:00 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t4F8OxX0029179 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Fri, 15 May 2015 04:24:59 -0400 Received: from blackfin.pond.sub.org (ovpn-116-59.ams2.redhat.com [10.36.116.59]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t4F8Ov0x024540 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Fri, 15 May 2015 04:24:59 -0400 From: Markus Armbruster Date: Fri, 15 May 2015 10:24:45 +0200 Message-Id: <1431678292-17692-20-git-send-email-armbru@redhat.com> In-Reply-To: <1431678292-17692-1-git-send-email-armbru@redhat.com> References: <1431678292-17692-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PULL 19/26] qapi: qapi-event.py option -b does nothing, drop it List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- Makefile | 2 +- scripts/qapi-event.py | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index f032158..bfa5dab 100644 --- a/Makefile +++ b/Makefile @@ -273,7 +273,7 @@ $(qapi-modules) $(SRC_PATH)/scripts/qapi-visit.py $(qapi-py) qapi-event.c qapi-event.h :\ $(qapi-modules) $(SRC_PATH)/scripts/qapi-event.py $(qapi-py) $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-event.py \ - $(gen-out-type) -o "." -b -i $<, \ + $(gen-out-type) -o "." -i $<, \ " GEN $@") qmp-commands.h qmp-marshal.c :\ $(qapi-modules) $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py) diff --git a/scripts/qapi-event.py b/scripts/qapi-event.py index a7e0033..3e1f4cf 100644 --- a/scripts/qapi-event.py +++ b/scripts/qapi-event.py @@ -220,8 +220,8 @@ const char *%(event_enum_name)s_lookup[] = { # Start the real job try: - opts, args = getopt.gnu_getopt(sys.argv[1:], "chbp:i:o:", - ["source", "header", "builtins", "prefix=", + opts, args = getopt.gnu_getopt(sys.argv[1:], "chp:i:o:", + ["source", "header", "prefix=", "input-file=", "output-dir="]) except getopt.GetoptError, err: print str(err) @@ -235,7 +235,6 @@ h_file = 'qapi-event.h' do_c = False do_h = False -do_builtins = False for o, a in opts: if o in ("-p", "--prefix"): @@ -248,8 +247,6 @@ for o, a in opts: do_c = True elif o in ("-h", "--header"): do_h = True - elif o in ("-b", "--builtins"): - do_builtins = True if not do_c and not do_h: do_c = True -- 1.9.3