Merge pull request #1505 from vivianQizhu/chardev_RHEL8

virtio_console: python3 issue fix

qemu/tests/chardev_hotplug.py

@@ -113,7 +113,7 @@ def run(test, params, env):
     logging.info("host pty device is '%s'" % filename)
     fd_dst = os.open(filename, os.O_RDWR | os.O_NONBLOCK)
     chardev_use(vm, "chardev-pty")
-    output = os.read(fd_dst, 256)
+    output = os.read(fd_dst, 256).decode()
     os.close(fd_dst)
     if output.find("Hello virttest world") == -1:
         test.fail("Guest message not found [%s]" % output)

qemu/tests/virtio_console.py

@@ -131,7 +131,7 @@ def run(test, params, env):
                          2)
 
         # Poll (IN, OUT)
-        port.sock.sendall("test")
+        port.sock.sendall(b"test")
         for test in [select.POLLIN, select.POLLOUT]:
             guest_worker.cmd("virt.poll('%s', %s)" % (port.name, test), 10)
 
@@ -180,7 +180,7 @@ def run(test, params, env):
         # Test sigio when port receive data
         guest_worker.cmd("virt.set_pool_want_return('%s', select.POLLOUT |"
                          " select.POLLIN)" % (port.name), 10)
-        port.sock.sendall("0123456789")
+        port.sock.sendall(b"0123456789")
         guest_worker.cmd("virt.get_sigio_poll_return('%s')" % (port.name), 10)
 
         # Test sigio port close event
@@ -300,7 +300,7 @@ def run(test, params, env):
                       "Data:\n%s" % tmp)
         elif match is not None:
             test.fail("Unexpected fail\nMatch: %s\nData:\n%s" % (match, tmp))
-        port.sock.sendall("1234567890")
+        port.sock.sendall(b"1234567890")
         # Now guest received the data end escaped from the recv()
         guest_worker.cmd("print('PASS: nothing')", 10)
         virtio_test.cleanup(vm, guest_worker)
@@ -327,7 +327,7 @@ def run(test, params, env):
                       "Data:\n%s" % tmp)
         elif match != 1:
             test.fail("Unexpected fail\nMatch: %s\nData:\n%s" % (match, tmp))
-        port.sock.sendall("1234567890")
+        port.sock.sendall(b"1234567890")
         time.sleep(0.01)
         try:
             guest_worker.cmd("virt.recv('%s', 10, 1024, False)"
@@ -355,7 +355,7 @@ def run(test, params, env):
             vm, guest_worker = virtio_test.get_vm_with_worker(no_consoles=2)
             send_port, recv_port = virtio_test.get_virtio_ports(vm)[0][:2]
 
-        data = "Smoke test data"
+        data = b"Smoke test data"
         send_port.open()
         recv_port.open()
         # Set nonblocking mode
@@ -364,7 +364,7 @@ def run(test, params, env):
         guest_worker.cmd("virt.loopback(['%s'], ['%s'], 1024, virt.LOOP_NONE)"
                          % (send_port.name, recv_port.name), 10)
         send_port.sock.sendall(data)
-        tmp = ""
+        tmp = b""
         i = 0
         while i <= 10:
             i += 1
@@ -1083,9 +1083,9 @@ def run(test, params, env):
 
             port.open()
 
-            data = ""
+            data = b""
             for _ in range(buf_len):
-                data += "%c" % random.randrange(255)
+                data += b"%c" % random.randrange(255)
 
             funcatexit.register(env, params.get('type'), __set_exit_event)
 
@@ -1701,7 +1701,7 @@ def run(test, params, env):
             try:
                 sent1 = 0
                 for _ in range(1000000):
-                    sent1 += port.sock.send("a")
+                    sent1 += port.sock.send(b"a")
             except socket.timeout:
                 logging.info("Data sending to closed port timed out.")
 
@@ -1718,7 +1718,7 @@ def run(test, params, env):
             try:
                 sent2 = 0
                 for _ in range(40000):
-                    sent2 = port.sock.send("a")
+                    sent2 = port.sock.send(b"a")
             except socket.timeout:
                 logging.info("Data sending to closed port timed out.")