The s390 testcase verifies that the s390-specific cpu-state
field is correctly mapped to the halted property.
Signed-off-by: Viktor Mihajlovski <mihajlov@xxxxxxxxxxxxxxxxxx>
---
.../qemumonitorjson-cpuinfo-s390-fast-cpus.json | 25 ++++++++++++++++++++++
.../qemumonitorjson-cpuinfo-s390-fast-hotplug.json | 21 ++++++++++++++++++
.../qemumonitorjson-cpuinfo-s390-fast.data | 19 ++++++++++++++++
tests/qemumonitorjsontest.c | 2 ++
4 files changed, 67 insertions(+)
create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-s390-fast-cpus.json
create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-s390-fast-hotplug.json
create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-s390-fast.data
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-s390-fast-cpus.json b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-s390-fast-cpus.json
new file mode 100644
index 0000000..ef9c975
--- /dev/null
+++ b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-s390-fast-cpus.json
@@ -0,0 +1,25 @@
+{
+ "return": [
+ {
+ "arch": "s390",
+ "cpu-index": 0,
+ "props": {
+ "core-id": 0
+ },
+ "qom-path": "/machine/unattached/device[0]",
+ "thread-id": 89504,
+ "cpu-state": "operating"
+ },
+ {
+ "arch": "s390",
+ "cpu-index": 1,
+ "props": {
+ "core-id": 1
+ },
+ "qom-path": "/machine/unattached/device[1]",
+ "thread-id": 89505,
+ "cpu-state": "stopped"
+ }
+ ],
+ "id": "libvirt-42"
+}
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-s390-fast-hotplug.json b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-s390-fast-hotplug.json
new file mode 100644
index 0000000..8016b5b
--- /dev/null
+++ b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-s390-fast-hotplug.json
@@ -0,0 +1,21 @@
+{
+ "return": [
+ {
+ "props": {
+ "core-id": 1
+ },
+ "vcpus-count": 1,
+ "qom-path": "/machine/unattached/device[1]",
+ "type": "host-s390x-cpu"
+ },
+ {
+ "props": {
+ "core-id": 0
+ },
+ "vcpus-count": 1,
+ "qom-path": "/machine/unattached/device[0]",
+ "type": "host-s390x-cpu"
+ }
+ ],
+ "id": "libvirt-41"
+}
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-s390-fast.data b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-s390-fast.data
new file mode 100644
index 0000000..9fc7041
--- /dev/null
+++ b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-s390-fast.data
@@ -0,0 +1,19 @@
+[vcpu libvirt-id='0']
+ online=yes
+ hotpluggable=no
+ thread-id='89504'
+ enable-id='1'
+ query-cpus-id='0'
+ type='host-s390x-cpu'
+ qom_path='/machine/unattached/device[0]'
+ topology: core='0' vcpus='1'
+[vcpu libvirt-id='1']
+ online=yes
+ hotpluggable=no
+ thread-id='89505'
+ enable-id='2'
+ query-cpus-id='1'
+ type='host-s390x-cpu'
+ qom_path='/machine/unattached/device[1]'
+ topology: core='1' vcpus='1'
+ halted
diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index 5daa2c9..b468b04 100644
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -3090,6 +3090,8 @@ mymain(void)
DO_TEST_CPU_INFO("ppc64-hotplug-4", 24);
DO_TEST_CPU_INFO("ppc64-no-threads", 16);
+ DO_TEST_CPU_INFO_FAST("s390-fast", 2);
+
#define DO_TEST_BLOCK_NODE_DETECT(testname) \
do { \
if (virTestRun("node-name-detect(" testname ")", \
--
1.9.1
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
