Merge autotest upstream from @5318 ~ @5336

client/virt/kvm_monitor.py

 """
 Interfaces to the QEMU monitor.
 
 @copyright: 2008-2010 Red Hat Inc.
 """
 
 import socket, time, threading, logging, select
-import kvm_utils
+import virt_utils
 try:
     import json
 except ImportError:
     logging.warning("Could not import json module. "
                     "QMP monitor functionality disabled.")
 
 
 class MonitorError(Exception):
     pass
 
@@ skipping 527 matching lines @@
             logging.debug("(monitor %s) Sending command '%s'",
                           self.name, cmd)
         if not self._acquire_lock(20):
             raise MonitorLockError("Could not acquire exclusive lock to send "
                                    "QMP command '%s'" % cmd)
 
         try:
             # Read any data that might be available
             self._read_objects()
             # Send command
-            id = kvm_utils.generate_random_string(8)
+            id = virt_utils.generate_random_string(8)
             self._send(json.dumps(self._build_cmd(cmd, args, id)) + "\n")
             # Read response
             r = self._get_response(id, timeout)
             if r is None:
                 raise MonitorProtocolError("Received no response to QMP "
                                            "command '%s', or received a "
                                            "response with an incorrect id"
                                            % cmd)
             if "return" in r:
                 if debug and r["return"]:
@@ skipping 187 matching lines @@
 
     def migrate_set_speed(self, value):
         """
         Set maximum speed (in bytes/sec) for migrations.
 
         @param value: Speed in bytes/sec
         @return: The response to the command
         """
         args = {"value": value}
         return self.cmd("migrate_set_speed", args)