Unifies the print+exit sequence into a single 'error' call.
Signed-off-by: Lluís Vilanova <vilan...@ac.upc.edu>
Signed-off-by: Harsh Prateek Bora <ha...@linux.vnet.ibm.com>
---
scripts/tracetool.py | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/scripts/tracetool.py b/scripts/tracetool.py
index bba4c54a..628cb75 100755
--- a/scripts/tracetool.py
+++ b/scripts/tracetool.py
@@ -39,6 +39,15 @@ Options:
'''
sys.exit(1)
+
+def error_write(*lines):
+ sys.stderr.writelines(lines)
+
+def error(*lines):
+ error_write(*lines)
+ sys.exit(1)
+
+
def trace_h_begin(events):
print '''#ifndef TRACE_H
#define TRACE_H
@@ -419,7 +428,8 @@ def main():
opts, args = getopt.getopt(sys.argv[1:], short_options, long_options)
except getopt.GetoptError, err:
# print help information and exit:
- print str(err) # will print something like "option -a not recognized"
+ # will print something like "option -a not recognized"
+ error_write(str(err) + "\n\n")
usage()
sys.exit(2)
for opt, arg in opts:
@@ -450,8 +460,7 @@ def main():
else:
sys.exit(1)
else:
- #assert False, "unhandled option"
- print "unhandled option: ", opt
+ error_write("unhandled option: ", opt, "\n\n")
usage()
if backend == "" or output == "":
@@ -459,22 +468,17 @@ def main():
sys.exit(0)
if backend != 'dtrace' and output == 'd':
- print 'DTrace probe generator not applicable to %s backend' % backend
- sys.exit(1)
+ error('DTrace probe generator not applicable to %s backend\n' %
backend)
if output == 'stap':
if backend != "dtrace":
- print 'SystemTAP tapset generator not applicable to %s backend' %
backend
- sys.exit(1)
+ error('SystemTAP tapset generator not applicable to %s backend\n'
% backend)
if binary == "":
- print '--binary is required for SystemTAP tapset generator'
- sys.exit(1)
+ error('--binary is required for SystemTAP tapset generator\n')
if not probeprefix and not targettype:
- print '--target-type is required for SystemTAP tapset generator'
- sys.exit(1)
+ error('--target-type is required for SystemTAP tapset generator\n')
if not probeprefix and not targetarch:
- print '--target-arch is required for SystemTAP tapset generator'
- sys.exit(1)
+ error('--target-arch is required for SystemTAP tapset generator\n')
if probeprefix == "":
probeprefix = 'qemu.' + targettype + '.' + targetarch
