Version is a significant part of some Xeon CPUs.
Signed-off-by: Jiri Denemark <jdenemar@xxxxxxxxxx>
---
tests/cputest.c | 8 ++++----
tests/cputestdata/cpu-parse.sh | 2 +-
...245-disabled.xml => x86_64-cpuid-Xeon-E3-1245-v5-disabled.xml} | 0
...-1245-enabled.xml => x86_64-cpuid-Xeon-E3-1245-v5-enabled.xml} | 0
...n-E3-1245-guest.xml => x86_64-cpuid-Xeon-E3-1245-v5-guest.xml} | 0
...eon-E3-1245-host.xml => x86_64-cpuid-Xeon-E3-1245-v5-host.xml} | 0
...eon-E3-1245-json.xml => x86_64-cpuid-Xeon-E3-1245-v5-json.xml} | 0
...-cpuid-Xeon-E3-1245.json => x86_64-cpuid-Xeon-E3-1245-v5.json} | 0
...64-cpuid-Xeon-E3-1245.xml => x86_64-cpuid-Xeon-E3-1245-v5.xml} | 0
...630-disabled.xml => x86_64-cpuid-Xeon-E5-2630-v3-disabled.xml} | 0
...-2630-enabled.xml => x86_64-cpuid-Xeon-E5-2630-v3-enabled.xml} | 0
...n-E5-2630-guest.xml => x86_64-cpuid-Xeon-E5-2630-v3-guest.xml} | 0
...eon-E5-2630-host.xml => x86_64-cpuid-Xeon-E5-2630-v3-host.xml} | 0
...eon-E5-2630-json.xml => x86_64-cpuid-Xeon-E5-2630-v3-json.xml} | 0
...-cpuid-Xeon-E5-2630.json => x86_64-cpuid-Xeon-E5-2630-v3.json} | 0
...64-cpuid-Xeon-E5-2630.xml => x86_64-cpuid-Xeon-E5-2630-v3.xml} | 0
...650-disabled.xml => x86_64-cpuid-Xeon-E5-2650-v3-disabled.xml} | 0
...-2650-enabled.xml => x86_64-cpuid-Xeon-E5-2650-v3-enabled.xml} | 0
...n-E5-2650-guest.xml => x86_64-cpuid-Xeon-E5-2650-v3-guest.xml} | 0
...eon-E5-2650-host.xml => x86_64-cpuid-Xeon-E5-2650-v3-host.xml} | 0
...eon-E5-2650-json.xml => x86_64-cpuid-Xeon-E5-2650-v3-json.xml} | 0
...-cpuid-Xeon-E5-2650.json => x86_64-cpuid-Xeon-E5-2650-v3.json} | 0
...64-cpuid-Xeon-E5-2650.xml => x86_64-cpuid-Xeon-E5-2650-v3.xml} | 0
...890-disabled.xml => x86_64-cpuid-Xeon-E7-8890-v3-disabled.xml} | 0
...-8890-enabled.xml => x86_64-cpuid-Xeon-E7-8890-v3-enabled.xml} | 0
...n-E7-8890-guest.xml => x86_64-cpuid-Xeon-E7-8890-v3-guest.xml} | 0
...eon-E7-8890-host.xml => x86_64-cpuid-Xeon-E7-8890-v3-host.xml} | 0
...eon-E7-8890-json.xml => x86_64-cpuid-Xeon-E7-8890-v3-json.xml} | 0
...-cpuid-Xeon-E7-8890.json => x86_64-cpuid-Xeon-E7-8890-v3.json} | 0
...64-cpuid-Xeon-E7-8890.xml => x86_64-cpuid-Xeon-E7-8890-v3.xml} | 0
30 files changed, 5 insertions(+), 5 deletions(-)
rename tests/cputestdata/{x86_64-cpuid-Xeon-E3-1245-disabled.xml => x86_64-cpuid-Xeon-E3-1245-v5-disabled.xml} (100%)
rename tests/cputestdata/{x86_64-cpuid-Xeon-E3-1245-enabled.xml => x86_64-cpuid-Xeon-E3-1245-v5-enabled.xml} (100%)
rename tests/cputestdata/{x86_64-cpuid-Xeon-E3-1245-guest.xml => x86_64-cpuid-Xeon-E3-1245-v5-guest.xml} (100%)
rename tests/cputestdata/{x86_64-cpuid-Xeon-E3-1245-host.xml => x86_64-cpuid-Xeon-E3-1245-v5-host.xml} (100%)
rename tests/cputestdata/{x86_64-cpuid-Xeon-E3-1245-json.xml => x86_64-cpuid-Xeon-E3-1245-v5-json.xml} (100%)
rename tests/cputestdata/{x86_64-cpuid-Xeon-E3-1245.json => x86_64-cpuid-Xeon-E3-1245-v5.json} (100%)
rename tests/cputestdata/{x86_64-cpuid-Xeon-E3-1245.xml => x86_64-cpuid-Xeon-E3-1245-v5.xml} (100%)
rename tests/cputestdata/{x86_64-cpuid-Xeon-E5-2630-disabled.xml => x86_64-cpuid-Xeon-E5-2630-v3-disabled.xml} (100%)
rename tests/cputestdata/{x86_64-cpuid-Xeon-E5-2630-enabled.xml => x86_64-cpuid-Xeon-E5-2630-v3-enabled.xml} (100%)
rename tests/cputestdata/{x86_64-cpuid-Xeon-E5-2630-guest.xml => x86_64-cpuid-Xeon-E5-2630-v3-guest.xml} (100%)
rename tests/cputestdata/{x86_64-cpuid-Xeon-E5-2630-host.xml => x86_64-cpuid-Xeon-E5-2630-v3-host.xml} (100%)
rename tests/cputestdata/{x86_64-cpuid-Xeon-E5-2630-json.xml => x86_64-cpuid-Xeon-E5-2630-v3-json.xml} (100%)
rename tests/cputestdata/{x86_64-cpuid-Xeon-E5-2630.json => x86_64-cpuid-Xeon-E5-2630-v3.json} (100%)
rename tests/cputestdata/{x86_64-cpuid-Xeon-E5-2630.xml => x86_64-cpuid-Xeon-E5-2630-v3.xml} (100%)
rename tests/cputestdata/{x86_64-cpuid-Xeon-E5-2650-disabled.xml => x86_64-cpuid-Xeon-E5-2650-v3-disabled.xml} (100%)
rename tests/cputestdata/{x86_64-cpuid-Xeon-E5-2650-enabled.xml => x86_64-cpuid-Xeon-E5-2650-v3-enabled.xml} (100%)
rename tests/cputestdata/{x86_64-cpuid-Xeon-E5-2650-guest.xml => x86_64-cpuid-Xeon-E5-2650-v3-guest.xml} (100%)
rename tests/cputestdata/{x86_64-cpuid-Xeon-E5-2650-host.xml => x86_64-cpuid-Xeon-E5-2650-v3-host.xml} (100%)
rename tests/cputestdata/{x86_64-cpuid-Xeon-E5-2650-json.xml => x86_64-cpuid-Xeon-E5-2650-v3-json.xml} (100%)
rename tests/cputestdata/{x86_64-cpuid-Xeon-E5-2650.json => x86_64-cpuid-Xeon-E5-2650-v3.json} (100%)
rename tests/cputestdata/{x86_64-cpuid-Xeon-E5-2650.xml => x86_64-cpuid-Xeon-E5-2650-v3.xml} (100%)
rename tests/cputestdata/{x86_64-cpuid-Xeon-E7-8890-disabled.xml => x86_64-cpuid-Xeon-E7-8890-v3-disabled.xml} (100%)
rename tests/cputestdata/{x86_64-cpuid-Xeon-E7-8890-enabled.xml => x86_64-cpuid-Xeon-E7-8890-v3-enabled.xml} (100%)
rename tests/cputestdata/{x86_64-cpuid-Xeon-E7-8890-guest.xml => x86_64-cpuid-Xeon-E7-8890-v3-guest.xml} (100%)
rename tests/cputestdata/{x86_64-cpuid-Xeon-E7-8890-host.xml => x86_64-cpuid-Xeon-E7-8890-v3-host.xml} (100%)
rename tests/cputestdata/{x86_64-cpuid-Xeon-E7-8890-json.xml => x86_64-cpuid-Xeon-E7-8890-v3-json.xml} (100%)
rename tests/cputestdata/{x86_64-cpuid-Xeon-E7-8890.json => x86_64-cpuid-Xeon-E7-8890-v3.json} (100%)
rename tests/cputestdata/{x86_64-cpuid-Xeon-E7-8890.xml => x86_64-cpuid-Xeon-E7-8890-v3.xml} (100%)
diff --git a/tests/cputest.c b/tests/cputest.c
index 170d16018..9c97f75a2 100644
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -1186,12 +1186,12 @@ mymain(void)
DO_TEST_CPUID(VIR_ARCH_X86_64, "Phenom-B95", JSON_HOST);
DO_TEST_CPUID(VIR_ARCH_X86_64, "Ryzen-7-1800X-Eight-Core", JSON_HOST);
DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-5110", JSON_NONE);
- DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E3-1245", JSON_MODELS);
- DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E5-2630", JSON_HOST);
- DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E5-2650", JSON_HOST);
+ DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E3-1245-v5", JSON_MODELS);
+ DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E5-2630-v3", JSON_HOST);
+ DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E5-2650-v3", JSON_HOST);
DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E7-4820", JSON_HOST);
DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E7-4830", JSON_MODELS_REQUIRED);
- DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E7-8890", JSON_MODELS);
+ DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E7-8890-v3", JSON_MODELS);
DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-Gold-6148", JSON_HOST);
DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-W3520", JSON_HOST);
DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-X5460", JSON_NONE);
diff --git a/tests/cputestdata/cpu-parse.sh b/tests/cputestdata/cpu-parse.sh
index 96ff1074e..3a2bfa049 100755
--- a/tests/cputestdata/cpu-parse.sh
+++ b/tests/cputestdata/cpu-parse.sh
@@ -16,7 +16,7 @@ fname=`sed -e 's/^ *//;
s/ \(CPU\|Processor\)\>//;
s/ @.*//;
s/ APU .*//;
- s/ \(v[0-9]\|SE\)$//;
+ s/ SE$//;
s/ /-/g' <<<"$model"`
fname="x86_64-cpuid-$fname"
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-disabled.xml
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-disabled.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-disabled.xml
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-enabled.xml
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-enabled.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-enabled.xml
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-guest.xml
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-guest.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-guest.xml
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-host.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-json.xml
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-json.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-json.xml
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.json b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5.json
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.json
rename to tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5.json
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5.xml
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5.xml
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-disabled.xml
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-disabled.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-disabled.xml
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-enabled.xml
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-enabled.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-enabled.xml
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-guest.xml
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-guest.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-guest.xml
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-host.xml
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-host.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-host.xml
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-json.xml
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-json.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-json.xml
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630.json b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3.json
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-Xeon-E5-2630.json
rename to tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3.json
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3.xml
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-Xeon-E5-2630.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3.xml
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-disabled.xml
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-disabled.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-disabled.xml
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-enabled.xml
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-enabled.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-enabled.xml
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-guest.xml
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-guest.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-guest.xml
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-host.xml
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-host.xml
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-json.xml
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-json.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-json.xml
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.json b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3.json
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.json
rename to tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3.json
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3.xml
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3.xml
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-disabled.xml
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-disabled.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-disabled.xml
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-enabled.xml
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-enabled.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-enabled.xml
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-guest.xml
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-guest.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-guest.xml
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-host.xml
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-host.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-host.xml
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-json.xml
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-json.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-json.xml
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890.json b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3.json
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-Xeon-E7-8890.json
rename to tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3.json
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3.xml
similarity index 100%
rename from tests/cputestdata/x86_64-cpuid-Xeon-E7-8890.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3.xml
--
2.14.3
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
