]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
cputest: Rename x86 data files
authorJiri Denemark <jdenemar@redhat.com>
Mon, 13 Feb 2017 13:12:28 +0000 (14:12 +0100)
committerJiri Denemark <jdenemar@redhat.com>
Fri, 24 Feb 2017 13:10:57 +0000 (14:10 +0100)
While "x86" is a CPU sub driver name, it is not a recognized name of any
architecture known to libvirt. Let's use "x86_64" prefix which can be
used with virArch APIs.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
211 files changed:
tests/cputest.c
tests/cputestdata/cpu-parse.sh
tests/cputestdata/x86_64-Haswell-noTSX-nofallback.xml [moved from tests/cputestdata/x86-Haswell-noTSX-nofallback.xml with 100% similarity]
tests/cputestdata/x86_64-Haswell-noTSX.xml [moved from tests/cputestdata/x86-Haswell-noTSX.xml with 100% similarity]
tests/cputestdata/x86_64-Haswell.xml [moved from tests/cputestdata/x86-Haswell.xml with 100% similarity]
tests/cputestdata/x86_64-baseline-1-result.xml [moved from tests/cputestdata/x86-baseline-1-result.xml with 100% similarity]
tests/cputestdata/x86_64-baseline-1.xml [moved from tests/cputestdata/x86-baseline-1.xml with 100% similarity]
tests/cputestdata/x86_64-baseline-2-result.xml [moved from tests/cputestdata/x86-baseline-2-result.xml with 100% similarity]
tests/cputestdata/x86_64-baseline-2.xml [moved from tests/cputestdata/x86-baseline-2.xml with 100% similarity]
tests/cputestdata/x86_64-baseline-3-expanded.xml [moved from tests/cputestdata/x86-baseline-3-expanded.xml with 100% similarity]
tests/cputestdata/x86_64-baseline-3-result.xml [moved from tests/cputestdata/x86-baseline-3-result.xml with 100% similarity]
tests/cputestdata/x86_64-baseline-3.xml [moved from tests/cputestdata/x86-baseline-3.xml with 100% similarity]
tests/cputestdata/x86_64-baseline-4-expanded.xml [moved from tests/cputestdata/x86-baseline-4-expanded.xml with 100% similarity]
tests/cputestdata/x86_64-baseline-4-result.xml [moved from tests/cputestdata/x86-baseline-4-result.xml with 100% similarity]
tests/cputestdata/x86_64-baseline-4.xml [moved from tests/cputestdata/x86-baseline-4.xml with 100% similarity]
tests/cputestdata/x86_64-baseline-5-expanded.xml [moved from tests/cputestdata/x86-baseline-5-expanded.xml with 100% similarity]
tests/cputestdata/x86_64-baseline-5-result.xml [moved from tests/cputestdata/x86-baseline-5-result.xml with 100% similarity]
tests/cputestdata/x86_64-baseline-5.xml [moved from tests/cputestdata/x86-baseline-5.xml with 100% similarity]
tests/cputestdata/x86_64-baseline-6-migratable.xml [moved from tests/cputestdata/x86-baseline-6-migratable.xml with 100% similarity]
tests/cputestdata/x86_64-baseline-6-result.xml [moved from tests/cputestdata/x86-baseline-6-result.xml with 100% similarity]
tests/cputestdata/x86_64-baseline-6.xml [moved from tests/cputestdata/x86-baseline-6.xml with 100% similarity]
tests/cputestdata/x86_64-baseline-7-result.xml [moved from tests/cputestdata/x86-baseline-7-result.xml with 100% similarity]
tests/cputestdata/x86_64-baseline-7.xml [moved from tests/cputestdata/x86-baseline-7.xml with 100% similarity]
tests/cputestdata/x86_64-baseline-8-result.xml [moved from tests/cputestdata/x86-baseline-8-result.xml with 100% similarity]
tests/cputestdata/x86_64-baseline-8.xml [moved from tests/cputestdata/x86-baseline-8.xml with 100% similarity]
tests/cputestdata/x86_64-baseline-incompatible-vendors.xml [moved from tests/cputestdata/x86-baseline-incompatible-vendors.xml with 100% similarity]
tests/cputestdata/x86_64-baseline-no-vendor-result.xml [moved from tests/cputestdata/x86-baseline-no-vendor-result.xml with 100% similarity]
tests/cputestdata/x86_64-baseline-no-vendor.xml [moved from tests/cputestdata/x86-baseline-no-vendor.xml with 100% similarity]
tests/cputestdata/x86_64-baseline-some-vendors-result.xml [moved from tests/cputestdata/x86-baseline-some-vendors-result.xml with 100% similarity]
tests/cputestdata/x86_64-baseline-some-vendors.xml [moved from tests/cputestdata/x86-baseline-some-vendors.xml with 100% similarity]
tests/cputestdata/x86_64-bogus-feature.xml [moved from tests/cputestdata/x86-bogus-feature.xml with 100% similarity]
tests/cputestdata/x86_64-bogus-model.xml [moved from tests/cputestdata/x86-bogus-model.xml with 100% similarity]
tests/cputestdata/x86_64-bogus-vendor.xml [moved from tests/cputestdata/x86-bogus-vendor.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-A10-5800K-guest.xml [moved from tests/cputestdata/x86-cpuid-A10-5800K-guest.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml [moved from tests/cputestdata/x86-cpuid-A10-5800K-host.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-A10-5800K-json.xml [moved from tests/cputestdata/x86-cpuid-A10-5800K-json.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-A10-5800K.json [moved from tests/cputestdata/x86-cpuid-A10-5800K.json with 100% similarity]
tests/cputestdata/x86_64-cpuid-A10-5800K.xml [moved from tests/cputestdata/x86-cpuid-A10-5800K.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Atom-D510-guest.xml [moved from tests/cputestdata/x86-cpuid-Atom-D510-guest.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml [moved from tests/cputestdata/x86-cpuid-Atom-D510-host.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Atom-D510.xml [moved from tests/cputestdata/x86-cpuid-Atom-D510.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Atom-N450-guest.xml [moved from tests/cputestdata/x86-cpuid-Atom-N450-guest.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml [moved from tests/cputestdata/x86-cpuid-Atom-N450-host.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Atom-N450.xml [moved from tests/cputestdata/x86-cpuid-Atom-N450.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i5-2500-guest.xml [moved from tests/cputestdata/x86-cpuid-Core-i5-2500-guest.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i5-2500-host.xml [moved from tests/cputestdata/x86-cpuid-Core-i5-2500-host.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i5-2500-json.xml [moved from tests/cputestdata/x86-cpuid-Core-i5-2500-json.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i5-2500.json [moved from tests/cputestdata/x86-cpuid-Core-i5-2500.json with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i5-2500.xml [moved from tests/cputestdata/x86-cpuid-Core-i5-2500.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i5-2540M-guest.xml [moved from tests/cputestdata/x86-cpuid-Core-i5-2540M-guest.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i5-2540M-host.xml [moved from tests/cputestdata/x86-cpuid-Core-i5-2540M-host.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i5-2540M-json.xml [moved from tests/cputestdata/x86-cpuid-Core-i5-2540M-json.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i5-2540M.json [moved from tests/cputestdata/x86-cpuid-Core-i5-2540M.json with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i5-2540M.xml [moved from tests/cputestdata/x86-cpuid-Core-i5-2540M.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i5-4670T-guest.xml [moved from tests/cputestdata/x86-cpuid-Core-i5-4670T-guest.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml [moved from tests/cputestdata/x86-cpuid-Core-i5-4670T-host.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i5-4670T-json.xml [moved from tests/cputestdata/x86-cpuid-Core-i5-4670T-json.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i5-4670T.json [moved from tests/cputestdata/x86-cpuid-Core-i5-4670T.json with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i5-4670T.xml [moved from tests/cputestdata/x86-cpuid-Core-i5-4670T.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml [moved from tests/cputestdata/x86-cpuid-Core-i5-6600-guest.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml [moved from tests/cputestdata/x86-cpuid-Core-i5-6600-host.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i5-6600-json.xml [moved from tests/cputestdata/x86-cpuid-Core-i5-6600-json.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i5-6600.json [moved from tests/cputestdata/x86-cpuid-Core-i5-6600.json with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i5-6600.xml [moved from tests/cputestdata/x86-cpuid-Core-i5-6600.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i7-2600-guest.xml [moved from tests/cputestdata/x86-cpuid-Core-i7-2600-guest.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i7-2600-host.xml [moved from tests/cputestdata/x86-cpuid-Core-i7-2600-host.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i7-2600-json.xml [moved from tests/cputestdata/x86-cpuid-Core-i7-2600-json.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i7-2600.json [moved from tests/cputestdata/x86-cpuid-Core-i7-2600.json with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i7-2600.xml [moved from tests/cputestdata/x86-cpuid-Core-i7-2600.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i7-3520M-guest.xml [moved from tests/cputestdata/x86-cpuid-Core-i7-3520M-guest.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i7-3520M-host.xml [moved from tests/cputestdata/x86-cpuid-Core-i7-3520M-host.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i7-3520M.xml [moved from tests/cputestdata/x86-cpuid-Core-i7-3520M.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-guest.xml [moved from tests/cputestdata/x86-cpuid-Core-i7-3740QM-guest.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-host.xml [moved from tests/cputestdata/x86-cpuid-Core-i7-3740QM-host.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-json.xml [moved from tests/cputestdata/x86-cpuid-Core-i7-3740QM-json.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i7-3740QM.json [moved from tests/cputestdata/x86-cpuid-Core-i7-3740QM.json with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i7-3740QM.xml [moved from tests/cputestdata/x86-cpuid-Core-i7-3740QM.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i7-3770-guest.xml [moved from tests/cputestdata/x86-cpuid-Core-i7-3770-guest.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i7-3770-host.xml [moved from tests/cputestdata/x86-cpuid-Core-i7-3770-host.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i7-3770-json.xml [moved from tests/cputestdata/x86-cpuid-Core-i7-3770-json.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i7-3770.json [moved from tests/cputestdata/x86-cpuid-Core-i7-3770.json with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i7-3770.xml [moved from tests/cputestdata/x86-cpuid-Core-i7-3770.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i7-4600U-guest.xml [moved from tests/cputestdata/x86-cpuid-Core-i7-4600U-guest.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml [moved from tests/cputestdata/x86-cpuid-Core-i7-4600U-host.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i7-4600U-json.xml [moved from tests/cputestdata/x86-cpuid-Core-i7-4600U-json.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i7-4600U.json [moved from tests/cputestdata/x86-cpuid-Core-i7-4600U.json with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i7-4600U.xml [moved from tests/cputestdata/x86-cpuid-Core-i7-4600U.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml [moved from tests/cputestdata/x86-cpuid-Core-i7-5600U-guest.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml [moved from tests/cputestdata/x86-cpuid-Core-i7-5600U-host.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i7-5600U-json.xml [moved from tests/cputestdata/x86-cpuid-Core-i7-5600U-json.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i7-5600U.json [moved from tests/cputestdata/x86-cpuid-Core-i7-5600U.json with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core-i7-5600U.xml [moved from tests/cputestdata/x86-cpuid-Core-i7-5600U.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core2-E6850-guest.xml [moved from tests/cputestdata/x86-cpuid-Core2-E6850-guest.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core2-E6850-host.xml [moved from tests/cputestdata/x86-cpuid-Core2-E6850-host.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core2-E6850-json.xml [moved from tests/cputestdata/x86-cpuid-Core2-E6850-json.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core2-E6850.json [moved from tests/cputestdata/x86-cpuid-Core2-E6850.json with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core2-E6850.xml [moved from tests/cputestdata/x86-cpuid-Core2-E6850.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core2-Q9500-guest.xml [moved from tests/cputestdata/x86-cpuid-Core2-Q9500-guest.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml [moved from tests/cputestdata/x86-cpuid-Core2-Q9500-host.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Core2-Q9500.xml [moved from tests/cputestdata/x86-cpuid-Core2-Q9500.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-FX-8150-guest.xml [moved from tests/cputestdata/x86-cpuid-FX-8150-guest.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-FX-8150-host.xml [moved from tests/cputestdata/x86-cpuid-FX-8150-host.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-FX-8150.xml [moved from tests/cputestdata/x86-cpuid-FX-8150.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Opteron-1352-guest.xml [moved from tests/cputestdata/x86-cpuid-Opteron-1352-guest.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml [moved from tests/cputestdata/x86-cpuid-Opteron-1352-host.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Opteron-1352.xml [moved from tests/cputestdata/x86-cpuid-Opteron-1352.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Opteron-2350-guest.xml [moved from tests/cputestdata/x86-cpuid-Opteron-2350-guest.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml [moved from tests/cputestdata/x86-cpuid-Opteron-2350-host.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Opteron-2350-json.xml [moved from tests/cputestdata/x86-cpuid-Opteron-2350-json.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Opteron-2350.json [moved from tests/cputestdata/x86-cpuid-Opteron-2350.json with 100% similarity]
tests/cputestdata/x86_64-cpuid-Opteron-2350.xml [moved from tests/cputestdata/x86-cpuid-Opteron-2350.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Opteron-6234-guest.xml [moved from tests/cputestdata/x86-cpuid-Opteron-6234-guest.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml [moved from tests/cputestdata/x86-cpuid-Opteron-6234-host.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Opteron-6234-json.xml [moved from tests/cputestdata/x86-cpuid-Opteron-6234-json.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Opteron-6234.json [moved from tests/cputestdata/x86-cpuid-Opteron-6234.json with 100% similarity]
tests/cputestdata/x86_64-cpuid-Opteron-6234.xml [moved from tests/cputestdata/x86-cpuid-Opteron-6234.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Opteron-6282-guest.xml [moved from tests/cputestdata/x86-cpuid-Opteron-6282-guest.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml [moved from tests/cputestdata/x86-cpuid-Opteron-6282-host.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Opteron-6282.xml [moved from tests/cputestdata/x86-cpuid-Opteron-6282.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Pentium-P6100-guest.xml [moved from tests/cputestdata/x86-cpuid-Pentium-P6100-guest.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml [moved from tests/cputestdata/x86-cpuid-Pentium-P6100-host.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Pentium-P6100.xml [moved from tests/cputestdata/x86-cpuid-Pentium-P6100.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Phenom-B95-guest.xml [moved from tests/cputestdata/x86-cpuid-Phenom-B95-guest.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml [moved from tests/cputestdata/x86-cpuid-Phenom-B95-host.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml [moved from tests/cputestdata/x86-cpuid-Phenom-B95-json.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Phenom-B95.json [moved from tests/cputestdata/x86-cpuid-Phenom-B95.json with 100% similarity]
tests/cputestdata/x86_64-cpuid-Phenom-B95.xml [moved from tests/cputestdata/x86-cpuid-Phenom-B95.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Xeon-5110-guest.xml [moved from tests/cputestdata/x86-cpuid-Xeon-5110-guest.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Xeon-5110-host.xml [moved from tests/cputestdata/x86-cpuid-Xeon-5110-host.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Xeon-5110.xml [moved from tests/cputestdata/x86-cpuid-Xeon-5110.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-guest.xml [moved from tests/cputestdata/x86-cpuid-Xeon-E3-1245-guest.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-host.xml [moved from tests/cputestdata/x86-cpuid-Xeon-E3-1245-host.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-json.xml [moved from tests/cputestdata/x86-cpuid-Xeon-E3-1245-json.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.json [moved from tests/cputestdata/x86-cpuid-Xeon-E3-1245.json with 100% similarity]
tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.xml [moved from tests/cputestdata/x86-cpuid-Xeon-E3-1245.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-guest.xml [moved from tests/cputestdata/x86-cpuid-Xeon-E5-2630-guest.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-host.xml [moved from tests/cputestdata/x86-cpuid-Xeon-E5-2630-host.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-json.xml [moved from tests/cputestdata/x86-cpuid-Xeon-E5-2630-json.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Xeon-E5-2630.json [moved from tests/cputestdata/x86-cpuid-Xeon-E5-2630.json with 100% similarity]
tests/cputestdata/x86_64-cpuid-Xeon-E5-2630.xml [moved from tests/cputestdata/x86-cpuid-Xeon-E5-2630.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-guest.xml [moved from tests/cputestdata/x86-cpuid-Xeon-E5-2650-guest.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml [moved from tests/cputestdata/x86-cpuid-Xeon-E5-2650-host.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-json.xml [moved from tests/cputestdata/x86-cpuid-Xeon-E5-2650-json.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.json [moved from tests/cputestdata/x86-cpuid-Xeon-E5-2650.json with 100% similarity]
tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.xml [moved from tests/cputestdata/x86-cpuid-Xeon-E5-2650.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-guest.xml [moved from tests/cputestdata/x86-cpuid-Xeon-E7-4820-guest.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-host.xml [moved from tests/cputestdata/x86-cpuid-Xeon-E7-4820-host.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-json.xml [moved from tests/cputestdata/x86-cpuid-Xeon-E7-4820-json.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Xeon-E7-4820.json [moved from tests/cputestdata/x86-cpuid-Xeon-E7-4820.json with 100% similarity]
tests/cputestdata/x86_64-cpuid-Xeon-E7-4820.xml [moved from tests/cputestdata/x86-cpuid-Xeon-E7-4820.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Xeon-W3520-guest.xml [moved from tests/cputestdata/x86-cpuid-Xeon-W3520-guest.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Xeon-W3520-host.xml [moved from tests/cputestdata/x86-cpuid-Xeon-W3520-host.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Xeon-W3520-json.xml [moved from tests/cputestdata/x86-cpuid-Xeon-W3520-json.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Xeon-W3520.json [moved from tests/cputestdata/x86-cpuid-Xeon-W3520.json with 100% similarity]
tests/cputestdata/x86_64-cpuid-Xeon-W3520.xml [moved from tests/cputestdata/x86-cpuid-Xeon-W3520.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Xeon-X5460-guest.xml [moved from tests/cputestdata/x86-cpuid-Xeon-X5460-guest.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml [moved from tests/cputestdata/x86-cpuid-Xeon-X5460-host.xml with 100% similarity]
tests/cputestdata/x86_64-cpuid-Xeon-X5460.xml [moved from tests/cputestdata/x86-cpuid-Xeon-X5460.xml with 100% similarity]
tests/cputestdata/x86_64-exact-disable-extra.xml [moved from tests/cputestdata/x86-exact-disable-extra.xml with 100% similarity]
tests/cputestdata/x86_64-exact-disable.xml [moved from tests/cputestdata/x86-exact-disable.xml with 100% similarity]
tests/cputestdata/x86_64-exact-disable2.xml [moved from tests/cputestdata/x86-exact-disable2.xml with 100% similarity]
tests/cputestdata/x86_64-exact-forbid-extra.xml [moved from tests/cputestdata/x86-exact-forbid-extra.xml with 100% similarity]
tests/cputestdata/x86_64-exact-forbid.xml [moved from tests/cputestdata/x86-exact-forbid.xml with 100% similarity]
tests/cputestdata/x86_64-exact-force-Haswell.xml [moved from tests/cputestdata/x86-exact-force-Haswell.xml with 100% similarity]
tests/cputestdata/x86_64-exact-force.xml [moved from tests/cputestdata/x86-exact-force.xml with 100% similarity]
tests/cputestdata/x86_64-exact-require-extra.xml [moved from tests/cputestdata/x86-exact-require-extra.xml with 100% similarity]
tests/cputestdata/x86_64-exact-require.xml [moved from tests/cputestdata/x86-exact-require.xml with 100% similarity]
tests/cputestdata/x86_64-exact.xml [moved from tests/cputestdata/x86-exact.xml with 100% similarity]
tests/cputestdata/x86_64-guest-nofallback.xml [moved from tests/cputestdata/x86-guest-nofallback.xml with 100% similarity]
tests/cputestdata/x86_64-guest.xml [moved from tests/cputestdata/x86-guest.xml with 100% similarity]
tests/cputestdata/x86_64-host+guest,model486-result.xml [moved from tests/cputestdata/x86-host+guest,model486-result.xml with 100% similarity]
tests/cputestdata/x86_64-host+guest,models-result.xml [moved from tests/cputestdata/x86-host+guest,models-result.xml with 100% similarity]
tests/cputestdata/x86_64-host+guest-result.xml [moved from tests/cputestdata/x86-host+guest-result.xml with 100% similarity]
tests/cputestdata/x86_64-host+guest.xml [moved from tests/cputestdata/x86-host+guest.xml with 100% similarity]
tests/cputestdata/x86_64-host+host+host-model,models-result.xml [moved from tests/cputestdata/x86-host+host+host-model,models-result.xml with 100% similarity]
tests/cputestdata/x86_64-host+host-model-nofallback.xml [moved from tests/cputestdata/x86-host+host-model-nofallback.xml with 100% similarity]
tests/cputestdata/x86_64-host+host-model.xml [moved from tests/cputestdata/x86-host+host-model.xml with 100% similarity]
tests/cputestdata/x86_64-host+host-passthrough-features.xml [moved from tests/cputestdata/x86-host+host-passthrough-features.xml with 100% similarity]
tests/cputestdata/x86_64-host+host-passthrough.xml [moved from tests/cputestdata/x86-host+host-passthrough.xml with 100% similarity]
tests/cputestdata/x86_64-host+min.xml [moved from tests/cputestdata/x86-host+min.xml with 100% similarity]
tests/cputestdata/x86_64-host+penryn-force-result.xml [moved from tests/cputestdata/x86-host+penryn-force-result.xml with 100% similarity]
tests/cputestdata/x86_64-host+pentium3.xml [moved from tests/cputestdata/x86-host+pentium3.xml with 100% similarity]
tests/cputestdata/x86_64-host+strict-force-extra-result.xml [moved from tests/cputestdata/x86-host+strict-force-extra-result.xml with 100% similarity]
tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell,haswell-result.xml [moved from tests/cputestdata/x86-host-Haswell-noTSX+Haswell,haswell-result.xml with 100% similarity]
tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml [moved from tests/cputestdata/x86-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml with 100% similarity]
tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX-result.xml [moved from tests/cputestdata/x86-host-Haswell-noTSX+Haswell-noTSX-result.xml with 100% similarity]
tests/cputestdata/x86_64-host-Haswell-noTSX.xml [moved from tests/cputestdata/x86-host-Haswell-noTSX.xml with 100% similarity]
tests/cputestdata/x86_64-host-SandyBridge.xml [moved from tests/cputestdata/x86-host-SandyBridge.xml with 100% similarity]
tests/cputestdata/x86_64-host-amd-fake.xml [moved from tests/cputestdata/x86-host-amd-fake.xml with 100% similarity]
tests/cputestdata/x86_64-host-amd.xml [moved from tests/cputestdata/x86-host-amd.xml with 100% similarity]
tests/cputestdata/x86_64-host-better+pentium3-result.xml [moved from tests/cputestdata/x86-host-better+pentium3-result.xml with 100% similarity]
tests/cputestdata/x86_64-host-better.xml [moved from tests/cputestdata/x86-host-better.xml with 100% similarity]
tests/cputestdata/x86_64-host-incomp-arch.xml [moved from tests/cputestdata/x86-host-incomp-arch.xml with 100% similarity]
tests/cputestdata/x86_64-host-invtsc+host-model.xml [moved from tests/cputestdata/x86-host-invtsc+host-model.xml with 100% similarity]
tests/cputestdata/x86_64-host-invtsc.xml [moved from tests/cputestdata/x86-host-invtsc.xml with 100% similarity]
tests/cputestdata/x86_64-host-model-nofallback.xml [moved from tests/cputestdata/x86-host-model-nofallback.xml with 100% similarity]
tests/cputestdata/x86_64-host-model.xml [moved from tests/cputestdata/x86-host-model.xml with 100% similarity]
tests/cputestdata/x86_64-host-no-vendor.xml [moved from tests/cputestdata/x86-host-no-vendor.xml with 100% similarity]
tests/cputestdata/x86_64-host-passthrough-features.xml [moved from tests/cputestdata/x86-host-passthrough-features.xml with 100% similarity]
tests/cputestdata/x86_64-host-passthrough.xml [moved from tests/cputestdata/x86-host-passthrough.xml with 100% similarity]
tests/cputestdata/x86_64-host-worse+guest-result.xml [moved from tests/cputestdata/x86-host-worse+guest-result.xml with 100% similarity]
tests/cputestdata/x86_64-host-worse.xml [moved from tests/cputestdata/x86-host-worse.xml with 100% similarity]
tests/cputestdata/x86_64-host.xml [moved from tests/cputestdata/x86-host.xml with 100% similarity]
tests/cputestdata/x86_64-min.xml [moved from tests/cputestdata/x86-min.xml with 100% similarity]
tests/cputestdata/x86_64-penryn-force.xml [moved from tests/cputestdata/x86-penryn-force.xml with 100% similarity]
tests/cputestdata/x86_64-pentium3-amd.xml [moved from tests/cputestdata/x86-pentium3-amd.xml with 100% similarity]
tests/cputestdata/x86_64-pentium3.xml [moved from tests/cputestdata/x86-pentium3.xml with 100% similarity]
tests/cputestdata/x86_64-strict-disable.xml [moved from tests/cputestdata/x86-strict-disable.xml with 100% similarity]
tests/cputestdata/x86_64-strict-force-extra.xml [moved from tests/cputestdata/x86-strict-force-extra.xml with 100% similarity]
tests/cputestdata/x86_64-strict-full.xml [moved from tests/cputestdata/x86-strict-full.xml with 100% similarity]
tests/cputestdata/x86_64-strict.xml [moved from tests/cputestdata/x86-strict.xml with 100% similarity]

index 8d761af614e4bb846612eb45797da4217cb264a0..406b40dfe2bdecbbe75d683690ee2720457d5078 100644 (file)
@@ -677,13 +677,13 @@ mymain(void)
     } while (0)
 
     /* host to host comparison */
-    DO_TEST_COMPARE("x86", "host", "host", VIR_CPU_COMPARE_IDENTICAL);
-    DO_TEST_COMPARE("x86", "host", "host-better", VIR_CPU_COMPARE_INCOMPATIBLE);
-    DO_TEST_COMPARE("x86", "host", "host-worse", VIR_CPU_COMPARE_SUPERSET);
-    DO_TEST_COMPARE("x86", "host", "host-amd-fake", VIR_CPU_COMPARE_INCOMPATIBLE);
-    DO_TEST_COMPARE("x86", "host", "host-incomp-arch", VIR_CPU_COMPARE_INCOMPATIBLE);
-    DO_TEST_COMPARE("x86", "host", "host-no-vendor", VIR_CPU_COMPARE_IDENTICAL);
-    DO_TEST_COMPARE("x86", "host-no-vendor", "host", VIR_CPU_COMPARE_INCOMPATIBLE);
+    DO_TEST_COMPARE("x86_64", "host", "host", VIR_CPU_COMPARE_IDENTICAL);
+    DO_TEST_COMPARE("x86_64", "host", "host-better", VIR_CPU_COMPARE_INCOMPATIBLE);
+    DO_TEST_COMPARE("x86_64", "host", "host-worse", VIR_CPU_COMPARE_SUPERSET);
+    DO_TEST_COMPARE("x86_64", "host", "host-amd-fake", VIR_CPU_COMPARE_INCOMPATIBLE);
+    DO_TEST_COMPARE("x86_64", "host", "host-incomp-arch", VIR_CPU_COMPARE_INCOMPATIBLE);
+    DO_TEST_COMPARE("x86_64", "host", "host-no-vendor", VIR_CPU_COMPARE_IDENTICAL);
+    DO_TEST_COMPARE("x86_64", "host-no-vendor", "host", VIR_CPU_COMPARE_INCOMPATIBLE);
 
     DO_TEST_COMPARE("ppc64", "host", "host", VIR_CPU_COMPARE_IDENTICAL);
     DO_TEST_COMPARE("ppc64", "host", "host-better", VIR_CPU_COMPARE_INCOMPATIBLE);
@@ -693,28 +693,28 @@ mymain(void)
     DO_TEST_COMPARE("ppc64", "host-no-vendor", "host", VIR_CPU_COMPARE_INCOMPATIBLE);
 
     /* guest to host comparison */
-    DO_TEST_COMPARE("x86", "host", "bogus-model", VIR_CPU_COMPARE_ERROR);
-    DO_TEST_COMPARE("x86", "host", "bogus-feature", VIR_CPU_COMPARE_ERROR);
-    DO_TEST_COMPARE("x86", "host", "min", VIR_CPU_COMPARE_SUPERSET);
-    DO_TEST_COMPARE("x86", "host", "pentium3", VIR_CPU_COMPARE_SUPERSET);
-    DO_TEST_COMPARE("x86", "host", "exact", VIR_CPU_COMPARE_SUPERSET);
-    DO_TEST_COMPARE("x86", "host", "exact-forbid", VIR_CPU_COMPARE_INCOMPATIBLE);
-    DO_TEST_COMPARE("x86", "host", "exact-forbid-extra", VIR_CPU_COMPARE_SUPERSET);
-    DO_TEST_COMPARE("x86", "host", "exact-disable", VIR_CPU_COMPARE_SUPERSET);
-    DO_TEST_COMPARE("x86", "host", "exact-disable2", VIR_CPU_COMPARE_SUPERSET);
-    DO_TEST_COMPARE("x86", "host", "exact-disable-extra", VIR_CPU_COMPARE_SUPERSET);
-    DO_TEST_COMPARE("x86", "host", "exact-require", VIR_CPU_COMPARE_SUPERSET);
-    DO_TEST_COMPARE("x86", "host", "exact-require-extra", VIR_CPU_COMPARE_INCOMPATIBLE);
-    DO_TEST_COMPARE("x86", "host", "exact-force", VIR_CPU_COMPARE_SUPERSET);
-    DO_TEST_COMPARE("x86", "host", "strict", VIR_CPU_COMPARE_INCOMPATIBLE);
-    DO_TEST_COMPARE("x86", "host", "strict-full", VIR_CPU_COMPARE_IDENTICAL);
-    DO_TEST_COMPARE("x86", "host", "strict-disable", VIR_CPU_COMPARE_IDENTICAL);
-    DO_TEST_COMPARE("x86", "host", "strict-force-extra", VIR_CPU_COMPARE_IDENTICAL);
-    DO_TEST_COMPARE("x86", "host", "guest", VIR_CPU_COMPARE_SUPERSET);
-    DO_TEST_COMPARE("x86", "host", "pentium3-amd", VIR_CPU_COMPARE_INCOMPATIBLE);
-    DO_TEST_COMPARE("x86", "host-amd", "pentium3-amd", VIR_CPU_COMPARE_SUPERSET);
-    DO_TEST_COMPARE("x86", "host-worse", "penryn-force", VIR_CPU_COMPARE_IDENTICAL);
-    DO_TEST_COMPARE("x86", "host-SandyBridge", "exact-force-Haswell", VIR_CPU_COMPARE_IDENTICAL);
+    DO_TEST_COMPARE("x86_64", "host", "bogus-model", VIR_CPU_COMPARE_ERROR);
+    DO_TEST_COMPARE("x86_64", "host", "bogus-feature", VIR_CPU_COMPARE_ERROR);
+    DO_TEST_COMPARE("x86_64", "host", "min", VIR_CPU_COMPARE_SUPERSET);
+    DO_TEST_COMPARE("x86_64", "host", "pentium3", VIR_CPU_COMPARE_SUPERSET);
+    DO_TEST_COMPARE("x86_64", "host", "exact", VIR_CPU_COMPARE_SUPERSET);
+    DO_TEST_COMPARE("x86_64", "host", "exact-forbid", VIR_CPU_COMPARE_INCOMPATIBLE);
+    DO_TEST_COMPARE("x86_64", "host", "exact-forbid-extra", VIR_CPU_COMPARE_SUPERSET);
+    DO_TEST_COMPARE("x86_64", "host", "exact-disable", VIR_CPU_COMPARE_SUPERSET);
+    DO_TEST_COMPARE("x86_64", "host", "exact-disable2", VIR_CPU_COMPARE_SUPERSET);
+    DO_TEST_COMPARE("x86_64", "host", "exact-disable-extra", VIR_CPU_COMPARE_SUPERSET);
+    DO_TEST_COMPARE("x86_64", "host", "exact-require", VIR_CPU_COMPARE_SUPERSET);
+    DO_TEST_COMPARE("x86_64", "host", "exact-require-extra", VIR_CPU_COMPARE_INCOMPATIBLE);
+    DO_TEST_COMPARE("x86_64", "host", "exact-force", VIR_CPU_COMPARE_SUPERSET);
+    DO_TEST_COMPARE("x86_64", "host", "strict", VIR_CPU_COMPARE_INCOMPATIBLE);
+    DO_TEST_COMPARE("x86_64", "host", "strict-full", VIR_CPU_COMPARE_IDENTICAL);
+    DO_TEST_COMPARE("x86_64", "host", "strict-disable", VIR_CPU_COMPARE_IDENTICAL);
+    DO_TEST_COMPARE("x86_64", "host", "strict-force-extra", VIR_CPU_COMPARE_IDENTICAL);
+    DO_TEST_COMPARE("x86_64", "host", "guest", VIR_CPU_COMPARE_SUPERSET);
+    DO_TEST_COMPARE("x86_64", "host", "pentium3-amd", VIR_CPU_COMPARE_INCOMPATIBLE);
+    DO_TEST_COMPARE("x86_64", "host-amd", "pentium3-amd", VIR_CPU_COMPARE_SUPERSET);
+    DO_TEST_COMPARE("x86_64", "host-worse", "penryn-force", VIR_CPU_COMPARE_IDENTICAL);
+    DO_TEST_COMPARE("x86_64", "host-SandyBridge", "exact-force-Haswell", VIR_CPU_COMPARE_IDENTICAL);
 
     DO_TEST_COMPARE("ppc64", "host", "guest-strict", VIR_CPU_COMPARE_IDENTICAL);
     DO_TEST_COMPARE("ppc64", "host", "guest-exact", VIR_CPU_COMPARE_INCOMPATIBLE);
@@ -728,14 +728,14 @@ mymain(void)
 
     /* guest updates for migration
      * automatically compares host CPU with the result */
-    DO_TEST_UPDATE("x86", "host", "min", VIR_CPU_COMPARE_IDENTICAL);
-    DO_TEST_UPDATE("x86", "host", "pentium3", VIR_CPU_COMPARE_IDENTICAL);
-    DO_TEST_UPDATE("x86", "host", "guest", VIR_CPU_COMPARE_SUPERSET);
-    DO_TEST_UPDATE("x86", "host", "host-model", VIR_CPU_COMPARE_IDENTICAL);
-    DO_TEST_UPDATE("x86", "host", "host-model-nofallback", VIR_CPU_COMPARE_IDENTICAL);
-    DO_TEST_UPDATE("x86", "host-invtsc", "host-model", VIR_CPU_COMPARE_SUPERSET);
-    DO_TEST_UPDATE_ONLY("x86", "host", "host-passthrough");
-    DO_TEST_UPDATE_ONLY("x86", "host", "host-passthrough-features");
+    DO_TEST_UPDATE("x86_64", "host", "min", VIR_CPU_COMPARE_IDENTICAL);
+    DO_TEST_UPDATE("x86_64", "host", "pentium3", VIR_CPU_COMPARE_IDENTICAL);
+    DO_TEST_UPDATE("x86_64", "host", "guest", VIR_CPU_COMPARE_SUPERSET);
+    DO_TEST_UPDATE("x86_64", "host", "host-model", VIR_CPU_COMPARE_IDENTICAL);
+    DO_TEST_UPDATE("x86_64", "host", "host-model-nofallback", VIR_CPU_COMPARE_IDENTICAL);
+    DO_TEST_UPDATE("x86_64", "host-invtsc", "host-model", VIR_CPU_COMPARE_SUPERSET);
+    DO_TEST_UPDATE_ONLY("x86_64", "host", "host-passthrough");
+    DO_TEST_UPDATE_ONLY("x86_64", "host", "host-passthrough-features");
 
     DO_TEST_UPDATE("ppc64", "host", "guest", VIR_CPU_COMPARE_IDENTICAL);
     DO_TEST_UPDATE("ppc64", "host", "guest-nofallback", VIR_CPU_COMPARE_INCOMPATIBLE);
@@ -748,21 +748,21 @@ mymain(void)
     DO_TEST_UPDATE("ppc64", "host", "guest-compat-incompatible", VIR_CPU_COMPARE_INCOMPATIBLE);
 
     /* computing baseline CPUs */
-    DO_TEST_BASELINE("x86", "incompatible-vendors", 0, -1);
-    DO_TEST_BASELINE("x86", "no-vendor", 0, 0);
-    DO_TEST_BASELINE("x86", "some-vendors", 0, 0);
-    DO_TEST_BASELINE("x86", "1", 0, 0);
-    DO_TEST_BASELINE("x86", "2", 0, 0);
-    DO_TEST_BASELINE("x86", "3", 0, 0);
-    DO_TEST_BASELINE("x86", "3", VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES, 0);
-    DO_TEST_BASELINE("x86", "4", 0, 0);
-    DO_TEST_BASELINE("x86", "4", VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES, 0);
-    DO_TEST_BASELINE("x86", "5", 0, 0);
-    DO_TEST_BASELINE("x86", "5", VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES, 0);
-    DO_TEST_BASELINE("x86", "6", 0, 0);
-    DO_TEST_BASELINE("x86", "6", VIR_CONNECT_BASELINE_CPU_MIGRATABLE, 0);
-    DO_TEST_BASELINE("x86", "7", 0, 0);
-    DO_TEST_BASELINE("x86", "8", 0, 0);
+    DO_TEST_BASELINE("x86_64", "incompatible-vendors", 0, -1);
+    DO_TEST_BASELINE("x86_64", "no-vendor", 0, 0);
+    DO_TEST_BASELINE("x86_64", "some-vendors", 0, 0);
+    DO_TEST_BASELINE("x86_64", "1", 0, 0);
+    DO_TEST_BASELINE("x86_64", "2", 0, 0);
+    DO_TEST_BASELINE("x86_64", "3", 0, 0);
+    DO_TEST_BASELINE("x86_64", "3", VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES, 0);
+    DO_TEST_BASELINE("x86_64", "4", 0, 0);
+    DO_TEST_BASELINE("x86_64", "4", VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES, 0);
+    DO_TEST_BASELINE("x86_64", "5", 0, 0);
+    DO_TEST_BASELINE("x86_64", "5", VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES, 0);
+    DO_TEST_BASELINE("x86_64", "6", 0, 0);
+    DO_TEST_BASELINE("x86_64", "6", VIR_CONNECT_BASELINE_CPU_MIGRATABLE, 0);
+    DO_TEST_BASELINE("x86_64", "7", 0, 0);
+    DO_TEST_BASELINE("x86_64", "8", 0, 0);
 
     DO_TEST_BASELINE("ppc64", "incompatible-vendors", 0, -1);
     DO_TEST_BASELINE("ppc64", "no-vendor", 0, 0);
@@ -771,29 +771,29 @@ mymain(void)
     DO_TEST_BASELINE("ppc64", "legacy", 0, -1);
 
     /* CPU features */
-    DO_TEST_HASFEATURE("x86", "host", "vmx", YES);
-    DO_TEST_HASFEATURE("x86", "host", "lm", YES);
-    DO_TEST_HASFEATURE("x86", "host", "sse4.1", YES);
-    DO_TEST_HASFEATURE("x86", "host", "3dnowext", NO);
-    DO_TEST_HASFEATURE("x86", "host", "skinit", NO);
-    DO_TEST_HASFEATURE("x86", "host", "foo", FAIL);
+    DO_TEST_HASFEATURE("x86_64", "host", "vmx", YES);
+    DO_TEST_HASFEATURE("x86_64", "host", "lm", YES);
+    DO_TEST_HASFEATURE("x86_64", "host", "sse4.1", YES);
+    DO_TEST_HASFEATURE("x86_64", "host", "3dnowext", NO);
+    DO_TEST_HASFEATURE("x86_64", "host", "skinit", NO);
+    DO_TEST_HASFEATURE("x86_64", "host", "foo", FAIL);
 
     /* computing guest data and decoding the data into a guest CPU XML */
-    DO_TEST_GUESTCPU("x86", "host", "guest", NULL, 0);
-    DO_TEST_GUESTCPU("x86", "host-better", "pentium3", NULL, 0);
-    DO_TEST_GUESTCPU("x86", "host-worse", "guest", NULL, 0);
-    DO_TEST_GUESTCPU("x86", "host", "strict-force-extra", NULL, 0);
-    DO_TEST_GUESTCPU("x86", "host", "penryn-force", NULL, 0);
-    DO_TEST_GUESTCPU("x86", "host", "guest", model486, 0);
-    DO_TEST_GUESTCPU("x86", "host", "guest", models, 0);
-    DO_TEST_GUESTCPU("x86", "host", "guest", nomodel, -1);
-    DO_TEST_GUESTCPU("x86", "host", "guest-nofallback", models, -1);
-    DO_TEST_GUESTCPU("x86", "host", "host+host-model", models, 0);
-    DO_TEST_GUESTCPU("x86", "host", "host+host-model-nofallback", models, -1);
-    DO_TEST_GUESTCPU("x86", "host-Haswell-noTSX", "Haswell", haswell, 0);
-    DO_TEST_GUESTCPU("x86", "host-Haswell-noTSX", "Haswell-noTSX", haswell, 0);
-    DO_TEST_GUESTCPU("x86", "host-Haswell-noTSX", "Haswell-noTSX-nofallback", haswell, -1);
-    DO_TEST_GUESTCPU("x86", "host-Haswell-noTSX", "Haswell-noTSX", NULL, 0);
+    DO_TEST_GUESTCPU("x86_64", "host", "guest", NULL, 0);
+    DO_TEST_GUESTCPU("x86_64", "host-better", "pentium3", NULL, 0);
+    DO_TEST_GUESTCPU("x86_64", "host-worse", "guest", NULL, 0);
+    DO_TEST_GUESTCPU("x86_64", "host", "strict-force-extra", NULL, 0);
+    DO_TEST_GUESTCPU("x86_64", "host", "penryn-force", NULL, 0);
+    DO_TEST_GUESTCPU("x86_64", "host", "guest", model486, 0);
+    DO_TEST_GUESTCPU("x86_64", "host", "guest", models, 0);
+    DO_TEST_GUESTCPU("x86_64", "host", "guest", nomodel, -1);
+    DO_TEST_GUESTCPU("x86_64", "host", "guest-nofallback", models, -1);
+    DO_TEST_GUESTCPU("x86_64", "host", "host+host-model", models, 0);
+    DO_TEST_GUESTCPU("x86_64", "host", "host+host-model-nofallback", models, -1);
+    DO_TEST_GUESTCPU("x86_64", "host-Haswell-noTSX", "Haswell", haswell, 0);
+    DO_TEST_GUESTCPU("x86_64", "host-Haswell-noTSX", "Haswell-noTSX", haswell, 0);
+    DO_TEST_GUESTCPU("x86_64", "host-Haswell-noTSX", "Haswell-noTSX-nofallback", haswell, -1);
+    DO_TEST_GUESTCPU("x86_64", "host-Haswell-noTSX", "Haswell-noTSX", NULL, 0);
 
     DO_TEST_GUESTCPU("ppc64", "host", "guest", ppc_models, 0);
     DO_TEST_GUESTCPU("ppc64", "host", "guest-nofallback", ppc_models, -1);
@@ -801,35 +801,35 @@ mymain(void)
     DO_TEST_GUESTCPU("ppc64", "host", "guest-legacy-incompatible", ppc_models, -1);
     DO_TEST_GUESTCPU("ppc64", "host", "guest-legacy-invalid", ppc_models, -1);
 
-    DO_TEST_CPUID("x86", "A10-5800K", true);
-    DO_TEST_CPUID("x86", "Atom-D510", false);
-    DO_TEST_CPUID("x86", "Atom-N450", false);
-    DO_TEST_CPUID("x86", "Core-i5-2500", true);
-    DO_TEST_CPUID("x86", "Core-i5-2540M", true);
-    DO_TEST_CPUID("x86", "Core-i5-4670T", true);
-    DO_TEST_CPUID("x86", "Core-i5-6600", true);
-    DO_TEST_CPUID("x86", "Core-i7-2600", true);
-    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);
-    DO_TEST_CPUID("x86", "Core-i7-5600U", true);
-    DO_TEST_CPUID("x86", "Core2-E6850", true);
-    DO_TEST_CPUID("x86", "Core2-Q9500", false);
-    DO_TEST_CPUID("x86", "FX-8150", false);
-    DO_TEST_CPUID("x86", "Opteron-1352", false);
-    DO_TEST_CPUID("x86", "Opteron-2350", true);
-    DO_TEST_CPUID("x86", "Opteron-6234", true);
-    DO_TEST_CPUID("x86", "Opteron-6282", false);
-    DO_TEST_CPUID("x86", "Pentium-P6100", false);
-    DO_TEST_CPUID("x86", "Phenom-B95", true);
-    DO_TEST_CPUID("x86", "Xeon-5110", false);
-    DO_TEST_CPUID("x86", "Xeon-E3-1245", true);
-    DO_TEST_CPUID("x86", "Xeon-E5-2630", true);
-    DO_TEST_CPUID("x86", "Xeon-E5-2650", true);
-    DO_TEST_CPUID("x86", "Xeon-E7-4820", true);
-    DO_TEST_CPUID("x86", "Xeon-W3520", true);
-    DO_TEST_CPUID("x86", "Xeon-X5460", false);
+    DO_TEST_CPUID("x86_64", "A10-5800K", true);
+    DO_TEST_CPUID("x86_64", "Atom-D510", false);
+    DO_TEST_CPUID("x86_64", "Atom-N450", false);
+    DO_TEST_CPUID("x86_64", "Core-i5-2500", true);
+    DO_TEST_CPUID("x86_64", "Core-i5-2540M", true);
+    DO_TEST_CPUID("x86_64", "Core-i5-4670T", true);
+    DO_TEST_CPUID("x86_64", "Core-i5-6600", true);
+    DO_TEST_CPUID("x86_64", "Core-i7-2600", true);
+    DO_TEST_CPUID("x86_64", "Core-i7-3520M", false);
+    DO_TEST_CPUID("x86_64", "Core-i7-3740QM", true);
+    DO_TEST_CPUID("x86_64", "Core-i7-3770", true);
+    DO_TEST_CPUID("x86_64", "Core-i7-4600U", true);
+    DO_TEST_CPUID("x86_64", "Core-i7-5600U", true);
+    DO_TEST_CPUID("x86_64", "Core2-E6850", true);
+    DO_TEST_CPUID("x86_64", "Core2-Q9500", false);
+    DO_TEST_CPUID("x86_64", "FX-8150", false);
+    DO_TEST_CPUID("x86_64", "Opteron-1352", false);
+    DO_TEST_CPUID("x86_64", "Opteron-2350", true);
+    DO_TEST_CPUID("x86_64", "Opteron-6234", true);
+    DO_TEST_CPUID("x86_64", "Opteron-6282", false);
+    DO_TEST_CPUID("x86_64", "Pentium-P6100", false);
+    DO_TEST_CPUID("x86_64", "Phenom-B95", true);
+    DO_TEST_CPUID("x86_64", "Xeon-5110", false);
+    DO_TEST_CPUID("x86_64", "Xeon-E3-1245", true);
+    DO_TEST_CPUID("x86_64", "Xeon-E5-2630", true);
+    DO_TEST_CPUID("x86_64", "Xeon-E5-2650", true);
+    DO_TEST_CPUID("x86_64", "Xeon-E7-4820", true);
+    DO_TEST_CPUID("x86_64", "Xeon-W3520", true);
+    DO_TEST_CPUID("x86_64", "Xeon-X5460", false);
 
 #if WITH_QEMU && WITH_YAJL
     qemuTestDriverFree(&driver);
index c3b5ef106665f46ad2a3cc3f4326ed1df1aada5b..3db401daaa079c08531a4fce9ba1ba938f37487e 100755 (executable)
@@ -18,7 +18,7 @@ fname=`sed -e 's/^ *//;
                s/ APU .*//;
                s/ \(v[0-9]\|SE\)$//;
                s/ /-/g' <<<"$model"`
-fname="x86-cpuid-$fname"
+fname="x86_64-cpuid-$fname"
 
 xml()
 {