Fix qapi code generation fix
The fixes to qapi code generation had multiple bugs:
- the Null class used to drop output was missing some methods
- in some scripts it was never instantiated, leading to a None return,
which is missing even more methods
- the --source and --header options were swapped
Luckily, all those bugs were hidden by a makefile bug which caused the
old behaviour (with the race) to be invoked.
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py
index bd7b207..3aabf61 100644
--- a/scripts/qapi-commands.py
+++ b/scripts/qapi-commands.py
@@ -399,9 +399,9 @@
elif o in ("-m", "--middle"):
middle_mode = True
elif o in ("-c", "--source"):
- do_h = True
- elif o in ("-h", "--header"):
do_c = True
+ elif o in ("-h", "--header"):
+ do_h = True
if not do_c and not do_h:
do_c = True
@@ -411,15 +411,11 @@
h_file = output_dir + prefix + h_file
def maybe_open(really, name, opt):
- class Null(object):
- def write(self, str):
- pass
- def read(self):
- return ''
if really:
return open(name, opt)
else:
- return Null()
+ import StringIO
+ return StringIO.StringIO()
try:
os.makedirs(output_dir)