404507
From b4c36bdf3ed28042338716cc1add921bd4f54e2d Mon Sep 17 00:00:00 2001
404507
Message-Id: <b4c36bdf3ed28042338716cc1add921bd4f54e2d@dist-git>
404507
From: Martin Kletzander <mkletzan@redhat.com>
404507
Date: Wed, 31 Jan 2018 16:32:21 +0100
404507
Subject: [PATCH] tests: Add resctrl-skx-twocaches test case to vircaps2xmltest
404507
404507
https://bugzilla.redhat.com/show_bug.cgi?id=1289368
404507
404507
This doesn't add very much value for now, but future test for virresctrl will
404507
take information from vircaps2xmldata (since it is dependent on the same info
404507
then why duplicate it) and this particular use case helps us cover bit more of
404507
the code regarding proper formatting and handling errors.  And one more test for
404507
vircaps2xmltest doesn't hurt either.
404507
404507
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
404507
Reviewed-by: John Ferlan <jferlan@redhat.com>
404507
(cherry picked from commit d807014563bb25b466d5dbf718f023c18e762a4b)
404507
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
404507
---
404507
 .../resctrl/info/L3/cbm_mask                       |  1 +
404507
 .../resctrl/info/L3/min_cbm_bits                   |  1 +
404507
 .../resctrl/info/L3/num_closids                    |  1 +
404507
 .../linux-resctrl-skx-twocaches/resctrl/schemata   |  1 +
404507
 .../resctrl/some_reservation/schemata              |  1 +
404507
 .../system/cpu/cpu0/cache/index0/id                |  1 +
404507
 .../system/cpu/cpu0/cache/index0/level             |  1 +
404507
 .../system/cpu/cpu0/cache/index0/shared_cpu_list   |  1 +
404507
 .../system/cpu/cpu0/cache/index0/shared_cpu_map    |  1 +
404507
 .../system/cpu/cpu0/cache/index0/size              |  1 +
404507
 .../system/cpu/cpu0/cache/index0/type              |  1 +
404507
 .../system/cpu/cpu0/cache/index1/id                |  1 +
404507
 .../system/cpu/cpu0/cache/index1/level             |  1 +
404507
 .../system/cpu/cpu0/cache/index1/shared_cpu_list   |  1 +
404507
 .../system/cpu/cpu0/cache/index1/shared_cpu_map    |  1 +
404507
 .../system/cpu/cpu0/cache/index1/size              |  1 +
404507
 .../system/cpu/cpu0/cache/index1/type              |  1 +
404507
 .../system/cpu/cpu0/online                         |  1 +
404507
 .../system/cpu/cpu0/topology/core_id               |  1 +
404507
 .../system/cpu/cpu0/topology/core_siblings         |  1 +
404507
 .../system/cpu/cpu0/topology/core_siblings_list    |  1 +
404507
 .../system/cpu/cpu0/topology/physical_package_id   |  1 +
404507
 .../system/cpu/cpu0/topology/thread_siblings       |  1 +
404507
 .../system/cpu/cpu0/topology/thread_siblings_list  |  1 +
404507
 .../linux-resctrl-skx-twocaches/system/cpu/online  |  1 +
404507
 .../linux-resctrl-skx-twocaches/system/cpu/present |  1 +
404507
 .../system/node/node0/cpu0                         |  1 +
404507
 .../system/node/node0/cpulist                      |  1 +
404507
 .../system/node/node0/cpumap                       |  1 +
404507
 .../system/node/node0/distance                     |  1 +
404507
 .../linux-resctrl-skx-twocaches/system/node/online |  1 +
404507
 .../vircaps-x86_64-resctrl-skx-twocaches.xml       | 34 ++++++++++++++++++++++
404507
 tests/vircaps2xmltest.c                            |  1 +
404507
 33 files changed, 66 insertions(+)
404507
 create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/info/L3/cbm_mask
404507
 create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/info/L3/min_cbm_bits
404507
 create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/info/L3/num_closids
404507
 create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/schemata
404507
 create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/some_reservation/schemata
404507
 create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/id
404507
 create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/level
404507
 create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/shared_cpu_list
404507
 create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/shared_cpu_map
404507
 create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/size
404507
 create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/type
404507
 create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/id
404507
 create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/level
404507
 create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/shared_cpu_list
404507
 create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/shared_cpu_map
404507
 create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/size
404507
 create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/type
404507
 create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/online
404507
 create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/core_id
404507
 create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/core_siblings
404507
 create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/core_siblings_list
404507
 create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/physical_package_id
404507
 create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/thread_siblings
404507
 create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/thread_siblings_list
404507
 create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/online
404507
 create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/present
404507
 create mode 120000 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/node/node0/cpu0
404507
 create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/node/node0/cpulist
404507
 create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/node/node0/cpumap
404507
 create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/node/node0/distance
404507
 create mode 100644 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/node/online
404507
 create mode 100644 tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx-twocaches.xml
