Cache Allocation Technology support, this time for real (??)

[libvirt] [PATCH 10/10] tests: Clean up and modify some vircaps2xmldata

Posted by Martin Kletzander 7 years, 3 months ago

Basically the `cpus` and `tasks` files are not needed, and I've witnessed on a
real system that the schemata file may have spaces prepended to a line, so let's
adjust at least one test so that it reflects what can happen.  Also `000`
allocation is invalid and a full mask means it's all free.  So adjust for that
too.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
---
 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/cpus               | 1 -
 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/tasks              | 0
 tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/schemata | 2 +-
 tests/vircaps2xmldata/linux-resctrl/resctrl/cpus                   | 1 -
 tests/vircaps2xmldata/linux-resctrl/resctrl/schemata               | 2 +-
 tests/vircaps2xmldata/linux-resctrl/resctrl/tasks                  | 0
 6 files changed, 2 insertions(+), 4 deletions(-)
 delete mode 100644 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/cpus
 delete mode 100644 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/tasks
 delete mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/cpus
 delete mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/tasks

diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/cpus b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/cpus
deleted file mode 100644
index b3a79aa9539f..000000000000
--- a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/cpus
+++ /dev/null
@@ -1 +0,0 @@
-ffffff,ffffffff,ffffffff
diff --git a/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/tasks b/tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/tasks
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/schemata b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/schemata
index 691fbaf887d1..23af473be4ed 100644
--- a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/schemata
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/schemata
@@ -1 +1 @@
-L3:0=0f0;1=000
+L3:0=0f0;1=7ff
diff --git a/tests/vircaps2xmldata/linux-resctrl/resctrl/cpus b/tests/vircaps2xmldata/linux-resctrl/resctrl/cpus
deleted file mode 100644
index 98d03acc98ed..000000000000
--- a/tests/vircaps2xmldata/linux-resctrl/resctrl/cpus
+++ /dev/null
@@ -1 +0,0 @@
-fff
diff --git a/tests/vircaps2xmldata/linux-resctrl/resctrl/schemata b/tests/vircaps2xmldata/linux-resctrl/resctrl/schemata
index c1a765f1e0a7..78d2d8a9b826 100644
--- a/tests/vircaps2xmldata/linux-resctrl/resctrl/schemata
+++ b/tests/vircaps2xmldata/linux-resctrl/resctrl/schemata
@@ -1 +1 @@
-L3:0=1ff00;1=1ff0f
+    L3:0=1ff00;1=1ff0f
diff --git a/tests/vircaps2xmldata/linux-resctrl/resctrl/tasks b/tests/vircaps2xmldata/linux-resctrl/resctrl/tasks
deleted file mode 100644
index e69de29bb2d1..000000000000
-- 
2.16.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH 10/10] tests: Clean up and modify some vircaps2xmldata

Posted by Pavel Hrdina 7 years, 3 months ago

On Tue, Jan 23, 2018 at 07:05:19PM +0100, Martin Kletzander wrote:
> Basically the `cpus` and `tasks` files are not needed, and I've witnessed on a
> real system that the schemata file may have spaces prepended to a line, so let's
> adjust at least one test so that it reflects what can happen.  Also `000`
> allocation is invalid and a full mask means it's all free.  So adjust for that
> too.
> 
> Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
> ---
>  tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/cpus               | 1 -
>  tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/tasks              | 0
>  tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/schemata | 2 +-
>  tests/vircaps2xmldata/linux-resctrl/resctrl/cpus                   | 1 -
>  tests/vircaps2xmldata/linux-resctrl/resctrl/schemata               | 2 +-
>  tests/vircaps2xmldata/linux-resctrl/resctrl/tasks                  | 0
>  6 files changed, 2 insertions(+), 4 deletions(-)
>  delete mode 100644 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/cpus
>  delete mode 100644 tests/vircaps2xmldata/linux-resctrl-cdp/resctrl/tasks
>  delete mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/cpus
>  delete mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/tasks

This will also need some modifications if we change how we handle the
"full" allocation.

Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list