qapi: qapi-event.py option -b does nothing, drop it

Signed-off-by: Markus Armbruster <[email protected]>
Reviewed-by: Eric Blake <[email protected]>

diff --git a/Makefile b/Makefile
index f032158645a92ce1fe382f3f1577b099c9838c51..bfa5dab4cdaaa44dbe4f41b1a88db24fb9dcf776 100644 (file)
--- 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 \
 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)
                "  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 a7e0033cc1b32bb1d19e97a013f0d5498f3682a7..3e1f4cf0fd6317e88146f55a14f9af446567a250 100644 (file)
--- 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:
 # 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)
                                     "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_c = False
 do_h = False

-do_builtins = False

 
 for o, a in opts:
     if o in ("-p", "--prefix"):
 
 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
         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
 
 if not do_c and not do_h:
     do_c = True