Signed-off-by: Jiri Denemark <jdenemar@xxxxxxxxxx> --- tests/cputest.c | 1 + tests/cputestdata/x86-cpuid-Core2-E6850-guest.xml | 21 +++++++ tests/cputestdata/x86-cpuid-Core2-E6850-host.xml | 21 +++++++ tests/cputestdata/x86-cpuid-Core2-E6850-json.xml | 11 ++++ tests/cputestdata/x86-cpuid-Core2-E6850.json | 77 +++++++++++++++++++++++ tests/cputestdata/x86-cpuid-Core2-E6850.xml | 27 ++++++++ 6 files changed, 158 insertions(+) create mode 100644 tests/cputestdata/x86-cpuid-Core2-E6850-guest.xml create mode 100644 tests/cputestdata/x86-cpuid-Core2-E6850-host.xml create mode 100644 tests/cputestdata/x86-cpuid-Core2-E6850-json.xml create mode 100644 tests/cputestdata/x86-cpuid-Core2-E6850.json create mode 100644 tests/cputestdata/x86-cpuid-Core2-E6850.xml diff --git a/tests/cputest.c b/tests/cputest.c index ec1db82..344edcf 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -854,6 +854,7 @@ mymain(void) DO_TEST_CPUID("x86", "Core-i7-3770", true); DO_TEST_CPUID("x86", "Core-i7-4600U", true); DO_TEST_CPUID("x86", "Core-i7-5600U", true); + DO_TEST_CPUID("x86", "Core2-E6850", true); #if WITH_QEMU && WITH_YAJL qemuTestDriverFree(&driver); diff --git a/tests/cputestdata/x86-cpuid-Core2-E6850-guest.xml b/tests/cputestdata/x86-cpuid-Core2-E6850-guest.xml new file mode 100644 index 0000000..d9df03e --- /dev/null +++ b/tests/cputestdata/x86-cpuid-Core2-E6850-guest.xml @@ -0,0 +1,21 @@ +<cpu mode='custom' match='exact'> + <arch>x86_64</arch> + <model fallback='forbid'>core2duo</model> + <vendor>Intel</vendor> + <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='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='cx16'/> + <feature policy='require' name='xtpr'/> + <feature policy='require' name='pdcm'/> + <feature policy='require' name='lahf_lm'/> +</cpu> diff --git a/tests/cputestdata/x86-cpuid-Core2-E6850-host.xml b/tests/cputestdata/x86-cpuid-Core2-E6850-host.xml new file mode 100644 index 0000000..c5ca1cb --- /dev/null +++ b/tests/cputestdata/x86-cpuid-Core2-E6850-host.xml @@ -0,0 +1,21 @@ +<cpu> + <arch>x86_64</arch> + <model>core2duo</model> + <vendor>Intel</vendor> + <feature name='ds'/> + <feature name='acpi'/> + <feature name='ss'/> + <feature name='ht'/> + <feature name='tm'/> + <feature name='pbe'/> + <feature name='dtes64'/> + <feature name='ds_cpl'/> + <feature name='vmx'/> + <feature name='smx'/> + <feature name='est'/> + <feature name='tm2'/> + <feature name='cx16'/> + <feature name='xtpr'/> + <feature name='pdcm'/> + <feature name='lahf_lm'/> +</cpu> diff --git a/tests/cputestdata/x86-cpuid-Core2-E6850-json.xml b/tests/cputestdata/x86-cpuid-Core2-E6850-json.xml new file mode 100644 index 0000000..ddd7307 --- /dev/null +++ b/tests/cputestdata/x86-cpuid-Core2-E6850-json.xml @@ -0,0 +1,11 @@ +<cpu mode='custom' match='exact'> + <arch>x86_64</arch> + <model fallback='forbid'>Penryn</model> + <feature policy='require' name='vme'/> + <feature policy='require' name='ss'/> + <feature policy='require' name='x2apic'/> + <feature policy='require' name='tsc-deadline'/> + <feature policy='require' name='hypervisor'/> + <feature policy='require' name='tsc_adjust'/> + <feature policy='disable' name='sse4.1'/> +</cpu> diff --git a/tests/cputestdata/x86-cpuid-Core2-E6850.json b/tests/cputestdata/x86-cpuid-Core2-E6850.json new file mode 100644 index 0000000..44be368 --- /dev/null +++ b/tests/cputestdata/x86-cpuid-Core2-E6850.json @@ -0,0 +1,77 @@ +{ + "return": [ + { + "cpuid-register": "EAX", + "cpuid-input-ecx": 1, + "cpuid-input-eax": 13, + "features": 0 + }, + { + "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": 1 + }, + { + "cpuid-register": "EDX", + "cpuid-input-eax": 2147483649, + "features": 537921536 + }, + { + "cpuid-register": "EBX", + "cpuid-input-ecx": 0, + "cpuid-input-eax": 7, + "features": 2 + }, + { + "cpuid-register": "ECX", + "cpuid-input-eax": 1, + "features": 2166366721 + }, + { + "cpuid-register": "EDX", + "cpuid-input-eax": 1, + "features": 260832255 + } + ], + "id": "feature-words" +} + +{ + "return": 6, + "id": "family" +} + +{ + "return": 15, + "id": "model" +} + +{ + "return": 11, + "id": "stepping" +} + +{ + "return": "Intel(R) Core(TM)2 Duo CPU E6850 @ 3.00GHz", + "id": "model-id" +} diff --git a/tests/cputestdata/x86-cpuid-Core2-E6850.xml b/tests/cputestdata/x86-cpuid-Core2-E6850.xml new file mode 100644 index 0000000..d832076 --- /dev/null +++ b/tests/cputestdata/x86-cpuid-Core2-E6850.xml @@ -0,0 +1,27 @@ +<!-- Intel(R) Core(TM)2 Duo CPU E6850 @ 3.00GHz --> +<cpudata arch='x86'> + <cpuid eax_in='0x00000000' ecx_in='0x00' eax='0x0000000a' ebx='0x756e6547' ecx='0x6c65746e' edx='0x49656e69'/> + <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x000006fb' ebx='0x01020800' ecx='0x0000e3fd' edx='0xbfebfbff'/> + <cpuid eax_in='0x00000002' ecx_in='0x00' eax='0x05b0b101' ebx='0x005657f0' ecx='0x00000000' edx='0x2cb43049'/> + <cpuid eax_in='0x00000003' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x00000004' ecx_in='0x00' eax='0x04000121' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000001'/> + <cpuid eax_in='0x00000004' ecx_in='0x01' eax='0x04000122' ebx='0x01c0003f' ecx='0x0000003f' edx='0x00000001'/> + <cpuid eax_in='0x00000004' ecx_in='0x02' eax='0x04004143' ebx='0x03c0003f' ecx='0x00000fff' edx='0x00000001'/> + <cpuid eax_in='0x00000005' ecx_in='0x00' eax='0x00000040' ebx='0x00000040' ecx='0x00000003' edx='0x00000220'/> + <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000001' ebx='0x00000002' ecx='0x00000001' edx='0x00000000'/> + <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x00000008' ecx_in='0x00' eax='0x00000400' 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='0x07280202' ebx='0x00000000' ecx='0x00000000' edx='0x00000503'/> + <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='0x00000001' edx='0x20100800'/> + <cpuid eax_in='0x80000002' ecx_in='0x00' eax='0x65746e49' ebx='0x2952286c' ecx='0x726f4320' edx='0x4d542865'/> + <cpuid eax_in='0x80000003' ecx_in='0x00' eax='0x44203229' ebx='0x43206f75' ecx='0x20205550' edx='0x45202020'/> + <cpuid eax_in='0x80000004' ecx_in='0x00' eax='0x30353836' ebx='0x20402020' ecx='0x30302e33' edx='0x007a4847'/> + <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='0x10008040' edx='0x00000000'/> + <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00003024' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/> + <cpuid eax_in='0x80860000' ecx_in='0x00' eax='0x07280202' ebx='0x00000000' ecx='0x00000000' edx='0x00000503'/> + <cpuid eax_in='0xc0000000' ecx_in='0x00' eax='0x07280202' ebx='0x00000000' ecx='0x00000000' edx='0x00000503'/> +</cpudata> -- 2.8.3 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list