Verbose option to enable Qira debug loggin in QEMU

This allows users of Qira to get our custom QEMU build to log
Qira-related debug messages, by providing the -v or --verbose option to
Qira itself.

The QEMU log is stored in /tmp/qira_logs/qemu (along with the other log
files generated by Qira).

The weirdness with changing qemu_args from an array to a hash is because
QEMU's command line parsing does not support providing multiple -d
options that combine, the last one always wins (and multiple values must
be provided comma separated).

middleware/qira.py

@@ -28,6 +28,7 @@
   parser.add_argument("--web-port", metavar="PORT", help="listen port for web interface. 3002 by default", type=int, default=qira_config.WEB_PORT)
   parser.add_argument("--socat-port", metavar="PORT", help="listen port for socat. 4000 by default", type=int, default=qira_config.SOCAT_PORT)
   parser.add_argument('-S', '--static', help="enable static2", action="store_true")
+  parser.add_argument('-v', '--verbose', help="enable debug logging", action="store_true")
   #capstone flag in qira_config for now
 
   # parse arguments, first try
@@ -73,10 +74,13 @@
     os.system("rm -rfv /tmp/qira*")
 
   # qemu args from command line
-  qemu_args = []
+  qemu_args = { "args": [], "logs": [] }
   if args.gate_trace != None:
-    qemu_args.append("-gatetrace")
-    qemu_args.append(args.gate_trace)
+    qemu_args["args"].append("-gatetrace")
+    qemu_args["args"].append(args.gate_trace)
+  if args.verbose != None:
+    qemu_args["args"].extend(["-D", "/tmp/qira_logs/qemu"])
+    qemu_args["logs"].append("qira")
 
   # creates the file symlink, program is constant through server run
   program = qira_program.Program(args.binary, args.args, qemu_args)

middleware/qira_analysis.py

@@ -562,7 +562,7 @@ def get_loads(clnum):
 
 if __name__ == "__main__":
   # can run standalone for testing
-  program = qira_program.Program("/tmp/qira_binary", [])
+  program = qira_program.Program("/tmp/qira_binary")
   trace = program.add_trace("/tmp/qira_logs/0", 0)
   while not trace.db.did_update():
     time.sleep(0.1)

middleware/qira_program.py

@@ -40,7 +40,7 @@ def which(prog):
 
 # things that don't cross the fork
 class Program:
-  def __init__(self, prog, args=[], qemu_args=[]):
+  def __init__(self, prog, args=[], qemu_args={}):
     # create the logs dir
     try:
       os.mkdir(qira_config.TRACE_FILE_BASE)
@@ -76,7 +76,11 @@ def __init__(self, prog, args=[], qemu_args=[]):
         pass
 
     # defaultargs for qira binary
-    self.defaultargs = ["-strace", "-D", "/dev/null", "-d", "in_asm", "-singlestep"]+qemu_args
+    logs = ["in_asm"]+qemu_args.get("logs", [])
+    self.defaultargs = ["-strace",
+                        "-D", "/dev/null",
+                        "-d", ",".join(logs),
+                        "-singlestep"]+qemu_args.get("args", [])
     if qira_config.TRACE_LIBRARIES:
       self.defaultargs.append("-tracelibraries")