Merge autotest upstream from @5318 ~ @5336

client/virt/tests/iofuzz.py

Index: client/virt/tests/iofuzz.py
diff --git a/client/tests/kvm/tests/iofuzz.py b/client/virt/tests/iofuzz.py
similarity index 97%
rename from client/tests/kvm/tests/iofuzz.py
rename to client/virt/tests/iofuzz.py
index ea25ba26d61dc1520136299bf1fb190af27d55ec..e64466e6e0ae6a3829e50c587c645f030c655cd8 100644
--- a/client/tests/kvm/tests/iofuzz.py
+++ b/client/virt/tests/iofuzz.py
@@ -1,6 +1,6 @@
 import logging, re, random
 from autotest_lib.client.common_lib import error
-import kvm_subprocess
+from autotest_lib.client.virt import aexpect
 
 
 def run_iofuzz(test, params, env):
@@ -35,7 +35,7 @@ def run_iofuzz(test, params, env):
                     (oct(data), port))
         try:
             session.cmd(outb_cmd)
-        except kvm_subprocess.ShellError, e:
+        except aexpect.ShellError, e:
             logging.debug(e)
 
 
@@ -50,7 +50,7 @@ def run_iofuzz(test, params, env):
         inb_cmd = "dd if=/dev/port seek=%d of=/dev/null bs=1 count=1" % port
         try:
             session.cmd(inb_cmd)
-        except kvm_subprocess.ShellError, e:
+        except aexpect.ShellError, e:
             logging.debug(e)