404507
404507
diff --git a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/info/L3/cbm_mask b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/info/L3/cbm_mask
404507
new file mode 100644
404507
index 0000000000..d482bbb269
404507
--- /dev/null
404507
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/info/L3/cbm_mask
404507
@@ -0,0 +1 @@
404507
+7ff
404507
diff --git a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/info/L3/min_cbm_bits b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/info/L3/min_cbm_bits
404507
new file mode 100644
404507
index 0000000000..d00491fd7e
404507
--- /dev/null
404507
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/info/L3/min_cbm_bits
404507
@@ -0,0 +1 @@
404507
+1
404507
diff --git a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/info/L3/num_closids b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/info/L3/num_closids
404507
new file mode 100644
404507
index 0000000000..b6a7d89c68
404507
--- /dev/null
404507
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/info/L3/num_closids
404507
@@ -0,0 +1 @@
404507
+16
404507
diff --git a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/schemata b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/schemata
404507
new file mode 100644
404507
index 0000000000..691fbaf887
404507
--- /dev/null
404507
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/schemata
404507
@@ -0,0 +1 @@
404507
+L3:0=0f0;1=000
404507
diff --git a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/some_reservation/schemata b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/some_reservation/schemata
404507
new file mode 100644
404507
index 0000000000..e76adc896c
404507
--- /dev/null
404507
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/some_reservation/schemata
404507
@@ -0,0 +1 @@
404507
+L3:0=70e;1=3ff
404507
diff --git a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/id b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/id
404507
new file mode 100644
404507
index 0000000000..573541ac97
404507
--- /dev/null
404507
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/id
404507
@@ -0,0 +1 @@
404507
+0
404507
diff --git a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/level b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/level
404507
new file mode 100644
404507
index 0000000000..00750edc07
404507
--- /dev/null
404507
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/level
404507
@@ -0,0 +1 @@
404507
+3
404507
diff --git a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/shared_cpu_list b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/shared_cpu_list
404507
new file mode 100644
404507
index 0000000000..573541ac97
404507
--- /dev/null
404507
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/shared_cpu_list
404507
@@ -0,0 +1 @@
404507
+0
404507
diff --git a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/shared_cpu_map b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/shared_cpu_map
404507
new file mode 100644
404507
index 0000000000..5325a8dff7
404507
--- /dev/null
404507
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/shared_cpu_map
404507
@@ -0,0 +1 @@
404507
+001
404507
diff --git a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/size b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/size
404507
new file mode 100644
404507
index 0000000000..d23da60c12
404507
--- /dev/null
404507
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/size
404507
@@ -0,0 +1 @@
404507
+33M
404507
diff --git a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/type b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/type
404507
new file mode 100644
404507
index 0000000000..e4fd9dccda
404507
--- /dev/null
404507
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/type
404507
@@ -0,0 +1 @@
404507
+Unified
404507
diff --git a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/id b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/id
404507
new file mode 100644
404507
index 0000000000..d00491fd7e
404507
--- /dev/null
404507
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/id
404507
@@ -0,0 +1 @@
404507
+1
404507
diff --git a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/level b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/level
404507
new file mode 100644
404507
index 0000000000..00750edc07
404507
--- /dev/null
404507
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/level
404507
@@ -0,0 +1 @@
404507
+3
404507
diff --git a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/shared_cpu_list b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/shared_cpu_list
404507
new file mode 100644
404507
index 0000000000..573541ac97
404507
--- /dev/null
404507
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/shared_cpu_list
404507
@@ -0,0 +1 @@
404507
+0
404507
diff --git a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/shared_cpu_map b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/shared_cpu_map
404507
new file mode 100644
404507
index 0000000000..5325a8dff7
404507
--- /dev/null
404507
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/shared_cpu_map
404507
@@ -0,0 +1 @@
404507
+001
404507
diff --git a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/size b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/size
404507
new file mode 100644
404507
index 0000000000..d23da60c12
404507
--- /dev/null
404507
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/size
404507
@@ -0,0 +1 @@
404507
+33M
404507
diff --git a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/type b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/type
404507
new file mode 100644
404507
index 0000000000..e4fd9dccda
404507
--- /dev/null
404507
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/type
404507
@@ -0,0 +1 @@
404507
+Unified
404507
diff --git a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/online b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/online
404507
new file mode 100644
404507
index 0000000000..d00491fd7e
404507
--- /dev/null
404507
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/online
404507
@@ -0,0 +1 @@
404507
+1
404507
diff --git a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/core_id b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/core_id
404507
new file mode 100644
404507
index 0000000000..573541ac97
404507
--- /dev/null
404507
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/core_id
404507
@@ -0,0 +1 @@
404507
+0
404507
diff --git a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/core_siblings b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/core_siblings
404507
new file mode 100644
404507
index 0000000000..5325a8dff7
404507
--- /dev/null
404507
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/core_siblings
404507
@@ -0,0 +1 @@
404507
+001
404507
diff --git a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/core_siblings_list b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/core_siblings_list
404507
new file mode 100644
404507
index 0000000000..573541ac97
404507
--- /dev/null
404507
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/core_siblings_list
404507
@@ -0,0 +1 @@
404507
+0
404507
diff --git a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/physical_package_id b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/physical_package_id
404507
new file mode 100644
404507
index 0000000000..573541ac97
404507
--- /dev/null
404507
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/physical_package_id
404507
@@ -0,0 +1 @@
404507
+0
404507
diff --git a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/thread_siblings b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/thread_siblings
404507
new file mode 100644
404507
index 0000000000..5325a8dff7
404507
--- /dev/null
404507
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/thread_siblings
404507
@@ -0,0 +1 @@
404507
+001
404507
diff --git a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/thread_siblings_list b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/thread_siblings_list
404507
new file mode 100644
404507
index 0000000000..573541ac97
404507
--- /dev/null
404507
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/thread_siblings_list
404507
@@ -0,0 +1 @@
404507
+0
404507
diff --git a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/online b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/online
404507
new file mode 100644
404507
index 0000000000..573541ac97
404507
--- /dev/null
404507
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/online
404507
@@ -0,0 +1 @@
404507
+0
404507
diff --git a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/present b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/present
404507
new file mode 100644
404507
index 0000000000..573541ac97
404507
--- /dev/null
404507
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/present
404507
@@ -0,0 +1 @@
404507
+0
404507
diff --git a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/node/node0/cpu0 b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/node/node0/cpu0
404507
new file mode 120000
404507
index 0000000000..c841bea28b
404507
--- /dev/null
404507
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/node/node0/cpu0
404507
@@ -0,0 +1 @@
404507
+../../cpu/cpu0
404507
\ No newline at end of file
404507
diff --git a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/node/node0/cpulist b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/node/node0/cpulist
404507
new file mode 100644
404507
index 0000000000..573541ac97
404507
--- /dev/null
404507
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/node/node0/cpulist
404507
@@ -0,0 +1 @@
404507
+0
404507
diff --git a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/node/node0/cpumap b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/node/node0/cpumap
404507
new file mode 100644
404507
index 0000000000..5325a8dff7
404507
--- /dev/null
404507
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/node/node0/cpumap
404507
@@ -0,0 +1 @@
404507
+001
404507
diff --git a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/node/node0/distance b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/node/node0/distance
404507
new file mode 100644
404507
index 0000000000..f599e28b8a
404507
--- /dev/null
404507
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/node/node0/distance
404507
@@ -0,0 +1 @@
404507
+10
404507
diff --git a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/node/online b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/node/online
404507
new file mode 100644
404507
index 0000000000..573541ac97
404507
--- /dev/null
404507
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/node/online
404507
@@ -0,0 +1 @@
404507
+0
404507
diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx-twocaches.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx-twocaches.xml
404507
new file mode 100644
404507
index 0000000000..d18665b24f
404507
--- /dev/null
404507
+++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx-twocaches.xml
404507
@@ -0,0 +1,34 @@
404507
+<capabilities>
404507
+
404507
+  <host>
404507
+    <cpu>
404507
+      <arch>x86_64</arch>
404507
+    </cpu>
404507
+    <power_management/>
404507
+    <migration_features>
404507
+      <live/>
404507
+    </migration_features>
404507
+    <topology>
404507
+      <cells num='1'>
404507
+        <cell id='0'>
404507
+          <memory unit='KiB'>1048576</memory>
404507
+          <pages unit='KiB' size='4'>2048</pages>
404507
+          <pages unit='KiB' size='2048'>4096</pages>
404507
+          <pages unit='KiB' size='1048576'>6144</pages>
404507
+          <cpus num='1'>
404507
+            <cpu id='0' socket_id='0' core_id='0' siblings='0'/>
404507
+          </cpus>
404507
+        </cell>
404507
+      </cells>
404507
+    </topology>
404507
+    <cache>
404507
+      <bank id='0' level='3' type='both' size='33' unit='MiB' cpus='0'>
404507
+        <control granularity='3' unit='MiB' type='both' maxAllocs='16'/>
404507
+      </bank>
404507
+      <bank id='1' level='3' type='both' size='33' unit='MiB' cpus='0'>
404507
+        <control granularity='3' unit='MiB' type='both' maxAllocs='16'/>
404507
+      </bank>
404507
+    </cache>
404507
+  </host>
404507
+
404507
+</capabilities>
404507
diff --git a/tests/vircaps2xmltest.c b/tests/vircaps2xmltest.c
404507
index c0a67858fe..9ee9bf9f95 100644
404507
--- a/tests/vircaps2xmltest.c
404507
+++ b/tests/vircaps2xmltest.c
404507
@@ -121,6 +121,7 @@ mymain(void)
404507
     DO_TEST_FULL("resctrl", VIR_ARCH_X86_64, true, true, true);
404507
     DO_TEST_FULL("resctrl-cdp", VIR_ARCH_X86_64, true, true, true);
404507
     DO_TEST_FULL("resctrl-skx", VIR_ARCH_X86_64, true, true, true);
404507
+    DO_TEST_FULL("resctrl-skx-twocaches", VIR_ARCH_X86_64, true, true, true);
404507
 
404507
     return ret;
404507
 }
404507
-- 
404507
2.16.1
404507