virtio-iommu: Fix coverity issue in virtio_iommu_handle_command()

[qemu.git] / scripts / device-crash-test

diff --git a/scripts/device-crash-test b/scripts/device-crash-test
index b32aa93f8962ce413c40a05c6fe751402d3f1f47..305d0427af61430dfe920c597e4d0bed36018369 100755 (executable)
--- a/scripts/device-crash-test
+++ b/scripts/device-crash-test
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3

 #
 #  Copyright (c) 2017 Red Hat Inc
 #
 #
 #  Copyright (c) 2017 Red Hat Inc
 #


@@ -23,8 +23,8 @@
 Run QEMU with all combinations of -machine and -device types,
 check for crashes and unexpected errors.
 """
 Run QEMU with all combinations of -machine and -device types,
 check for crashes and unexpected errors.
 """

-from __future__ import print_function

 
 

+import os

 import sys
 import glob
 import logging
 import sys
 import glob
 import logging


@@ -34,7 +34,8 @@ import random
 import argparse
 from itertools import chain
 
 import argparse
 from itertools import chain
 

-from qemu import QEMUMachine
+sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'python'))
+from qemu.machine import QEMUMachine

 
 logger = logging.getLogger('device-crash-test')
 dbg = logger.debug
 
 logger = logging.getLogger('device-crash-test')
 dbg = logger.debug


@@ -82,7 +83,6 @@ ERROR_WHITELIST = [
     {'device':'isa-ipmi-bt', 'expected':True},             # IPMI device requires a bmc attribute to be set
     {'device':'isa-ipmi-kcs', 'expected':True},            # IPMI device requires a bmc attribute to be set
     {'device':'isa-parallel', 'expected':True},            # Can't create serial device, empty char device
     {'device':'isa-ipmi-bt', 'expected':True},             # IPMI device requires a bmc attribute to be set
     {'device':'isa-ipmi-kcs', 'expected':True},            # IPMI device requires a bmc attribute to be set
     {'device':'isa-parallel', 'expected':True},            # Can't create serial device, empty char device

-    {'device':'ivshmem', 'expected':True},                 # You must specify either 'shm' or 'chardev'

     {'device':'ivshmem-doorbell', 'expected':True},        # You must specify a 'chardev'
     {'device':'ivshmem-plain', 'expected':True},           # You must specify a 'memdev'
     {'device':'loader', 'expected':True},                  # please include valid arguments
     {'device':'ivshmem-doorbell', 'expected':True},        # You must specify a 'chardev'
     {'device':'ivshmem-plain', 'expected':True},           # You must specify a 'memdev'
     {'device':'loader', 'expected':True},                  # please include valid arguments


@@ -558,7 +558,8 @@ def main():
         logger.info("Skipped %d test cases", skipped)
 
     if args.debug:
         logger.info("Skipped %d test cases", skipped)
 
     if args.debug:

-        stats = sorted([(len(wl_stats.get(i, [])), wl) for i, wl in enumerate(ERROR_WHITELIST)])
+        stats = sorted([(len(wl_stats.get(i, [])), wl) for i, wl in
+                         enumerate(ERROR_WHITELIST)], key=lambda x: x[0])

         for count, wl in stats:
             dbg("whitelist entry stats: %d: %r", count, wl)
 
         for count, wl in stats:
             dbg("whitelist entry stats: %d: %r", count, wl)