[Qemu-devel] [PATCH 5/8] device-crash-test: Remove runnable-machine check

[Eduardo Habkost]

This optimization to skip tests if the machine is not runnable is
unreliable and makes the script ignore actual QEMU crashes, so
we're safer simply removing it.

Signed-off-by: Eduardo Habkost <address@hidden>
---
 scripts/device-crash-test | 31 +------------------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

diff --git a/scripts/device-crash-test b/scripts/device-crash-test
index b9a7470efc..f406890519 100755
--- a/scripts/device-crash-test
+++ b/scripts/device-crash-test
@@ -372,33 +372,6 @@ class QemuBinaryInfo(object):
         finally:
             vm.shutdown()
 
-    def machineInfo(self, machine):
-        """Query for information on a specific machine-type
-
-        Results are cached internally, in case the same machine-
-        type is queried multiple times.
-        """
-        if machine in self._machine_info:
-            return self._machine_info[machine]
-
-        mi = {}
-        args = ['-S', '-machine', '%s' % (machine)]
-        dbg("querying machine info for binary=%s machine=%s", self.binary, 
machine)
-        vm = QEMUMachine(binary=self.binary, args=args)
-        try:
-            vm.launch()
-            mi['runnable'] = True
-        except KeyboardInterrupt:
-            raise
-        except:
-            dbg("exception trying to run binary=%s machine=%s", self.binary, 
machine, exc_info=sys.exc_info())
-            dbg("log: %r", vm.get_log())
-            mi['runnable'] = False
-
-        vm.shutdown()
-        self._machine_info[machine] = mi
-        return mi
-
     def defaultMachine(self):
         """Default machine-type for the QEMU binary
 
@@ -613,9 +586,7 @@ def main():
         total += 1
 
         expected_match = findExpectedResult(t)
-        if (args.quick and
-                (expected_match or
-                 not getBinaryInfo(args, 
t['binary']).machineInfo(t['machine'])['runnable'])):
+        if args.quick and expected_match:
             dbg("skipped: %s", formatTestCase(t))
             skipped += 1
             continue
-- 
2.14.3