Skip to content

Commit

Permalink
env_process: support the vdpa device
Browse files Browse the repository at this point in the history
Adapt the vdpa device in env_process

Signed-off-by: Houqi (Nick) Zuo <[email protected]>
  • Loading branch information
nickzhq committed Jul 19, 2023
1 parent 3a1d47f commit 1aa0bda
Showing 1 changed file with 13 additions and 9 deletions.
22 changes: 13 additions & 9 deletions virttest/env_process.py
Original file line number Diff line number Diff line change
Expand Up @@ -869,16 +869,18 @@ def _call_check_image_func():
unpause_vm = True
vm_params['skip_cluster_leak_warn'] = "yes"
try:
images = params.objects("images")
_process_images_serial(
check_image, test, images, vm_params,
vm_process_status=vm_process_status)
if params.get("drive_format") != "vdpa":
images = params.objects("images")
_process_images_serial(
check_image, test, images, vm_params,
vm_process_status=vm_process_status)
finally:
if unpause_vm:
vm.resume()
else:
images = params.objects("images")
_process_images_serial(check_image, test, images, params)
if params.get("drive_format") != "vdpa":
images = params.objects("images")
_process_images_serial(check_image, test, images, params)

# preprocess
if not vm_first:
Expand Down Expand Up @@ -1379,7 +1381,8 @@ def preprocess(test, params, env):
params["cpu_driver"] = env.get("cpu_driver")

# Preprocess all VMs and images
if params.get("not_preprocess", "no") == "no":
if params.get("not_preprocess", "no") == "no" and params.get(
"drive_format") != "vdpa":
process(test, params, env, preprocess_image, preprocess_vm,
fs_source_func=preprocess_fs_source)

Expand Down Expand Up @@ -1553,8 +1556,9 @@ def postprocess(test, params, env):
" or install gcovr package for qemu coverage report")
# Postprocess all VMs and images
try:
process(test, params, env, postprocess_image,
postprocess_vm, True, postprocess_fs_source)
if params.get("drive") != "vdpa":
process(test, params, env, postprocess_image,
postprocess_vm, True, postprocess_fs_source)
except Exception as details:
err += "\nPostprocess: %s" % str(details).replace('\\n', '\n ')
LOG.error(details)
Expand Down

0 comments on commit 1aa0bda

Please sign in to comment.