Signed-off-by: Jiri Denemark <jdene...@redhat.com>
---
tests/cputest.c | 1 +
.../cputestdata/x86-cpuid-Core-i7-4600U-guest.xml | 28 ++++++++
tests/cputestdata/x86-cpuid-Core-i7-4600U-host.xml | 28 ++++++++
tests/cputestdata/x86-cpuid-Core-i7-4600U-json.xml | 13 ++++
tests/cputestdata/x86-cpuid-Core-i7-4600U.json | 82 ++++++++++++++++++++++
tests/cputestdata/x86-cpuid-Core-i7-4600U.xml | 34 +++++++++
6 files changed, 186 insertions(+)
create mode 100644 tests/cputestdata/x86-cpuid-Core-i7-4600U-guest.xml
create mode 100644 tests/cputestdata/x86-cpuid-Core-i7-4600U-host.xml
create mode 100644 tests/cputestdata/x86-cpuid-Core-i7-4600U-json.xml
create mode 100644 tests/cputestdata/x86-cpuid-Core-i7-4600U.json
create mode 100644 tests/cputestdata/x86-cpuid-Core-i7-4600U.xml
diff --git a/tests/cputest.c b/tests/cputest.c
index 9205ce2..46d0dcc 100644
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -852,6 +852,7 @@ mymain(void)
DO_TEST_CPUID("x86", "Core-i7-3520M", false);
DO_TEST_CPUID("x86", "Core-i7-3740QM", true);
DO_TEST_CPUID("x86", "Core-i7-3770", true);
+ DO_TEST_CPUID("x86", "Core-i7-4600U", true);
#if WITH_QEMU && WITH_YAJL
qemuTestDriverFree(&driver);
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-4600U-guest.xml
b/tests/cputestdata/x86-cpuid-Core-i7-4600U-guest.xml
new file mode 100644
index 0000000..89c95a8
--- /dev/null
+++ b/tests/cputestdata/x86-cpuid-Core-i7-4600U-guest.xml
@@ -0,0 +1,28 @@
+<cpu mode='custom' match='exact'>
+ <arch>x86_64</arch>
+ <model fallback='forbid'>Haswell-noTSX</model>
+ <vendor>Intel</vendor>
+ <feature policy='require' name='vme'/>
+ <feature policy='require' name='ds'/>
+ <feature policy='require' name='acpi'/>
+ <feature policy='require' name='ss'/>
+ <feature policy='require' name='ht'/>
+ <feature policy='require' name='tm'/>
+ <feature policy='require' name='pbe'/>
+ <feature policy='require' name='dtes64'/>
+ <feature policy='require' name='monitor'/>
+ <feature policy='require' name='ds_cpl'/>
+ <feature policy='require' name='vmx'/>
+ <feature policy='require' name='smx'/>
+ <feature policy='require' name='est'/>
+ <feature policy='require' name='tm2'/>
+ <feature policy='require' name='xtpr'/>
+ <feature policy='require' name='pdcm'/>
+ <feature policy='require' name='osxsave'/>
+ <feature policy='require' name='f16c'/>
+ <feature policy='require' name='rdrand'/>
+ <feature policy='require' name='pdpe1gb'/>
+ <feature policy='require' name='abm'/>
+ <feature policy='require' name='tsc_adjust'/>
+ <feature policy='require' name='invtsc'/>
+</cpu>
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-4600U-host.xml
b/tests/cputestdata/x86-cpuid-Core-i7-4600U-host.xml
new file mode 100644
index 0000000..6edbf8f
--- /dev/null
+++ b/tests/cputestdata/x86-cpuid-Core-i7-4600U-host.xml
@@ -0,0 +1,28 @@
+<cpu>
+ <arch>x86_64</arch>
+ <model>Haswell-noTSX</model>
+ <vendor>Intel</vendor>
+ <feature name='vme'/>
+ <feature name='ds'/>
+ <feature name='acpi'/>
+ <feature name='ss'/>
+ <feature name='ht'/>
+ <feature name='tm'/>
+ <feature name='pbe'/>
+ <feature name='dtes64'/>
+ <feature name='monitor'/>
+ <feature name='ds_cpl'/>
+ <feature name='vmx'/>
+ <feature name='smx'/>
+ <feature name='est'/>
+ <feature name='tm2'/>
+ <feature name='xtpr'/>
+ <feature name='pdcm'/>
+ <feature name='osxsave'/>
+ <feature name='f16c'/>
+ <feature name='rdrand'/>
+ <feature name='pdpe1gb'/>
+ <feature name='abm'/>
+ <feature name='tsc_adjust'/>
+ <feature name='invtsc'/>
+</cpu>
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-4600U-json.xml
b/tests/cputestdata/x86-cpuid-Core-i7-4600U-json.xml
new file mode 100644
index 0000000..2f6a925
--- /dev/null
+++ b/tests/cputestdata/x86-cpuid-Core-i7-4600U-json.xml
@@ -0,0 +1,13 @@
+<cpu mode='custom' match='exact'>
+ <arch>x86_64</arch>
+ <model fallback='forbid'>Haswell-noTSX</model>
+ <feature policy='require' name='vme'/>
+ <feature policy='require' name='ss'/>
+ <feature policy='require' name='vmx'/>
+ <feature policy='require' name='f16c'/>
+ <feature policy='require' name='rdrand'/>
+ <feature policy='require' name='hypervisor'/>
+ <feature policy='require' name='pdpe1gb'/>
+ <feature policy='require' name='abm'/>
+ <feature policy='require' name='tsc_adjust'/>
+</cpu>
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-4600U.json
b/tests/cputestdata/x86-cpuid-Core-i7-4600U.json
new file mode 100644
index 0000000..2b15fad
--- /dev/null
+++ b/tests/cputestdata/x86-cpuid-Core-i7-4600U.json
@@ -0,0 +1,82 @@
+{
+ "return": [
+ {
+ "cpuid-register": "EAX",
+ "cpuid-input-eax": 6,
+ "features": 4
+ },
+ {
+ "cpuid-register": "EAX",
+ "cpuid-input-ecx": 1,
+ "cpuid-input-eax": 13,
+ "features": 1
+ },
+ {
+ "cpuid-register": "EDX",
+ "cpuid-input-eax": 2147483658,
+ "features": 0
+ },
+ {
+ "cpuid-register": "EAX",
+ "cpuid-input-eax": 1073741825,
+ "features": 16777467
+ },
+ {
+ "cpuid-register": "EDX",
+ "cpuid-input-eax": 3221225473,
+ "features": 0
+ },
+ {
+ "cpuid-register": "EDX",
+ "cpuid-input-eax": 2147483655,
+ "features": 0
+ },
+ {
+ "cpuid-register": "ECX",
+ "cpuid-input-eax": 2147483649,
+ "features": 33
+ },
+ {
+ "cpuid-register": "EDX",
+ "cpuid-input-eax": 2147483649,
+ "features": 739248128
+ },
+ {
+ "cpuid-register": "EBX",
+ "cpuid-input-ecx": 0,
+ "cpuid-input-eax": 7,
+ "features": 1963
+ },
+ {
+ "cpuid-register": "ECX",
+ "cpuid-input-eax": 1,
+ "features": 4160369187
+ },
+ {
+ "cpuid-register": "EDX",
+ "cpuid-input-eax": 1,
+ "features": 260832255
+ }
+ ],
+ "id": "feature-words"
+}
+
+{
+ "return": 6,
+ "id": "family"
+}
+
+{
+ "return": 69,
+ "id": "model"
+}
+
+{
+ "return": 1,
+ "id": "stepping"
+}
+
+{
+ "return": "Intel(R) Core(TM) i7-4600U CPU @ 2.10GHz",
+ "id": "model-id"
+}
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-4600U.xml
b/tests/cputestdata/x86-cpuid-Core-i7-4600U.xml
new file mode 100644
index 0000000..4c0c259
--- /dev/null
+++ b/tests/cputestdata/x86-cpuid-Core-i7-4600U.xml
@@ -0,0 +1,34 @@
+<!-- Intel(R) Core(TM) i7-4600U CPU @ 2.10GHz -->
+<cpudata arch='x86'>
+ <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000d' ebx='0x756e6547'
ecx='0x6c65746e' edx='0x49656e69'/>
+ <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00040651' ebx='0x02100800'
ecx='0x7ffafbff' edx='0xbfebfbff'/>
+ <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x76036301' ebx='0x00f0b5ff'
ecx='0x00000000' edx='0x00c10000'/>
+ <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000'
ecx='0x00000000' edx='0x00000000'/>
+ <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x1c004121' ebx='0x01c0003f'
ecx='0x0000003f' edx='0x00000000'/>
+ <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x1c004122' ebx='0x01c0003f'
ecx='0x0000003f' edx='0x00000000'/>
+ <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x1c004143' ebx='0x01c0003f'
ecx='0x000001ff' edx='0x00000000'/>
+ <cpuid eax_in='0x00000004' ecx_in='0x03' eax='0x1c03c163' ebx='0x03c0003f'
ecx='0x00000fff' edx='0x00000006'/>
+ <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040'
ecx='0x00000003' edx='0x11142120'/>
+ <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000077' ebx='0x00000002'
ecx='0x00000009' edx='0x00000000'/>
+ <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x000027ab'
ecx='0x00000000' edx='0x00000000'/>
+ <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000000' ebx='0x00000000'
ecx='0x00000000' edx='0x00000000'/>
+ <cpuid eax_in='0x00000009' ecx_in='0x00' eax='0x00000000' ebx='0x00000000'
ecx='0x00000000' edx='0x00000000'/>
+ <cpuid eax_in='0x0000000a' ecx_in='0x00' eax='0x07300403' ebx='0x00000000'
ecx='0x00000000' edx='0x00000603'/>
+ <cpuid eax_in='0x0000000b' ecx_in='0x00' eax='0x00000001' ebx='0x00000002'
ecx='0x00000100' edx='0x00000002'/>
+ <cpuid eax_in='0x0000000b' ecx_in='0x01' eax='0x00000004' ebx='0x00000004'
ecx='0x00000201' edx='0x00000002'/>
+ <cpuid eax_in='0x0000000c' ecx_in='0x00' eax='0x00000000' ebx='0x00000000'
ecx='0x00000000' edx='0x00000000'/>
+ <cpuid eax_in='0x0000000d' ecx_in='0x00' eax='0x00000007' ebx='0x00000340'
ecx='0x00000340' edx='0x00000000'/>
+ <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x00000001' ebx='0x00000000'
ecx='0x00000000' edx='0x00000000'/>
+ <cpuid eax_in='0x0000000d' ecx_in='0x02' eax='0x00000100' ebx='0x00000240'
ecx='0x00000000' edx='0x00000000'/>
+ <cpuid eax_in='0x80000000' ecx_in='0x00' eax='0x80000008' ebx='0x00000000'
ecx='0x00000000' edx='0x00000000'/>
+ <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000'
ecx='0x00000021' edx='0x2c100800'/>
+ <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x65746e49' ebx='0x2952286c'
ecx='0x726f4320' edx='0x4d542865'/>
+ <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x37692029' ebx='0x3036342d'
ecx='0x43205530' edx='0x40205550'/>
+ <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x312e3220' ebx='0x7a484730'
ecx='0x00000000' edx='0x00000000'/>
+ <cpuid eax_in='0x80000005' ecx_in='0x00' eax='0x00000000' ebx='0x00000000'
ecx='0x00000000' edx='0x00000000'/>
+ <cpuid eax_in='0x80000006' ecx_in='0x00' eax='0x00000000' ebx='0x00000000'
ecx='0x01006040' edx='0x00000000'/>
+ <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000'
ecx='0x00000000' edx='0x00000100'/>
+ <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003027' ebx='0x00000000'
ecx='0x00000000' edx='0x00000000'/>
+ <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x00000007' ebx='0x00000340'
ecx='0x00000340' edx='0x00000000'/>
+ <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x00000007' ebx='0x00000340'
ecx='0x00000340' edx='0x00000000'/>
+</cpudata>
--
2.8.3
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
