From 94fbf38c2596dd415f1514f75b879ecd7e14feb9 Mon Sep 17 00:00:00 2001 From: Yihuang Yu Date: Fri, 1 May 2020 17:23:32 +0800 Subject: [PATCH] Support nvdimm.nvdimm_basic on pseries pseries supports nvdimm device since qemu-5.0, add the basic test case for it. Signed-off-by: Yihuang Yu --- qemu/tests/cfg/nvdimm.cfg | 8 +++++++- qemu/tests/nvdimm.py | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/qemu/tests/cfg/nvdimm.cfg b/qemu/tests/cfg/nvdimm.cfg index 8ddde34c..644b32dc 100644 --- a/qemu/tests/cfg/nvdimm.cfg +++ b/qemu/tests/cfg/nvdimm.cfg @@ -5,7 +5,13 @@ vm_mem_limit = 30G kill_vm_on_error = yes login_timeout = 240 - only x86_64 + only x86_64, ppc64le + ppc64le: + required_qemu = [5, ) + only nvdimm_basic + # PowerPC guests need to create the persistent memory device manually so far + nvdimm_ns_create_cmd = "ndctl create-namespace" + dimm_extra_params = "label-size=256m" no Windows no RHEL.6 RHEL.5 RHEL.4 RHEL.3 no RHEL.7.2 RHEL.7.1 RHEL.7.0 diff --git a/qemu/tests/nvdimm.py b/qemu/tests/nvdimm.py index 0dff71ed..37f6dc8b 100644 --- a/qemu/tests/nvdimm.py +++ b/qemu/tests/nvdimm.py @@ -152,6 +152,9 @@ def run(test, params, env): time.sleep(10) mems += target_mems error_context.context("Verify nvdimm in monitor and guest", logging.info) + nvdimm_ns_create_cmd = params.get("nvdimm_ns_create_cmd") + if nvdimm_ns_create_cmd: + nvdimm_test.run_guest_cmd(nvdimm_ns_create_cmd) nvdimm_test.verify_nvdimm(vm, mems) error_context.context("Format and mount nvdimm in guest", logging.info) nvdimm_test.mount_nvdimm() -- GitLab