Skip to content

Commit 8afa49f

Browse files
authored
Merge pull request #4212 from 6-dehan/KVMAUTOMA-2995-vioser-nonetype
vioser: Supplement the correct function
2 parents f65ddaa + 8f342b8 commit 8afa49f

File tree

2 files changed

+44
-1
lines changed

2 files changed

+44
-1
lines changed

qemu/tests/vioser_in_use.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,16 @@ def live_migration_guest(test, params, vm, session):
4646
vm.migrate()
4747

4848

49+
def subw_guest_pause_resume(test, params, vm, session):
50+
vm.monitor.cmd("stop")
51+
if not vm.monitor.verify_status("paused"):
52+
test.error("VM is not paused Current status: %s" % vm.monitor.get_status())
53+
time.sleep(float(params.get("wait_timeout", "1800")))
54+
vm.monitor.cmd("cont")
55+
if not vm.monitor.verify_status("running"):
56+
test.error("VM is not running. Current status: %s" % vm.monitor.get_status())
57+
58+
4959
@error_context.context_aware
5060
def vcpu_hotplug_guest(test, params, vm, session):
5161
"""

qemu/tests/virtio_serial_hotplug_port_pci.py

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from virttest import env_process, error_context
1+
from virttest import env_process, error_context, qemu_migration
22
from virttest.qemu_monitor import QMPCmdError
33

44
from provider import win_driver_utils
@@ -34,6 +34,39 @@ def get_buses_and_serial_devices(vm, params, char_devices, serials):
3434
return buses, serial_devices
3535

3636

37+
@error_context.context_aware
38+
def reboot_guest(test, params, vm, session):
39+
"""
40+
Reboot guest from system_reset or shell.
41+
"""
42+
43+
vm.reboot(session, method=params["reboot_method"])
44+
45+
46+
@error_context.context_aware
47+
def shutdown_guest(test, params, vm, session):
48+
"""
49+
Shutdown guest via system_powerdown or shell.
50+
"""
51+
52+
if params.get("shutdown_method") == "shell":
53+
session.sendline(params["shutdown_command"])
54+
elif params.get("shutdown_method") == "system_powerdown":
55+
vm.monitor.system_powerdown()
56+
if not vm.wait_for_shutdown(int(params.get("shutdown_timeout", 360))):
57+
test.fail("guest refuses to go down")
58+
59+
60+
@error_context.context_aware
61+
def live_migration_guest(test, params, vm, session):
62+
"""
63+
Run migrate_set_speed, then migrate guest.
64+
"""
65+
66+
qemu_migration.set_speed(vm, params.get("mig_speed", "1G"))
67+
vm.migrate()
68+
69+
3770
@error_context.context_aware
3871
def run(test, params, env):
3972
"""

0 commit comments

Comments
 (0)