[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH v2 26/33] cputest: Rename x86 data files



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>
---

Notes:
    Version 2:
    - fix file names created by cpu-parse.sh

 tests/cputest.c                                    | 204 ++++++++++-----------
 tests/cputestdata/cpu-parse.sh                     |   2 +-
 ...ack.xml => x86_64-Haswell-noTSX-nofallback.xml} |   0
 ...-Haswell-noTSX.xml => x86_64-Haswell-noTSX.xml} |   0
 .../{x86-Haswell.xml => x86_64-Haswell.xml}        |   0
 ...e-1-result.xml => x86_64-baseline-1-result.xml} |   0
 .../{x86-baseline-1.xml => x86_64-baseline-1.xml}  |   0
 ...e-2-result.xml => x86_64-baseline-2-result.xml} |   0
 .../{x86-baseline-2.xml => x86_64-baseline-2.xml}  |   0
 ...expanded.xml => x86_64-baseline-3-expanded.xml} |   0
 ...e-3-result.xml => x86_64-baseline-3-result.xml} |   0
 .../{x86-baseline-3.xml => x86_64-baseline-3.xml}  |   0
 ...expanded.xml => x86_64-baseline-4-expanded.xml} |   0
 ...e-4-result.xml => x86_64-baseline-4-result.xml} |   0
 .../{x86-baseline-4.xml => x86_64-baseline-4.xml}  |   0
 ...expanded.xml => x86_64-baseline-5-expanded.xml} |   0
 ...e-5-result.xml => x86_64-baseline-5-result.xml} |   0
 .../{x86-baseline-5.xml => x86_64-baseline-5.xml}  |   0
 ...atable.xml => x86_64-baseline-6-migratable.xml} |   0
 ...e-6-result.xml => x86_64-baseline-6-result.xml} |   0
 .../{x86-baseline-6.xml => x86_64-baseline-6.xml}  |   0
 ...e-7-result.xml => x86_64-baseline-7-result.xml} |   0
 .../{x86-baseline-7.xml => x86_64-baseline-7.xml}  |   0
 ...e-8-result.xml => x86_64-baseline-8-result.xml} |   0
 .../{x86-baseline-8.xml => x86_64-baseline-8.xml}  |   0
 ...ml => x86_64-baseline-incompatible-vendors.xml} |   0
 ...lt.xml => x86_64-baseline-no-vendor-result.xml} |   0
 ...no-vendor.xml => x86_64-baseline-no-vendor.xml} |   0
 ...xml => x86_64-baseline-some-vendors-result.xml} |   0
 ...endors.xml => x86_64-baseline-some-vendors.xml} |   0
 ...-bogus-feature.xml => x86_64-bogus-feature.xml} |   0
 ...{x86-bogus-model.xml => x86_64-bogus-model.xml} |   0
 ...86-bogus-vendor.xml => x86_64-bogus-vendor.xml} |   0
 ...-guest.xml => x86_64-cpuid-A10-5800K-guest.xml} |   0
 ...0K-host.xml => x86_64-cpuid-A10-5800K-host.xml} |   0
 ...0K-json.xml => x86_64-cpuid-A10-5800K-json.xml} |   0
 ...-A10-5800K.json => x86_64-cpuid-A10-5800K.json} |   0
 ...id-A10-5800K.xml => x86_64-cpuid-A10-5800K.xml} |   0
 ...-guest.xml => x86_64-cpuid-Atom-D510-guest.xml} |   0
 ...10-host.xml => x86_64-cpuid-Atom-D510-host.xml} |   0
 ...id-Atom-D510.xml => x86_64-cpuid-Atom-D510.xml} |   0
 ...-guest.xml => x86_64-cpuid-Atom-N450-guest.xml} |   0
 ...50-host.xml => x86_64-cpuid-Atom-N450-host.xml} |   0
 ...id-Atom-N450.xml => x86_64-cpuid-Atom-N450.xml} |   0
 ...est.xml => x86_64-cpuid-Core-i5-2500-guest.xml} |   0
 ...host.xml => x86_64-cpuid-Core-i5-2500-host.xml} |   0
 ...json.xml => x86_64-cpuid-Core-i5-2500-json.xml} |   0
 ...i5-2500.json => x86_64-cpuid-Core-i5-2500.json} |   0
 ...e-i5-2500.xml => x86_64-cpuid-Core-i5-2500.xml} |   0
 ...st.xml => x86_64-cpuid-Core-i5-2540M-guest.xml} |   0
 ...ost.xml => x86_64-cpuid-Core-i5-2540M-host.xml} |   0
 ...son.xml => x86_64-cpuid-Core-i5-2540M-json.xml} |   0
 ...-2540M.json => x86_64-cpuid-Core-i5-2540M.json} |   0
 ...i5-2540M.xml => x86_64-cpuid-Core-i5-2540M.xml} |   0
 ...st.xml => x86_64-cpuid-Core-i5-4670T-guest.xml} |   0
 ...ost.xml => x86_64-cpuid-Core-i5-4670T-host.xml} |   0
 ...son.xml => x86_64-cpuid-Core-i5-4670T-json.xml} |   0
 ...-4670T.json => x86_64-cpuid-Core-i5-4670T.json} |   0
 ...i5-4670T.xml => x86_64-cpuid-Core-i5-4670T.xml} |   0
 ...est.xml => x86_64-cpuid-Core-i5-6600-guest.xml} |   0
 ...host.xml => x86_64-cpuid-Core-i5-6600-host.xml} |   0
 ...json.xml => x86_64-cpuid-Core-i5-6600-json.xml} |   0
 ...i5-6600.json => x86_64-cpuid-Core-i5-6600.json} |   0
 ...e-i5-6600.xml => x86_64-cpuid-Core-i5-6600.xml} |   0
 ...est.xml => x86_64-cpuid-Core-i7-2600-guest.xml} |   0
 ...host.xml => x86_64-cpuid-Core-i7-2600-host.xml} |   0
 ...json.xml => x86_64-cpuid-Core-i7-2600-json.xml} |   0
 ...i7-2600.json => x86_64-cpuid-Core-i7-2600.json} |   0
 ...e-i7-2600.xml => x86_64-cpuid-Core-i7-2600.xml} |   0
 ...st.xml => x86_64-cpuid-Core-i7-3520M-guest.xml} |   0
 ...ost.xml => x86_64-cpuid-Core-i7-3520M-host.xml} |   0
 ...i7-3520M.xml => x86_64-cpuid-Core-i7-3520M.xml} |   0
 ...t.xml => x86_64-cpuid-Core-i7-3740QM-guest.xml} |   0
 ...st.xml => x86_64-cpuid-Core-i7-3740QM-host.xml} |   0
 ...on.xml => x86_64-cpuid-Core-i7-3740QM-json.xml} |   0
 ...740QM.json => x86_64-cpuid-Core-i7-3740QM.json} |   0
 ...-3740QM.xml => x86_64-cpuid-Core-i7-3740QM.xml} |   0
 ...est.xml => x86_64-cpuid-Core-i7-3770-guest.xml} |   0
 ...host.xml => x86_64-cpuid-Core-i7-3770-host.xml} |   0
 ...json.xml => x86_64-cpuid-Core-i7-3770-json.xml} |   0
 ...i7-3770.json => x86_64-cpuid-Core-i7-3770.json} |   0
 ...e-i7-3770.xml => x86_64-cpuid-Core-i7-3770.xml} |   0
 ...st.xml => x86_64-cpuid-Core-i7-4600U-guest.xml} |   0
 ...ost.xml => x86_64-cpuid-Core-i7-4600U-host.xml} |   0
 ...son.xml => x86_64-cpuid-Core-i7-4600U-json.xml} |   0
 ...-4600U.json => x86_64-cpuid-Core-i7-4600U.json} |   0
 ...i7-4600U.xml => x86_64-cpuid-Core-i7-4600U.xml} |   0
 ...st.xml => x86_64-cpuid-Core-i7-5600U-guest.xml} |   0
 ...ost.xml => x86_64-cpuid-Core-i7-5600U-host.xml} |   0
 ...son.xml => x86_64-cpuid-Core-i7-5600U-json.xml} |   0
 ...-5600U.json => x86_64-cpuid-Core-i7-5600U.json} |   0
 ...i7-5600U.xml => x86_64-cpuid-Core-i7-5600U.xml} |   0
 ...uest.xml => x86_64-cpuid-Core2-E6850-guest.xml} |   0
 ...-host.xml => x86_64-cpuid-Core2-E6850-host.xml} |   0
 ...-json.xml => x86_64-cpuid-Core2-E6850-json.xml} |   0
 ...e2-E6850.json => x86_64-cpuid-Core2-E6850.json} |   0
 ...ore2-E6850.xml => x86_64-cpuid-Core2-E6850.xml} |   0
 ...uest.xml => x86_64-cpuid-Core2-Q9500-guest.xml} |   0
 ...-host.xml => x86_64-cpuid-Core2-Q9500-host.xml} |   0
 ...ore2-Q9500.xml => x86_64-cpuid-Core2-Q9500.xml} |   0
 ...50-guest.xml => x86_64-cpuid-FX-8150-guest.xml} |   0
 ...8150-host.xml => x86_64-cpuid-FX-8150-host.xml} |   0
 ...-cpuid-FX-8150.xml => x86_64-cpuid-FX-8150.xml} |   0
 ...est.xml => x86_64-cpuid-Opteron-1352-guest.xml} |   0
 ...host.xml => x86_64-cpuid-Opteron-1352-host.xml} |   0
 ...eron-1352.xml => x86_64-cpuid-Opteron-1352.xml} |   0
 ...est.xml => x86_64-cpuid-Opteron-2350-guest.xml} |   0
 ...host.xml => x86_64-cpuid-Opteron-2350-host.xml} |   0
 ...json.xml => x86_64-cpuid-Opteron-2350-json.xml} |   0
 ...on-2350.json => x86_64-cpuid-Opteron-2350.json} |   0
 ...eron-2350.xml => x86_64-cpuid-Opteron-2350.xml} |   0
 ...est.xml => x86_64-cpuid-Opteron-6234-guest.xml} |   0
 ...host.xml => x86_64-cpuid-Opteron-6234-host.xml} |   0
 ...json.xml => x86_64-cpuid-Opteron-6234-json.xml} |   0
 ...on-6234.json => x86_64-cpuid-Opteron-6234.json} |   0
 ...eron-6234.xml => x86_64-cpuid-Opteron-6234.xml} |   0
 ...est.xml => x86_64-cpuid-Opteron-6282-guest.xml} |   0
 ...host.xml => x86_64-cpuid-Opteron-6282-host.xml} |   0
 ...eron-6282.xml => x86_64-cpuid-Opteron-6282.xml} |   0
 ...st.xml => x86_64-cpuid-Pentium-P6100-guest.xml} |   0
 ...ost.xml => x86_64-cpuid-Pentium-P6100-host.xml} |   0
 ...um-P6100.xml => x86_64-cpuid-Pentium-P6100.xml} |   0
 ...guest.xml => x86_64-cpuid-Phenom-B95-guest.xml} |   0
 ...5-host.xml => x86_64-cpuid-Phenom-B95-host.xml} |   0
 ...5-json.xml => x86_64-cpuid-Phenom-B95-json.xml} |   0
 ...henom-B95.json => x86_64-cpuid-Phenom-B95.json} |   0
 ...-Phenom-B95.xml => x86_64-cpuid-Phenom-B95.xml} |   0
 ...-guest.xml => x86_64-cpuid-Xeon-5110-guest.xml} |   0
 ...10-host.xml => x86_64-cpuid-Xeon-5110-host.xml} |   0
 ...id-Xeon-5110.xml => x86_64-cpuid-Xeon-5110.xml} |   0
 ...est.xml => x86_64-cpuid-Xeon-E3-1245-guest.xml} |   0
 ...host.xml => x86_64-cpuid-Xeon-E3-1245-host.xml} |   0
 ...json.xml => x86_64-cpuid-Xeon-E3-1245-json.xml} |   0
 ...E3-1245.json => x86_64-cpuid-Xeon-E3-1245.json} |   0
 ...n-E3-1245.xml => x86_64-cpuid-Xeon-E3-1245.xml} |   0
 ...est.xml => x86_64-cpuid-Xeon-E5-2630-guest.xml} |   0
 ...host.xml => x86_64-cpuid-Xeon-E5-2630-host.xml} |   0
 ...json.xml => x86_64-cpuid-Xeon-E5-2630-json.xml} |   0
 ...E5-2630.json => x86_64-cpuid-Xeon-E5-2630.json} |   0
 ...n-E5-2630.xml => x86_64-cpuid-Xeon-E5-2630.xml} |   0
 ...est.xml => x86_64-cpuid-Xeon-E5-2650-guest.xml} |   0
 ...host.xml => x86_64-cpuid-Xeon-E5-2650-host.xml} |   0
 ...json.xml => x86_64-cpuid-Xeon-E5-2650-json.xml} |   0
 ...E5-2650.json => x86_64-cpuid-Xeon-E5-2650.json} |   0
 ...n-E5-2650.xml => x86_64-cpuid-Xeon-E5-2650.xml} |   0
 ...est.xml => x86_64-cpuid-Xeon-E7-4820-guest.xml} |   0
 ...host.xml => x86_64-cpuid-Xeon-E7-4820-host.xml} |   0
 ...json.xml => x86_64-cpuid-Xeon-E7-4820-json.xml} |   0
 ...E7-4820.json => x86_64-cpuid-Xeon-E7-4820.json} |   0
 ...n-E7-4820.xml => x86_64-cpuid-Xeon-E7-4820.xml} |   0
 ...guest.xml => x86_64-cpuid-Xeon-W3520-guest.xml} |   0
 ...0-host.xml => x86_64-cpuid-Xeon-W3520-host.xml} |   0
 ...0-json.xml => x86_64-cpuid-Xeon-W3520-json.xml} |   0
 ...eon-W3520.json => x86_64-cpuid-Xeon-W3520.json} |   0
 ...-Xeon-W3520.xml => x86_64-cpuid-Xeon-W3520.xml} |   0
 ...guest.xml => x86_64-cpuid-Xeon-X5460-guest.xml} |   0
 ...0-host.xml => x86_64-cpuid-Xeon-X5460-host.xml} |   0
 ...-Xeon-X5460.xml => x86_64-cpuid-Xeon-X5460.xml} |   0
 ...le-extra.xml => x86_64-exact-disable-extra.xml} |   0
 ...-exact-disable.xml => x86_64-exact-disable.xml} |   0
 ...xact-disable2.xml => x86_64-exact-disable2.xml} |   0
 ...bid-extra.xml => x86_64-exact-forbid-extra.xml} |   0
 ...86-exact-forbid.xml => x86_64-exact-forbid.xml} |   0
 ...-Haswell.xml => x86_64-exact-force-Haswell.xml} |   0
 ...{x86-exact-force.xml => x86_64-exact-force.xml} |   0
 ...re-extra.xml => x86_64-exact-require-extra.xml} |   0
 ...-exact-require.xml => x86_64-exact-require.xml} |   0
 .../{x86-exact.xml => x86_64-exact.xml}            |   0
 ...-nofallback.xml => x86_64-guest-nofallback.xml} |   0
 .../{x86-guest.xml => x86_64-guest.xml}            |   0
 ...t.xml => x86_64-host+guest,model486-result.xml} |   0
 ...ult.xml => x86_64-host+guest,models-result.xml} |   0
 ...est-result.xml => x86_64-host+guest-result.xml} |   0
 .../{x86-host+guest.xml => x86_64-host+guest.xml}  |   0
 ... x86_64-host+host+host-model,models-result.xml} |   0
 ...k.xml => x86_64-host+host-model-nofallback.xml} |   0
 ...t+host-model.xml => x86_64-host+host-model.xml} |   0
 ...l => x86_64-host+host-passthrough-features.xml} |   0
 ...hrough.xml => x86_64-host+host-passthrough.xml} |   0
 .../{x86-host+min.xml => x86_64-host+min.xml}      |   0
 ...ult.xml => x86_64-host+penryn-force-result.xml} |   0
 ...-host+pentium3.xml => x86_64-host+pentium3.xml} |   0
 ...l => x86_64-host+strict-force-extra-result.xml} |   0
 ...-host-Haswell-noTSX+Haswell,haswell-result.xml} |   0
 ...Haswell-noTSX+Haswell-noTSX,haswell-result.xml} |   0
 ...64-host-Haswell-noTSX+Haswell-noTSX-result.xml} |   0
 ...ell-noTSX.xml => x86_64-host-Haswell-noTSX.xml} |   0
 ...SandyBridge.xml => x86_64-host-SandyBridge.xml} |   0
 ...-host-amd-fake.xml => x86_64-host-amd-fake.xml} |   0
 .../{x86-host-amd.xml => x86_64-host-amd.xml}      |   0
 ....xml => x86_64-host-better+pentium3-result.xml} |   0
 ...{x86-host-better.xml => x86_64-host-better.xml} |   0
 ...incomp-arch.xml => x86_64-host-incomp-arch.xml} |   0
 ...model.xml => x86_64-host-invtsc+host-model.xml} |   0
 ...{x86-host-invtsc.xml => x86_64-host-invtsc.xml} |   0
 ...llback.xml => x86_64-host-model-nofallback.xml} |   0
 .../{x86-host-model.xml => x86_64-host-model.xml}  |   0
 ...ost-no-vendor.xml => x86_64-host-no-vendor.xml} |   0
 ...es.xml => x86_64-host-passthrough-features.xml} |   0
 ...passthrough.xml => x86_64-host-passthrough.xml} |   0
 ...sult.xml => x86_64-host-worse+guest-result.xml} |   0
 .../{x86-host-worse.xml => x86_64-host-worse.xml}  |   0
 .../cputestdata/{x86-host.xml => x86_64-host.xml}  |   0
 tests/cputestdata/{x86-min.xml => x86_64-min.xml}  |   0
 ...86-penryn-force.xml => x86_64-penryn-force.xml} |   0
 ...86-pentium3-amd.xml => x86_64-pentium3-amd.xml} |   0
 .../{x86-pentium3.xml => x86_64-pentium3.xml}      |   0
 ...trict-disable.xml => x86_64-strict-disable.xml} |   0
 ...rce-extra.xml => x86_64-strict-force-extra.xml} |   0
 ...{x86-strict-full.xml => x86_64-strict-full.xml} |   0
 .../{x86-strict.xml => x86_64-strict.xml}          |   0
 211 files changed, 103 insertions(+), 103 deletions(-)
 rename tests/cputestdata/{x86-Haswell-noTSX-nofallback.xml => x86_64-Haswell-noTSX-nofallback.xml} (100%)
 rename tests/cputestdata/{x86-Haswell-noTSX.xml => x86_64-Haswell-noTSX.xml} (100%)
 rename tests/cputestdata/{x86-Haswell.xml => x86_64-Haswell.xml} (100%)
 rename tests/cputestdata/{x86-baseline-1-result.xml => x86_64-baseline-1-result.xml} (100%)
 rename tests/cputestdata/{x86-baseline-1.xml => x86_64-baseline-1.xml} (100%)
 rename tests/cputestdata/{x86-baseline-2-result.xml => x86_64-baseline-2-result.xml} (100%)
 rename tests/cputestdata/{x86-baseline-2.xml => x86_64-baseline-2.xml} (100%)
 rename tests/cputestdata/{x86-baseline-3-expanded.xml => x86_64-baseline-3-expanded.xml} (100%)
 rename tests/cputestdata/{x86-baseline-3-result.xml => x86_64-baseline-3-result.xml} (100%)
 rename tests/cputestdata/{x86-baseline-3.xml => x86_64-baseline-3.xml} (100%)
 rename tests/cputestdata/{x86-baseline-4-expanded.xml => x86_64-baseline-4-expanded.xml} (100%)
 rename tests/cputestdata/{x86-baseline-4-result.xml => x86_64-baseline-4-result.xml} (100%)
 rename tests/cputestdata/{x86-baseline-4.xml => x86_64-baseline-4.xml} (100%)
 rename tests/cputestdata/{x86-baseline-5-expanded.xml => x86_64-baseline-5-expanded.xml} (100%)
 rename tests/cputestdata/{x86-baseline-5-result.xml => x86_64-baseline-5-result.xml} (100%)
 rename tests/cputestdata/{x86-baseline-5.xml => x86_64-baseline-5.xml} (100%)
 rename tests/cputestdata/{x86-baseline-6-migratable.xml => x86_64-baseline-6-migratable.xml} (100%)
 rename tests/cputestdata/{x86-baseline-6-result.xml => x86_64-baseline-6-result.xml} (100%)
 rename tests/cputestdata/{x86-baseline-6.xml => x86_64-baseline-6.xml} (100%)
 rename tests/cputestdata/{x86-baseline-7-result.xml => x86_64-baseline-7-result.xml} (100%)
 rename tests/cputestdata/{x86-baseline-7.xml => x86_64-baseline-7.xml} (100%)
 rename tests/cputestdata/{x86-baseline-8-result.xml => x86_64-baseline-8-result.xml} (100%)
 rename tests/cputestdata/{x86-baseline-8.xml => x86_64-baseline-8.xml} (100%)
 rename tests/cputestdata/{x86-baseline-incompatible-vendors.xml => x86_64-baseline-incompatible-vendors.xml} (100%)
 rename tests/cputestdata/{x86-baseline-no-vendor-result.xml => x86_64-baseline-no-vendor-result.xml} (100%)
 rename tests/cputestdata/{x86-baseline-no-vendor.xml => x86_64-baseline-no-vendor.xml} (100%)
 rename tests/cputestdata/{x86-baseline-some-vendors-result.xml => x86_64-baseline-some-vendors-result.xml} (100%)
 rename tests/cputestdata/{x86-baseline-some-vendors.xml => x86_64-baseline-some-vendors.xml} (100%)
 rename tests/cputestdata/{x86-bogus-feature.xml => x86_64-bogus-feature.xml} (100%)
 rename tests/cputestdata/{x86-bogus-model.xml => x86_64-bogus-model.xml} (100%)
 rename tests/cputestdata/{x86-bogus-vendor.xml => x86_64-bogus-vendor.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-A10-5800K-guest.xml => x86_64-cpuid-A10-5800K-guest.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-A10-5800K-host.xml => x86_64-cpuid-A10-5800K-host.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-A10-5800K-json.xml => x86_64-cpuid-A10-5800K-json.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-A10-5800K.json => x86_64-cpuid-A10-5800K.json} (100%)
 rename tests/cputestdata/{x86-cpuid-A10-5800K.xml => x86_64-cpuid-A10-5800K.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Atom-D510-guest.xml => x86_64-cpuid-Atom-D510-guest.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Atom-D510-host.xml => x86_64-cpuid-Atom-D510-host.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Atom-D510.xml => x86_64-cpuid-Atom-D510.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Atom-N450-guest.xml => x86_64-cpuid-Atom-N450-guest.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Atom-N450-host.xml => x86_64-cpuid-Atom-N450-host.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Atom-N450.xml => x86_64-cpuid-Atom-N450.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i5-2500-guest.xml => x86_64-cpuid-Core-i5-2500-guest.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i5-2500-host.xml => x86_64-cpuid-Core-i5-2500-host.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i5-2500-json.xml => x86_64-cpuid-Core-i5-2500-json.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i5-2500.json => x86_64-cpuid-Core-i5-2500.json} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i5-2500.xml => x86_64-cpuid-Core-i5-2500.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i5-2540M-guest.xml => x86_64-cpuid-Core-i5-2540M-guest.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i5-2540M-host.xml => x86_64-cpuid-Core-i5-2540M-host.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i5-2540M-json.xml => x86_64-cpuid-Core-i5-2540M-json.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i5-2540M.json => x86_64-cpuid-Core-i5-2540M.json} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i5-2540M.xml => x86_64-cpuid-Core-i5-2540M.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i5-4670T-guest.xml => x86_64-cpuid-Core-i5-4670T-guest.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i5-4670T-host.xml => x86_64-cpuid-Core-i5-4670T-host.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i5-4670T-json.xml => x86_64-cpuid-Core-i5-4670T-json.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i5-4670T.json => x86_64-cpuid-Core-i5-4670T.json} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i5-4670T.xml => x86_64-cpuid-Core-i5-4670T.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i5-6600-guest.xml => x86_64-cpuid-Core-i5-6600-guest.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i5-6600-host.xml => x86_64-cpuid-Core-i5-6600-host.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i5-6600-json.xml => x86_64-cpuid-Core-i5-6600-json.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i5-6600.json => x86_64-cpuid-Core-i5-6600.json} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i5-6600.xml => x86_64-cpuid-Core-i5-6600.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i7-2600-guest.xml => x86_64-cpuid-Core-i7-2600-guest.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i7-2600-host.xml => x86_64-cpuid-Core-i7-2600-host.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i7-2600-json.xml => x86_64-cpuid-Core-i7-2600-json.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i7-2600.json => x86_64-cpuid-Core-i7-2600.json} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i7-2600.xml => x86_64-cpuid-Core-i7-2600.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i7-3520M-guest.xml => x86_64-cpuid-Core-i7-3520M-guest.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i7-3520M-host.xml => x86_64-cpuid-Core-i7-3520M-host.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i7-3520M.xml => x86_64-cpuid-Core-i7-3520M.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i7-3740QM-guest.xml => x86_64-cpuid-Core-i7-3740QM-guest.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i7-3740QM-host.xml => x86_64-cpuid-Core-i7-3740QM-host.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i7-3740QM-json.xml => x86_64-cpuid-Core-i7-3740QM-json.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i7-3740QM.json => x86_64-cpuid-Core-i7-3740QM.json} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i7-3740QM.xml => x86_64-cpuid-Core-i7-3740QM.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i7-3770-guest.xml => x86_64-cpuid-Core-i7-3770-guest.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i7-3770-host.xml => x86_64-cpuid-Core-i7-3770-host.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i7-3770-json.xml => x86_64-cpuid-Core-i7-3770-json.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i7-3770.json => x86_64-cpuid-Core-i7-3770.json} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i7-3770.xml => x86_64-cpuid-Core-i7-3770.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i7-4600U-guest.xml => x86_64-cpuid-Core-i7-4600U-guest.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i7-4600U-host.xml => x86_64-cpuid-Core-i7-4600U-host.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i7-4600U-json.xml => x86_64-cpuid-Core-i7-4600U-json.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i7-4600U.json => x86_64-cpuid-Core-i7-4600U.json} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i7-4600U.xml => x86_64-cpuid-Core-i7-4600U.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i7-5600U-guest.xml => x86_64-cpuid-Core-i7-5600U-guest.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i7-5600U-host.xml => x86_64-cpuid-Core-i7-5600U-host.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i7-5600U-json.xml => x86_64-cpuid-Core-i7-5600U-json.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i7-5600U.json => x86_64-cpuid-Core-i7-5600U.json} (100%)
 rename tests/cputestdata/{x86-cpuid-Core-i7-5600U.xml => x86_64-cpuid-Core-i7-5600U.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Core2-E6850-guest.xml => x86_64-cpuid-Core2-E6850-guest.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Core2-E6850-host.xml => x86_64-cpuid-Core2-E6850-host.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Core2-E6850-json.xml => x86_64-cpuid-Core2-E6850-json.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Core2-E6850.json => x86_64-cpuid-Core2-E6850.json} (100%)
 rename tests/cputestdata/{x86-cpuid-Core2-E6850.xml => x86_64-cpuid-Core2-E6850.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Core2-Q9500-guest.xml => x86_64-cpuid-Core2-Q9500-guest.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Core2-Q9500-host.xml => x86_64-cpuid-Core2-Q9500-host.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Core2-Q9500.xml => x86_64-cpuid-Core2-Q9500.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-FX-8150-guest.xml => x86_64-cpuid-FX-8150-guest.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-FX-8150-host.xml => x86_64-cpuid-FX-8150-host.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-FX-8150.xml => x86_64-cpuid-FX-8150.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Opteron-1352-guest.xml => x86_64-cpuid-Opteron-1352-guest.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Opteron-1352-host.xml => x86_64-cpuid-Opteron-1352-host.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Opteron-1352.xml => x86_64-cpuid-Opteron-1352.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Opteron-2350-guest.xml => x86_64-cpuid-Opteron-2350-guest.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Opteron-2350-host.xml => x86_64-cpuid-Opteron-2350-host.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Opteron-2350-json.xml => x86_64-cpuid-Opteron-2350-json.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Opteron-2350.json => x86_64-cpuid-Opteron-2350.json} (100%)
 rename tests/cputestdata/{x86-cpuid-Opteron-2350.xml => x86_64-cpuid-Opteron-2350.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Opteron-6234-guest.xml => x86_64-cpuid-Opteron-6234-guest.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Opteron-6234-host.xml => x86_64-cpuid-Opteron-6234-host.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Opteron-6234-json.xml => x86_64-cpuid-Opteron-6234-json.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Opteron-6234.json => x86_64-cpuid-Opteron-6234.json} (100%)
 rename tests/cputestdata/{x86-cpuid-Opteron-6234.xml => x86_64-cpuid-Opteron-6234.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Opteron-6282-guest.xml => x86_64-cpuid-Opteron-6282-guest.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Opteron-6282-host.xml => x86_64-cpuid-Opteron-6282-host.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Opteron-6282.xml => x86_64-cpuid-Opteron-6282.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Pentium-P6100-guest.xml => x86_64-cpuid-Pentium-P6100-guest.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Pentium-P6100-host.xml => x86_64-cpuid-Pentium-P6100-host.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Pentium-P6100.xml => x86_64-cpuid-Pentium-P6100.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Phenom-B95-guest.xml => x86_64-cpuid-Phenom-B95-guest.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Phenom-B95-host.xml => x86_64-cpuid-Phenom-B95-host.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Phenom-B95-json.xml => x86_64-cpuid-Phenom-B95-json.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Phenom-B95.json => x86_64-cpuid-Phenom-B95.json} (100%)
 rename tests/cputestdata/{x86-cpuid-Phenom-B95.xml => x86_64-cpuid-Phenom-B95.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Xeon-5110-guest.xml => x86_64-cpuid-Xeon-5110-guest.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Xeon-5110-host.xml => x86_64-cpuid-Xeon-5110-host.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Xeon-5110.xml => x86_64-cpuid-Xeon-5110.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Xeon-E3-1245-guest.xml => x86_64-cpuid-Xeon-E3-1245-guest.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Xeon-E3-1245-host.xml => x86_64-cpuid-Xeon-E3-1245-host.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Xeon-E3-1245-json.xml => x86_64-cpuid-Xeon-E3-1245-json.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Xeon-E3-1245.json => x86_64-cpuid-Xeon-E3-1245.json} (100%)
 rename tests/cputestdata/{x86-cpuid-Xeon-E3-1245.xml => x86_64-cpuid-Xeon-E3-1245.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Xeon-E5-2630-guest.xml => x86_64-cpuid-Xeon-E5-2630-guest.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Xeon-E5-2630-host.xml => x86_64-cpuid-Xeon-E5-2630-host.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Xeon-E5-2630-json.xml => x86_64-cpuid-Xeon-E5-2630-json.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Xeon-E5-2630.json => x86_64-cpuid-Xeon-E5-2630.json} (100%)
 rename tests/cputestdata/{x86-cpuid-Xeon-E5-2630.xml => x86_64-cpuid-Xeon-E5-2630.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Xeon-E5-2650-guest.xml => x86_64-cpuid-Xeon-E5-2650-guest.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Xeon-E5-2650-host.xml => x86_64-cpuid-Xeon-E5-2650-host.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Xeon-E5-2650-json.xml => x86_64-cpuid-Xeon-E5-2650-json.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Xeon-E5-2650.json => x86_64-cpuid-Xeon-E5-2650.json} (100%)
 rename tests/cputestdata/{x86-cpuid-Xeon-E5-2650.xml => x86_64-cpuid-Xeon-E5-2650.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Xeon-E7-4820-guest.xml => x86_64-cpuid-Xeon-E7-4820-guest.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Xeon-E7-4820-host.xml => x86_64-cpuid-Xeon-E7-4820-host.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Xeon-E7-4820-json.xml => x86_64-cpuid-Xeon-E7-4820-json.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Xeon-E7-4820.json => x86_64-cpuid-Xeon-E7-4820.json} (100%)
 rename tests/cputestdata/{x86-cpuid-Xeon-E7-4820.xml => x86_64-cpuid-Xeon-E7-4820.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Xeon-W3520-guest.xml => x86_64-cpuid-Xeon-W3520-guest.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Xeon-W3520-host.xml => x86_64-cpuid-Xeon-W3520-host.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Xeon-W3520-json.xml => x86_64-cpuid-Xeon-W3520-json.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Xeon-W3520.json => x86_64-cpuid-Xeon-W3520.json} (100%)
 rename tests/cputestdata/{x86-cpuid-Xeon-W3520.xml => x86_64-cpuid-Xeon-W3520.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Xeon-X5460-guest.xml => x86_64-cpuid-Xeon-X5460-guest.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Xeon-X5460-host.xml => x86_64-cpuid-Xeon-X5460-host.xml} (100%)
 rename tests/cputestdata/{x86-cpuid-Xeon-X5460.xml => x86_64-cpuid-Xeon-X5460.xml} (100%)
 rename tests/cputestdata/{x86-exact-disable-extra.xml => x86_64-exact-disable-extra.xml} (100%)
 rename tests/cputestdata/{x86-exact-disable.xml => x86_64-exact-disable.xml} (100%)
 rename tests/cputestdata/{x86-exact-disable2.xml => x86_64-exact-disable2.xml} (100%)
 rename tests/cputestdata/{x86-exact-forbid-extra.xml => x86_64-exact-forbid-extra.xml} (100%)
 rename tests/cputestdata/{x86-exact-forbid.xml => x86_64-exact-forbid.xml} (100%)
 rename tests/cputestdata/{x86-exact-force-Haswell.xml => x86_64-exact-force-Haswell.xml} (100%)
 rename tests/cputestdata/{x86-exact-force.xml => x86_64-exact-force.xml} (100%)
 rename tests/cputestdata/{x86-exact-require-extra.xml => x86_64-exact-require-extra.xml} (100%)
 rename tests/cputestdata/{x86-exact-require.xml => x86_64-exact-require.xml} (100%)
 rename tests/cputestdata/{x86-exact.xml => x86_64-exact.xml} (100%)
 rename tests/cputestdata/{x86-guest-nofallback.xml => x86_64-guest-nofallback.xml} (100%)
 rename tests/cputestdata/{x86-guest.xml => x86_64-guest.xml} (100%)
 rename tests/cputestdata/{x86-host+guest,model486-result.xml => x86_64-host+guest,model486-result.xml} (100%)
 rename tests/cputestdata/{x86-host+guest,models-result.xml => x86_64-host+guest,models-result.xml} (100%)
 rename tests/cputestdata/{x86-host+guest-result.xml => x86_64-host+guest-result.xml} (100%)
 rename tests/cputestdata/{x86-host+guest.xml => x86_64-host+guest.xml} (100%)
 rename tests/cputestdata/{x86-host+host+host-model,models-result.xml => x86_64-host+host+host-model,models-result.xml} (100%)
 rename tests/cputestdata/{x86-host+host-model-nofallback.xml => x86_64-host+host-model-nofallback.xml} (100%)
 rename tests/cputestdata/{x86-host+host-model.xml => x86_64-host+host-model.xml} (100%)
 rename tests/cputestdata/{x86-host+host-passthrough-features.xml => x86_64-host+host-passthrough-features.xml} (100%)
 rename tests/cputestdata/{x86-host+host-passthrough.xml => x86_64-host+host-passthrough.xml} (100%)
 rename tests/cputestdata/{x86-host+min.xml => x86_64-host+min.xml} (100%)
 rename tests/cputestdata/{x86-host+penryn-force-result.xml => x86_64-host+penryn-force-result.xml} (100%)
 rename tests/cputestdata/{x86-host+pentium3.xml => x86_64-host+pentium3.xml} (100%)
 rename tests/cputestdata/{x86-host+strict-force-extra-result.xml => x86_64-host+strict-force-extra-result.xml} (100%)
 rename tests/cputestdata/{x86-host-Haswell-noTSX+Haswell,haswell-result.xml => x86_64-host-Haswell-noTSX+Haswell,haswell-result.xml} (100%)
 rename tests/cputestdata/{x86-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml => x86_64-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml} (100%)
 rename tests/cputestdata/{x86-host-Haswell-noTSX+Haswell-noTSX-result.xml => x86_64-host-Haswell-noTSX+Haswell-noTSX-result.xml} (100%)
 rename tests/cputestdata/{x86-host-Haswell-noTSX.xml => x86_64-host-Haswell-noTSX.xml} (100%)
 rename tests/cputestdata/{x86-host-SandyBridge.xml => x86_64-host-SandyBridge.xml} (100%)
 rename tests/cputestdata/{x86-host-amd-fake.xml => x86_64-host-amd-fake.xml} (100%)
 rename tests/cputestdata/{x86-host-amd.xml => x86_64-host-amd.xml} (100%)
 rename tests/cputestdata/{x86-host-better+pentium3-result.xml => x86_64-host-better+pentium3-result.xml} (100%)
 rename tests/cputestdata/{x86-host-better.xml => x86_64-host-better.xml} (100%)
 rename tests/cputestdata/{x86-host-incomp-arch.xml => x86_64-host-incomp-arch.xml} (100%)
 rename tests/cputestdata/{x86-host-invtsc+host-model.xml => x86_64-host-invtsc+host-model.xml} (100%)
 rename tests/cputestdata/{x86-host-invtsc.xml => x86_64-host-invtsc.xml} (100%)
 rename tests/cputestdata/{x86-host-model-nofallback.xml => x86_64-host-model-nofallback.xml} (100%)
 rename tests/cputestdata/{x86-host-model.xml => x86_64-host-model.xml} (100%)
 rename tests/cputestdata/{x86-host-no-vendor.xml => x86_64-host-no-vendor.xml} (100%)
 rename tests/cputestdata/{x86-host-passthrough-features.xml => x86_64-host-passthrough-features.xml} (100%)
 rename tests/cputestdata/{x86-host-passthrough.xml => x86_64-host-passthrough.xml} (100%)
 rename tests/cputestdata/{x86-host-worse+guest-result.xml => x86_64-host-worse+guest-result.xml} (100%)
 rename tests/cputestdata/{x86-host-worse.xml => x86_64-host-worse.xml} (100%)
 rename tests/cputestdata/{x86-host.xml => x86_64-host.xml} (100%)
 rename tests/cputestdata/{x86-min.xml => x86_64-min.xml} (100%)
 rename tests/cputestdata/{x86-penryn-force.xml => x86_64-penryn-force.xml} (100%)
 rename tests/cputestdata/{x86-pentium3-amd.xml => x86_64-pentium3-amd.xml} (100%)
 rename tests/cputestdata/{x86-pentium3.xml => x86_64-pentium3.xml} (100%)
 rename tests/cputestdata/{x86-strict-disable.xml => x86_64-strict-disable.xml} (100%)
 rename tests/cputestdata/{x86-strict-force-extra.xml => x86_64-strict-force-extra.xml} (100%)
 rename tests/cputestdata/{x86-strict-full.xml => x86_64-strict-full.xml} (100%)
 rename tests/cputestdata/{x86-strict.xml => x86_64-strict.xml} (100%)

diff --git a/tests/cputest.c b/tests/cputest.c
index 8d761af61..406b40dfe 100644
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -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);
diff --git a/tests/cputestdata/cpu-parse.sh b/tests/cputestdata/cpu-parse.sh
index 1b5ab4a5a..90bc2dcd9 100755
--- a/tests/cputestdata/cpu-parse.sh
+++ b/tests/cputestdata/cpu-parse.sh
@@ -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()
 {
diff --git a/tests/cputestdata/x86-Haswell-noTSX-nofallback.xml b/tests/cputestdata/x86_64-Haswell-noTSX-nofallback.xml
similarity index 100%
rename from tests/cputestdata/x86-Haswell-noTSX-nofallback.xml
rename to tests/cputestdata/x86_64-Haswell-noTSX-nofallback.xml
diff --git a/tests/cputestdata/x86-Haswell-noTSX.xml b/tests/cputestdata/x86_64-Haswell-noTSX.xml
similarity index 100%
rename from tests/cputestdata/x86-Haswell-noTSX.xml
rename to tests/cputestdata/x86_64-Haswell-noTSX.xml
diff --git a/tests/cputestdata/x86-Haswell.xml b/tests/cputestdata/x86_64-Haswell.xml
similarity index 100%
rename from tests/cputestdata/x86-Haswell.xml
rename to tests/cputestdata/x86_64-Haswell.xml
diff --git a/tests/cputestdata/x86-baseline-1-result.xml b/tests/cputestdata/x86_64-baseline-1-result.xml
similarity index 100%
rename from tests/cputestdata/x86-baseline-1-result.xml
rename to tests/cputestdata/x86_64-baseline-1-result.xml
diff --git a/tests/cputestdata/x86-baseline-1.xml b/tests/cputestdata/x86_64-baseline-1.xml
similarity index 100%
rename from tests/cputestdata/x86-baseline-1.xml
rename to tests/cputestdata/x86_64-baseline-1.xml
diff --git a/tests/cputestdata/x86-baseline-2-result.xml b/tests/cputestdata/x86_64-baseline-2-result.xml
similarity index 100%
rename from tests/cputestdata/x86-baseline-2-result.xml
rename to tests/cputestdata/x86_64-baseline-2-result.xml
diff --git a/tests/cputestdata/x86-baseline-2.xml b/tests/cputestdata/x86_64-baseline-2.xml
similarity index 100%
rename from tests/cputestdata/x86-baseline-2.xml
rename to tests/cputestdata/x86_64-baseline-2.xml
diff --git a/tests/cputestdata/x86-baseline-3-expanded.xml b/tests/cputestdata/x86_64-baseline-3-expanded.xml
similarity index 100%
rename from tests/cputestdata/x86-baseline-3-expanded.xml
rename to tests/cputestdata/x86_64-baseline-3-expanded.xml
diff --git a/tests/cputestdata/x86-baseline-3-result.xml b/tests/cputestdata/x86_64-baseline-3-result.xml
similarity index 100%
rename from tests/cputestdata/x86-baseline-3-result.xml
rename to tests/cputestdata/x86_64-baseline-3-result.xml
diff --git a/tests/cputestdata/x86-baseline-3.xml b/tests/cputestdata/x86_64-baseline-3.xml
similarity index 100%
rename from tests/cputestdata/x86-baseline-3.xml
rename to tests/cputestdata/x86_64-baseline-3.xml
diff --git a/tests/cputestdata/x86-baseline-4-expanded.xml b/tests/cputestdata/x86_64-baseline-4-expanded.xml
similarity index 100%
rename from tests/cputestdata/x86-baseline-4-expanded.xml
rename to tests/cputestdata/x86_64-baseline-4-expanded.xml
diff --git a/tests/cputestdata/x86-baseline-4-result.xml b/tests/cputestdata/x86_64-baseline-4-result.xml
similarity index 100%
rename from tests/cputestdata/x86-baseline-4-result.xml
rename to tests/cputestdata/x86_64-baseline-4-result.xml
diff --git a/tests/cputestdata/x86-baseline-4.xml b/tests/cputestdata/x86_64-baseline-4.xml
similarity index 100%
rename from tests/cputestdata/x86-baseline-4.xml
rename to tests/cputestdata/x86_64-baseline-4.xml
diff --git a/tests/cputestdata/x86-baseline-5-expanded.xml b/tests/cputestdata/x86_64-baseline-5-expanded.xml
similarity index 100%
rename from tests/cputestdata/x86-baseline-5-expanded.xml
rename to tests/cputestdata/x86_64-baseline-5-expanded.xml
diff --git a/tests/cputestdata/x86-baseline-5-result.xml b/tests/cputestdata/x86_64-baseline-5-result.xml
similarity index 100%
rename from tests/cputestdata/x86-baseline-5-result.xml
rename to tests/cputestdata/x86_64-baseline-5-result.xml
diff --git a/tests/cputestdata/x86-baseline-5.xml b/tests/cputestdata/x86_64-baseline-5.xml
similarity index 100%
rename from tests/cputestdata/x86-baseline-5.xml
rename to tests/cputestdata/x86_64-baseline-5.xml
diff --git a/tests/cputestdata/x86-baseline-6-migratable.xml b/tests/cputestdata/x86_64-baseline-6-migratable.xml
similarity index 100%
rename from tests/cputestdata/x86-baseline-6-migratable.xml
rename to tests/cputestdata/x86_64-baseline-6-migratable.xml
diff --git a/tests/cputestdata/x86-baseline-6-result.xml b/tests/cputestdata/x86_64-baseline-6-result.xml
similarity index 100%
rename from tests/cputestdata/x86-baseline-6-result.xml
rename to tests/cputestdata/x86_64-baseline-6-result.xml
diff --git a/tests/cputestdata/x86-baseline-6.xml b/tests/cputestdata/x86_64-baseline-6.xml
similarity index 100%
rename from tests/cputestdata/x86-baseline-6.xml
rename to tests/cputestdata/x86_64-baseline-6.xml
diff --git a/tests/cputestdata/x86-baseline-7-result.xml b/tests/cputestdata/x86_64-baseline-7-result.xml
similarity index 100%
rename from tests/cputestdata/x86-baseline-7-result.xml
rename to tests/cputestdata/x86_64-baseline-7-result.xml
diff --git a/tests/cputestdata/x86-baseline-7.xml b/tests/cputestdata/x86_64-baseline-7.xml
similarity index 100%
rename from tests/cputestdata/x86-baseline-7.xml
rename to tests/cputestdata/x86_64-baseline-7.xml
diff --git a/tests/cputestdata/x86-baseline-8-result.xml b/tests/cputestdata/x86_64-baseline-8-result.xml
similarity index 100%
rename from tests/cputestdata/x86-baseline-8-result.xml
rename to tests/cputestdata/x86_64-baseline-8-result.xml
diff --git a/tests/cputestdata/x86-baseline-8.xml b/tests/cputestdata/x86_64-baseline-8.xml
similarity index 100%
rename from tests/cputestdata/x86-baseline-8.xml
rename to tests/cputestdata/x86_64-baseline-8.xml
diff --git a/tests/cputestdata/x86-baseline-incompatible-vendors.xml b/tests/cputestdata/x86_64-baseline-incompatible-vendors.xml
similarity index 100%
rename from tests/cputestdata/x86-baseline-incompatible-vendors.xml
rename to tests/cputestdata/x86_64-baseline-incompatible-vendors.xml
diff --git a/tests/cputestdata/x86-baseline-no-vendor-result.xml b/tests/cputestdata/x86_64-baseline-no-vendor-result.xml
similarity index 100%
rename from tests/cputestdata/x86-baseline-no-vendor-result.xml
rename to tests/cputestdata/x86_64-baseline-no-vendor-result.xml
diff --git a/tests/cputestdata/x86-baseline-no-vendor.xml b/tests/cputestdata/x86_64-baseline-no-vendor.xml
similarity index 100%
rename from tests/cputestdata/x86-baseline-no-vendor.xml
rename to tests/cputestdata/x86_64-baseline-no-vendor.xml
diff --git a/tests/cputestdata/x86-baseline-some-vendors-result.xml b/tests/cputestdata/x86_64-baseline-some-vendors-result.xml
similarity index 100%
rename from tests/cputestdata/x86-baseline-some-vendors-result.xml
rename to tests/cputestdata/x86_64-baseline-some-vendors-result.xml
diff --git a/tests/cputestdata/x86-baseline-some-vendors.xml b/tests/cputestdata/x86_64-baseline-some-vendors.xml
similarity index 100%
rename from tests/cputestdata/x86-baseline-some-vendors.xml
rename to tests/cputestdata/x86_64-baseline-some-vendors.xml
diff --git a/tests/cputestdata/x86-bogus-feature.xml b/tests/cputestdata/x86_64-bogus-feature.xml
similarity index 100%
rename from tests/cputestdata/x86-bogus-feature.xml
rename to tests/cputestdata/x86_64-bogus-feature.xml
diff --git a/tests/cputestdata/x86-bogus-model.xml b/tests/cputestdata/x86_64-bogus-model.xml
similarity index 100%
rename from tests/cputestdata/x86-bogus-model.xml
rename to tests/cputestdata/x86_64-bogus-model.xml
diff --git a/tests/cputestdata/x86-bogus-vendor.xml b/tests/cputestdata/x86_64-bogus-vendor.xml
similarity index 100%
rename from tests/cputestdata/x86-bogus-vendor.xml
rename to tests/cputestdata/x86_64-bogus-vendor.xml
diff --git a/tests/cputestdata/x86-cpuid-A10-5800K-guest.xml b/tests/cputestdata/x86_64-cpuid-A10-5800K-guest.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-A10-5800K-guest.xml
rename to tests/cputestdata/x86_64-cpuid-A10-5800K-guest.xml
diff --git a/tests/cputestdata/x86-cpuid-A10-5800K-host.xml b/tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-A10-5800K-host.xml
rename to tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml
diff --git a/tests/cputestdata/x86-cpuid-A10-5800K-json.xml b/tests/cputestdata/x86_64-cpuid-A10-5800K-json.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-A10-5800K-json.xml
rename to tests/cputestdata/x86_64-cpuid-A10-5800K-json.xml
diff --git a/tests/cputestdata/x86-cpuid-A10-5800K.json b/tests/cputestdata/x86_64-cpuid-A10-5800K.json
similarity index 100%
rename from tests/cputestdata/x86-cpuid-A10-5800K.json
rename to tests/cputestdata/x86_64-cpuid-A10-5800K.json
diff --git a/tests/cputestdata/x86-cpuid-A10-5800K.xml b/tests/cputestdata/x86_64-cpuid-A10-5800K.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-A10-5800K.xml
rename to tests/cputestdata/x86_64-cpuid-A10-5800K.xml
diff --git a/tests/cputestdata/x86-cpuid-Atom-D510-guest.xml b/tests/cputestdata/x86_64-cpuid-Atom-D510-guest.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Atom-D510-guest.xml
rename to tests/cputestdata/x86_64-cpuid-Atom-D510-guest.xml
diff --git a/tests/cputestdata/x86-cpuid-Atom-D510-host.xml b/tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Atom-D510-host.xml
rename to tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml
diff --git a/tests/cputestdata/x86-cpuid-Atom-D510.xml b/tests/cputestdata/x86_64-cpuid-Atom-D510.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Atom-D510.xml
rename to tests/cputestdata/x86_64-cpuid-Atom-D510.xml
diff --git a/tests/cputestdata/x86-cpuid-Atom-N450-guest.xml b/tests/cputestdata/x86_64-cpuid-Atom-N450-guest.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Atom-N450-guest.xml
rename to tests/cputestdata/x86_64-cpuid-Atom-N450-guest.xml
diff --git a/tests/cputestdata/x86-cpuid-Atom-N450-host.xml b/tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Atom-N450-host.xml
rename to tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml
diff --git a/tests/cputestdata/x86-cpuid-Atom-N450.xml b/tests/cputestdata/x86_64-cpuid-Atom-N450.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Atom-N450.xml
rename to tests/cputestdata/x86_64-cpuid-Atom-N450.xml
diff --git a/tests/cputestdata/x86-cpuid-Core-i5-2500-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-guest.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i5-2500-guest.xml
rename to tests/cputestdata/x86_64-cpuid-Core-i5-2500-guest.xml
diff --git a/tests/cputestdata/x86-cpuid-Core-i5-2500-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-host.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i5-2500-host.xml
rename to tests/cputestdata/x86_64-cpuid-Core-i5-2500-host.xml
diff --git a/tests/cputestdata/x86-cpuid-Core-i5-2500-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-json.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i5-2500-json.xml
rename to tests/cputestdata/x86_64-cpuid-Core-i5-2500-json.xml
diff --git a/tests/cputestdata/x86-cpuid-Core-i5-2500.json b/tests/cputestdata/x86_64-cpuid-Core-i5-2500.json
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i5-2500.json
rename to tests/cputestdata/x86_64-cpuid-Core-i5-2500.json
diff --git a/tests/cputestdata/x86-cpuid-Core-i5-2500.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-2500.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i5-2500.xml
rename to tests/cputestdata/x86_64-cpuid-Core-i5-2500.xml
diff --git a/tests/cputestdata/x86-cpuid-Core-i5-2540M-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-guest.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i5-2540M-guest.xml
rename to tests/cputestdata/x86_64-cpuid-Core-i5-2540M-guest.xml
diff --git a/tests/cputestdata/x86-cpuid-Core-i5-2540M-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-host.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i5-2540M-host.xml
rename to tests/cputestdata/x86_64-cpuid-Core-i5-2540M-host.xml
diff --git a/tests/cputestdata/x86-cpuid-Core-i5-2540M-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-json.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i5-2540M-json.xml
rename to tests/cputestdata/x86_64-cpuid-Core-i5-2540M-json.xml
diff --git a/tests/cputestdata/x86-cpuid-Core-i5-2540M.json b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M.json
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i5-2540M.json
rename to tests/cputestdata/x86_64-cpuid-Core-i5-2540M.json
diff --git a/tests/cputestdata/x86-cpuid-Core-i5-2540M.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i5-2540M.xml
rename to tests/cputestdata/x86_64-cpuid-Core-i5-2540M.xml
diff --git a/tests/cputestdata/x86-cpuid-Core-i5-4670T-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-guest.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i5-4670T-guest.xml
rename to tests/cputestdata/x86_64-cpuid-Core-i5-4670T-guest.xml
diff --git a/tests/cputestdata/x86-cpuid-Core-i5-4670T-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i5-4670T-host.xml
rename to tests/cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml
diff --git a/tests/cputestdata/x86-cpuid-Core-i5-4670T-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-json.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i5-4670T-json.xml
rename to tests/cputestdata/x86_64-cpuid-Core-i5-4670T-json.xml
diff --git a/tests/cputestdata/x86-cpuid-Core-i5-4670T.json b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T.json
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i5-4670T.json
rename to tests/cputestdata/x86_64-cpuid-Core-i5-4670T.json
diff --git a/tests/cputestdata/x86-cpuid-Core-i5-4670T.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i5-4670T.xml
rename to tests/cputestdata/x86_64-cpuid-Core-i5-4670T.xml
diff --git a/tests/cputestdata/x86-cpuid-Core-i5-6600-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i5-6600-guest.xml
rename to tests/cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml
diff --git a/tests/cputestdata/x86-cpuid-Core-i5-6600-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i5-6600-host.xml
rename to tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml
diff --git a/tests/cputestdata/x86-cpuid-Core-i5-6600-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-json.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i5-6600-json.xml
rename to tests/cputestdata/x86_64-cpuid-Core-i5-6600-json.xml
diff --git a/tests/cputestdata/x86-cpuid-Core-i5-6600.json b/tests/cputestdata/x86_64-cpuid-Core-i5-6600.json
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i5-6600.json
rename to tests/cputestdata/x86_64-cpuid-Core-i5-6600.json
diff --git a/tests/cputestdata/x86-cpuid-Core-i5-6600.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-6600.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i5-6600.xml
rename to tests/cputestdata/x86_64-cpuid-Core-i5-6600.xml
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-2600-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-guest.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i7-2600-guest.xml
rename to tests/cputestdata/x86_64-cpuid-Core-i7-2600-guest.xml
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-2600-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-host.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i7-2600-host.xml
rename to tests/cputestdata/x86_64-cpuid-Core-i7-2600-host.xml
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-2600-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-json.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i7-2600-json.xml
rename to tests/cputestdata/x86_64-cpuid-Core-i7-2600-json.xml
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-2600.json b/tests/cputestdata/x86_64-cpuid-Core-i7-2600.json
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i7-2600.json
rename to tests/cputestdata/x86_64-cpuid-Core-i7-2600.json
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-2600.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-2600.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i7-2600.xml
rename to tests/cputestdata/x86_64-cpuid-Core-i7-2600.xml
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-3520M-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-guest.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i7-3520M-guest.xml
rename to tests/cputestdata/x86_64-cpuid-Core-i7-3520M-guest.xml
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-3520M-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-host.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i7-3520M-host.xml
rename to tests/cputestdata/x86_64-cpuid-Core-i7-3520M-host.xml
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-3520M.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3520M.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i7-3520M.xml
rename to tests/cputestdata/x86_64-cpuid-Core-i7-3520M.xml
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-3740QM-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-guest.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i7-3740QM-guest.xml
rename to tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-guest.xml
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-3740QM-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-host.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i7-3740QM-host.xml
rename to tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-host.xml
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-3740QM-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-json.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i7-3740QM-json.xml
rename to tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-json.xml
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-3740QM.json b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM.json
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i7-3740QM.json
rename to tests/cputestdata/x86_64-cpuid-Core-i7-3740QM.json
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-3740QM.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i7-3740QM.xml
rename to tests/cputestdata/x86_64-cpuid-Core-i7-3740QM.xml
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-3770-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-guest.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i7-3770-guest.xml
rename to tests/cputestdata/x86_64-cpuid-Core-i7-3770-guest.xml
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-3770-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-host.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i7-3770-host.xml
rename to tests/cputestdata/x86_64-cpuid-Core-i7-3770-host.xml
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-3770-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-json.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i7-3770-json.xml
rename to tests/cputestdata/x86_64-cpuid-Core-i7-3770-json.xml
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-3770.json b/tests/cputestdata/x86_64-cpuid-Core-i7-3770.json
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i7-3770.json
rename to tests/cputestdata/x86_64-cpuid-Core-i7-3770.json
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-3770.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3770.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i7-3770.xml
rename to tests/cputestdata/x86_64-cpuid-Core-i7-3770.xml
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-4600U-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-guest.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i7-4600U-guest.xml
rename to tests/cputestdata/x86_64-cpuid-Core-i7-4600U-guest.xml
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-4600U-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i7-4600U-host.xml
rename to tests/cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-4600U-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-json.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i7-4600U-json.xml
rename to tests/cputestdata/x86_64-cpuid-Core-i7-4600U-json.xml
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-4600U.json b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U.json
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i7-4600U.json
rename to tests/cputestdata/x86_64-cpuid-Core-i7-4600U.json
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-4600U.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i7-4600U.xml
rename to tests/cputestdata/x86_64-cpuid-Core-i7-4600U.xml
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-5600U-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i7-5600U-guest.xml
rename to tests/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-5600U-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i7-5600U-host.xml
rename to tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-5600U-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-json.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i7-5600U-json.xml
rename to tests/cputestdata/x86_64-cpuid-Core-i7-5600U-json.xml
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-5600U.json b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U.json
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i7-5600U.json
rename to tests/cputestdata/x86_64-cpuid-Core-i7-5600U.json
diff --git a/tests/cputestdata/x86-cpuid-Core-i7-5600U.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core-i7-5600U.xml
rename to tests/cputestdata/x86_64-cpuid-Core-i7-5600U.xml
diff --git a/tests/cputestdata/x86-cpuid-Core2-E6850-guest.xml b/tests/cputestdata/x86_64-cpuid-Core2-E6850-guest.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core2-E6850-guest.xml
rename to tests/cputestdata/x86_64-cpuid-Core2-E6850-guest.xml
diff --git a/tests/cputestdata/x86-cpuid-Core2-E6850-host.xml b/tests/cputestdata/x86_64-cpuid-Core2-E6850-host.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core2-E6850-host.xml
rename to tests/cputestdata/x86_64-cpuid-Core2-E6850-host.xml
diff --git a/tests/cputestdata/x86-cpuid-Core2-E6850-json.xml b/tests/cputestdata/x86_64-cpuid-Core2-E6850-json.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core2-E6850-json.xml
rename to tests/cputestdata/x86_64-cpuid-Core2-E6850-json.xml
diff --git a/tests/cputestdata/x86-cpuid-Core2-E6850.json b/tests/cputestdata/x86_64-cpuid-Core2-E6850.json
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core2-E6850.json
rename to tests/cputestdata/x86_64-cpuid-Core2-E6850.json
diff --git a/tests/cputestdata/x86-cpuid-Core2-E6850.xml b/tests/cputestdata/x86_64-cpuid-Core2-E6850.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core2-E6850.xml
rename to tests/cputestdata/x86_64-cpuid-Core2-E6850.xml
diff --git a/tests/cputestdata/x86-cpuid-Core2-Q9500-guest.xml b/tests/cputestdata/x86_64-cpuid-Core2-Q9500-guest.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core2-Q9500-guest.xml
rename to tests/cputestdata/x86_64-cpuid-Core2-Q9500-guest.xml
diff --git a/tests/cputestdata/x86-cpuid-Core2-Q9500-host.xml b/tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core2-Q9500-host.xml
rename to tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml
diff --git a/tests/cputestdata/x86-cpuid-Core2-Q9500.xml b/tests/cputestdata/x86_64-cpuid-Core2-Q9500.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Core2-Q9500.xml
rename to tests/cputestdata/x86_64-cpuid-Core2-Q9500.xml
diff --git a/tests/cputestdata/x86-cpuid-FX-8150-guest.xml b/tests/cputestdata/x86_64-cpuid-FX-8150-guest.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-FX-8150-guest.xml
rename to tests/cputestdata/x86_64-cpuid-FX-8150-guest.xml
diff --git a/tests/cputestdata/x86-cpuid-FX-8150-host.xml b/tests/cputestdata/x86_64-cpuid-FX-8150-host.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-FX-8150-host.xml
rename to tests/cputestdata/x86_64-cpuid-FX-8150-host.xml
diff --git a/tests/cputestdata/x86-cpuid-FX-8150.xml b/tests/cputestdata/x86_64-cpuid-FX-8150.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-FX-8150.xml
rename to tests/cputestdata/x86_64-cpuid-FX-8150.xml
diff --git a/tests/cputestdata/x86-cpuid-Opteron-1352-guest.xml b/tests/cputestdata/x86_64-cpuid-Opteron-1352-guest.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Opteron-1352-guest.xml
rename to tests/cputestdata/x86_64-cpuid-Opteron-1352-guest.xml
diff --git a/tests/cputestdata/x86-cpuid-Opteron-1352-host.xml b/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Opteron-1352-host.xml
rename to tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml
diff --git a/tests/cputestdata/x86-cpuid-Opteron-1352.xml b/tests/cputestdata/x86_64-cpuid-Opteron-1352.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Opteron-1352.xml
rename to tests/cputestdata/x86_64-cpuid-Opteron-1352.xml
diff --git a/tests/cputestdata/x86-cpuid-Opteron-2350-guest.xml b/tests/cputestdata/x86_64-cpuid-Opteron-2350-guest.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Opteron-2350-guest.xml
rename to tests/cputestdata/x86_64-cpuid-Opteron-2350-guest.xml
diff --git a/tests/cputestdata/x86-cpuid-Opteron-2350-host.xml b/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Opteron-2350-host.xml
rename to tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml
diff --git a/tests/cputestdata/x86-cpuid-Opteron-2350-json.xml b/tests/cputestdata/x86_64-cpuid-Opteron-2350-json.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Opteron-2350-json.xml
rename to tests/cputestdata/x86_64-cpuid-Opteron-2350-json.xml
diff --git a/tests/cputestdata/x86-cpuid-Opteron-2350.json b/tests/cputestdata/x86_64-cpuid-Opteron-2350.json
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Opteron-2350.json
rename to tests/cputestdata/x86_64-cpuid-Opteron-2350.json
diff --git a/tests/cputestdata/x86-cpuid-Opteron-2350.xml b/tests/cputestdata/x86_64-cpuid-Opteron-2350.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Opteron-2350.xml
rename to tests/cputestdata/x86_64-cpuid-Opteron-2350.xml
diff --git a/tests/cputestdata/x86-cpuid-Opteron-6234-guest.xml b/tests/cputestdata/x86_64-cpuid-Opteron-6234-guest.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Opteron-6234-guest.xml
rename to tests/cputestdata/x86_64-cpuid-Opteron-6234-guest.xml
diff --git a/tests/cputestdata/x86-cpuid-Opteron-6234-host.xml b/tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Opteron-6234-host.xml
rename to tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml
diff --git a/tests/cputestdata/x86-cpuid-Opteron-6234-json.xml b/tests/cputestdata/x86_64-cpuid-Opteron-6234-json.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Opteron-6234-json.xml
rename to tests/cputestdata/x86_64-cpuid-Opteron-6234-json.xml
diff --git a/tests/cputestdata/x86-cpuid-Opteron-6234.json b/tests/cputestdata/x86_64-cpuid-Opteron-6234.json
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Opteron-6234.json
rename to tests/cputestdata/x86_64-cpuid-Opteron-6234.json
diff --git a/tests/cputestdata/x86-cpuid-Opteron-6234.xml b/tests/cputestdata/x86_64-cpuid-Opteron-6234.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Opteron-6234.xml
rename to tests/cputestdata/x86_64-cpuid-Opteron-6234.xml
diff --git a/tests/cputestdata/x86-cpuid-Opteron-6282-guest.xml b/tests/cputestdata/x86_64-cpuid-Opteron-6282-guest.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Opteron-6282-guest.xml
rename to tests/cputestdata/x86_64-cpuid-Opteron-6282-guest.xml
diff --git a/tests/cputestdata/x86-cpuid-Opteron-6282-host.xml b/tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Opteron-6282-host.xml
rename to tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml
diff --git a/tests/cputestdata/x86-cpuid-Opteron-6282.xml b/tests/cputestdata/x86_64-cpuid-Opteron-6282.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Opteron-6282.xml
rename to tests/cputestdata/x86_64-cpuid-Opteron-6282.xml
diff --git a/tests/cputestdata/x86-cpuid-Pentium-P6100-guest.xml b/tests/cputestdata/x86_64-cpuid-Pentium-P6100-guest.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Pentium-P6100-guest.xml
rename to tests/cputestdata/x86_64-cpuid-Pentium-P6100-guest.xml
diff --git a/tests/cputestdata/x86-cpuid-Pentium-P6100-host.xml b/tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Pentium-P6100-host.xml
rename to tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml
diff --git a/tests/cputestdata/x86-cpuid-Pentium-P6100.xml b/tests/cputestdata/x86_64-cpuid-Pentium-P6100.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Pentium-P6100.xml
rename to tests/cputestdata/x86_64-cpuid-Pentium-P6100.xml
diff --git a/tests/cputestdata/x86-cpuid-Phenom-B95-guest.xml b/tests/cputestdata/x86_64-cpuid-Phenom-B95-guest.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Phenom-B95-guest.xml
rename to tests/cputestdata/x86_64-cpuid-Phenom-B95-guest.xml
diff --git a/tests/cputestdata/x86-cpuid-Phenom-B95-host.xml b/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Phenom-B95-host.xml
rename to tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml
diff --git a/tests/cputestdata/x86-cpuid-Phenom-B95-json.xml b/tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Phenom-B95-json.xml
rename to tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml
diff --git a/tests/cputestdata/x86-cpuid-Phenom-B95.json b/tests/cputestdata/x86_64-cpuid-Phenom-B95.json
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Phenom-B95.json
rename to tests/cputestdata/x86_64-cpuid-Phenom-B95.json
diff --git a/tests/cputestdata/x86-cpuid-Phenom-B95.xml b/tests/cputestdata/x86_64-cpuid-Phenom-B95.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Phenom-B95.xml
rename to tests/cputestdata/x86_64-cpuid-Phenom-B95.xml
diff --git a/tests/cputestdata/x86-cpuid-Xeon-5110-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-5110-guest.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Xeon-5110-guest.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-5110-guest.xml
diff --git a/tests/cputestdata/x86-cpuid-Xeon-5110-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-5110-host.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Xeon-5110-host.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-5110-host.xml
diff --git a/tests/cputestdata/x86-cpuid-Xeon-5110.xml b/tests/cputestdata/x86_64-cpuid-Xeon-5110.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Xeon-5110.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-5110.xml
diff --git a/tests/cputestdata/x86-cpuid-Xeon-E3-1245-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-guest.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Xeon-E3-1245-guest.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-guest.xml
diff --git a/tests/cputestdata/x86-cpuid-Xeon-E3-1245-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-host.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Xeon-E3-1245-host.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-host.xml
diff --git a/tests/cputestdata/x86-cpuid-Xeon-E3-1245-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-json.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Xeon-E3-1245-json.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-json.xml
diff --git a/tests/cputestdata/x86-cpuid-Xeon-E3-1245.json b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.json
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Xeon-E3-1245.json
rename to tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.json
diff --git a/tests/cputestdata/x86-cpuid-Xeon-E3-1245.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Xeon-E3-1245.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.xml
diff --git a/tests/cputestdata/x86-cpuid-Xeon-E5-2630-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-guest.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Xeon-E5-2630-guest.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-guest.xml
diff --git a/tests/cputestdata/x86-cpuid-Xeon-E5-2630-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-host.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Xeon-E5-2630-host.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-host.xml
diff --git a/tests/cputestdata/x86-cpuid-Xeon-E5-2630-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-json.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Xeon-E5-2630-json.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-json.xml
diff --git a/tests/cputestdata/x86-cpuid-Xeon-E5-2630.json b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630.json
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Xeon-E5-2630.json
rename to tests/cputestdata/x86_64-cpuid-Xeon-E5-2630.json
diff --git a/tests/cputestdata/x86-cpuid-Xeon-E5-2630.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Xeon-E5-2630.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-E5-2630.xml
diff --git a/tests/cputestdata/x86-cpuid-Xeon-E5-2650-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-guest.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Xeon-E5-2650-guest.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-guest.xml
diff --git a/tests/cputestdata/x86-cpuid-Xeon-E5-2650-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Xeon-E5-2650-host.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml
diff --git a/tests/cputestdata/x86-cpuid-Xeon-E5-2650-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-json.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Xeon-E5-2650-json.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-json.xml
diff --git a/tests/cputestdata/x86-cpuid-Xeon-E5-2650.json b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.json
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Xeon-E5-2650.json
rename to tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.json
diff --git a/tests/cputestdata/x86-cpuid-Xeon-E5-2650.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Xeon-E5-2650.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-E5-2650.xml
diff --git a/tests/cputestdata/x86-cpuid-Xeon-E7-4820-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-guest.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Xeon-E7-4820-guest.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-guest.xml
diff --git a/tests/cputestdata/x86-cpuid-Xeon-E7-4820-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-host.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Xeon-E7-4820-host.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-host.xml
diff --git a/tests/cputestdata/x86-cpuid-Xeon-E7-4820-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-json.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Xeon-E7-4820-json.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-json.xml
diff --git a/tests/cputestdata/x86-cpuid-Xeon-E7-4820.json b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820.json
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Xeon-E7-4820.json
rename to tests/cputestdata/x86_64-cpuid-Xeon-E7-4820.json
diff --git a/tests/cputestdata/x86-cpuid-Xeon-E7-4820.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Xeon-E7-4820.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-E7-4820.xml
diff --git a/tests/cputestdata/x86-cpuid-Xeon-W3520-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-guest.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Xeon-W3520-guest.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-W3520-guest.xml
diff --git a/tests/cputestdata/x86-cpuid-Xeon-W3520-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-host.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Xeon-W3520-host.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-W3520-host.xml
diff --git a/tests/cputestdata/x86-cpuid-Xeon-W3520-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-json.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Xeon-W3520-json.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-W3520-json.xml
diff --git a/tests/cputestdata/x86-cpuid-Xeon-W3520.json b/tests/cputestdata/x86_64-cpuid-Xeon-W3520.json
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Xeon-W3520.json
rename to tests/cputestdata/x86_64-cpuid-Xeon-W3520.json
diff --git a/tests/cputestdata/x86-cpuid-Xeon-W3520.xml b/tests/cputestdata/x86_64-cpuid-Xeon-W3520.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Xeon-W3520.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-W3520.xml
diff --git a/tests/cputestdata/x86-cpuid-Xeon-X5460-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-X5460-guest.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Xeon-X5460-guest.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-X5460-guest.xml
diff --git a/tests/cputestdata/x86-cpuid-Xeon-X5460-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Xeon-X5460-host.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml
diff --git a/tests/cputestdata/x86-cpuid-Xeon-X5460.xml b/tests/cputestdata/x86_64-cpuid-Xeon-X5460.xml
similarity index 100%
rename from tests/cputestdata/x86-cpuid-Xeon-X5460.xml
rename to tests/cputestdata/x86_64-cpuid-Xeon-X5460.xml
diff --git a/tests/cputestdata/x86-exact-disable-extra.xml b/tests/cputestdata/x86_64-exact-disable-extra.xml
similarity index 100%
rename from tests/cputestdata/x86-exact-disable-extra.xml
rename to tests/cputestdata/x86_64-exact-disable-extra.xml
diff --git a/tests/cputestdata/x86-exact-disable.xml b/tests/cputestdata/x86_64-exact-disable.xml
similarity index 100%
rename from tests/cputestdata/x86-exact-disable.xml
rename to tests/cputestdata/x86_64-exact-disable.xml
diff --git a/tests/cputestdata/x86-exact-disable2.xml b/tests/cputestdata/x86_64-exact-disable2.xml
similarity index 100%
rename from tests/cputestdata/x86-exact-disable2.xml
rename to tests/cputestdata/x86_64-exact-disable2.xml
diff --git a/tests/cputestdata/x86-exact-forbid-extra.xml b/tests/cputestdata/x86_64-exact-forbid-extra.xml
similarity index 100%
rename from tests/cputestdata/x86-exact-forbid-extra.xml
rename to tests/cputestdata/x86_64-exact-forbid-extra.xml
diff --git a/tests/cputestdata/x86-exact-forbid.xml b/tests/cputestdata/x86_64-exact-forbid.xml
similarity index 100%
rename from tests/cputestdata/x86-exact-forbid.xml
rename to tests/cputestdata/x86_64-exact-forbid.xml
diff --git a/tests/cputestdata/x86-exact-force-Haswell.xml b/tests/cputestdata/x86_64-exact-force-Haswell.xml
similarity index 100%
rename from tests/cputestdata/x86-exact-force-Haswell.xml
rename to tests/cputestdata/x86_64-exact-force-Haswell.xml
diff --git a/tests/cputestdata/x86-exact-force.xml b/tests/cputestdata/x86_64-exact-force.xml
similarity index 100%
rename from tests/cputestdata/x86-exact-force.xml
rename to tests/cputestdata/x86_64-exact-force.xml
diff --git a/tests/cputestdata/x86-exact-require-extra.xml b/tests/cputestdata/x86_64-exact-require-extra.xml
similarity index 100%
rename from tests/cputestdata/x86-exact-require-extra.xml
rename to tests/cputestdata/x86_64-exact-require-extra.xml
diff --git a/tests/cputestdata/x86-exact-require.xml b/tests/cputestdata/x86_64-exact-require.xml
similarity index 100%
rename from tests/cputestdata/x86-exact-require.xml
rename to tests/cputestdata/x86_64-exact-require.xml
diff --git a/tests/cputestdata/x86-exact.xml b/tests/cputestdata/x86_64-exact.xml
similarity index 100%
rename from tests/cputestdata/x86-exact.xml
rename to tests/cputestdata/x86_64-exact.xml
diff --git a/tests/cputestdata/x86-guest-nofallback.xml b/tests/cputestdata/x86_64-guest-nofallback.xml
similarity index 100%
rename from tests/cputestdata/x86-guest-nofallback.xml
rename to tests/cputestdata/x86_64-guest-nofallback.xml
diff --git a/tests/cputestdata/x86-guest.xml b/tests/cputestdata/x86_64-guest.xml
similarity index 100%
rename from tests/cputestdata/x86-guest.xml
rename to tests/cputestdata/x86_64-guest.xml
diff --git a/tests/cputestdata/x86-host+guest,model486-result.xml b/tests/cputestdata/x86_64-host+guest,model486-result.xml
similarity index 100%
rename from tests/cputestdata/x86-host+guest,model486-result.xml
rename to tests/cputestdata/x86_64-host+guest,model486-result.xml
diff --git a/tests/cputestdata/x86-host+guest,models-result.xml b/tests/cputestdata/x86_64-host+guest,models-result.xml
similarity index 100%
rename from tests/cputestdata/x86-host+guest,models-result.xml
rename to tests/cputestdata/x86_64-host+guest,models-result.xml
diff --git a/tests/cputestdata/x86-host+guest-result.xml b/tests/cputestdata/x86_64-host+guest-result.xml
similarity index 100%
rename from tests/cputestdata/x86-host+guest-result.xml
rename to tests/cputestdata/x86_64-host+guest-result.xml
diff --git a/tests/cputestdata/x86-host+guest.xml b/tests/cputestdata/x86_64-host+guest.xml
similarity index 100%
rename from tests/cputestdata/x86-host+guest.xml
rename to tests/cputestdata/x86_64-host+guest.xml
diff --git a/tests/cputestdata/x86-host+host+host-model,models-result.xml b/tests/cputestdata/x86_64-host+host+host-model,models-result.xml
similarity index 100%
rename from tests/cputestdata/x86-host+host+host-model,models-result.xml
rename to tests/cputestdata/x86_64-host+host+host-model,models-result.xml
diff --git a/tests/cputestdata/x86-host+host-model-nofallback.xml b/tests/cputestdata/x86_64-host+host-model-nofallback.xml
similarity index 100%
rename from tests/cputestdata/x86-host+host-model-nofallback.xml
rename to tests/cputestdata/x86_64-host+host-model-nofallback.xml
diff --git a/tests/cputestdata/x86-host+host-model.xml b/tests/cputestdata/x86_64-host+host-model.xml
similarity index 100%
rename from tests/cputestdata/x86-host+host-model.xml
rename to tests/cputestdata/x86_64-host+host-model.xml
diff --git a/tests/cputestdata/x86-host+host-passthrough-features.xml b/tests/cputestdata/x86_64-host+host-passthrough-features.xml
similarity index 100%
rename from tests/cputestdata/x86-host+host-passthrough-features.xml
rename to tests/cputestdata/x86_64-host+host-passthrough-features.xml
diff --git a/tests/cputestdata/x86-host+host-passthrough.xml b/tests/cputestdata/x86_64-host+host-passthrough.xml
similarity index 100%
rename from tests/cputestdata/x86-host+host-passthrough.xml
rename to tests/cputestdata/x86_64-host+host-passthrough.xml
diff --git a/tests/cputestdata/x86-host+min.xml b/tests/cputestdata/x86_64-host+min.xml
similarity index 100%
rename from tests/cputestdata/x86-host+min.xml
rename to tests/cputestdata/x86_64-host+min.xml
diff --git a/tests/cputestdata/x86-host+penryn-force-result.xml b/tests/cputestdata/x86_64-host+penryn-force-result.xml
similarity index 100%
rename from tests/cputestdata/x86-host+penryn-force-result.xml
rename to tests/cputestdata/x86_64-host+penryn-force-result.xml
diff --git a/tests/cputestdata/x86-host+pentium3.xml b/tests/cputestdata/x86_64-host+pentium3.xml
similarity index 100%
rename from tests/cputestdata/x86-host+pentium3.xml
rename to tests/cputestdata/x86_64-host+pentium3.xml
diff --git a/tests/cputestdata/x86-host+strict-force-extra-result.xml b/tests/cputestdata/x86_64-host+strict-force-extra-result.xml
similarity index 100%
rename from tests/cputestdata/x86-host+strict-force-extra-result.xml
rename to tests/cputestdata/x86_64-host+strict-force-extra-result.xml
diff --git a/tests/cputestdata/x86-host-Haswell-noTSX+Haswell,haswell-result.xml b/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell,haswell-result.xml
similarity index 100%
rename from tests/cputestdata/x86-host-Haswell-noTSX+Haswell,haswell-result.xml
rename to tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell,haswell-result.xml
diff --git a/tests/cputestdata/x86-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml b/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml
similarity index 100%
rename from tests/cputestdata/x86-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml
rename to tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml
diff --git a/tests/cputestdata/x86-host-Haswell-noTSX+Haswell-noTSX-result.xml b/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX-result.xml
similarity index 100%
rename from tests/cputestdata/x86-host-Haswell-noTSX+Haswell-noTSX-result.xml
rename to tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX-result.xml
diff --git a/tests/cputestdata/x86-host-Haswell-noTSX.xml b/tests/cputestdata/x86_64-host-Haswell-noTSX.xml
similarity index 100%
rename from tests/cputestdata/x86-host-Haswell-noTSX.xml
rename to tests/cputestdata/x86_64-host-Haswell-noTSX.xml
diff --git a/tests/cputestdata/x86-host-SandyBridge.xml b/tests/cputestdata/x86_64-host-SandyBridge.xml
similarity index 100%
rename from tests/cputestdata/x86-host-SandyBridge.xml
rename to tests/cputestdata/x86_64-host-SandyBridge.xml
diff --git a/tests/cputestdata/x86-host-amd-fake.xml b/tests/cputestdata/x86_64-host-amd-fake.xml
similarity index 100%
rename from tests/cputestdata/x86-host-amd-fake.xml
rename to tests/cputestdata/x86_64-host-amd-fake.xml
diff --git a/tests/cputestdata/x86-host-amd.xml b/tests/cputestdata/x86_64-host-amd.xml
similarity index 100%
rename from tests/cputestdata/x86-host-amd.xml
rename to tests/cputestdata/x86_64-host-amd.xml
diff --git a/tests/cputestdata/x86-host-better+pentium3-result.xml b/tests/cputestdata/x86_64-host-better+pentium3-result.xml
similarity index 100%
rename from tests/cputestdata/x86-host-better+pentium3-result.xml
rename to tests/cputestdata/x86_64-host-better+pentium3-result.xml
diff --git a/tests/cputestdata/x86-host-better.xml b/tests/cputestdata/x86_64-host-better.xml
similarity index 100%
rename from tests/cputestdata/x86-host-better.xml
rename to tests/cputestdata/x86_64-host-better.xml
diff --git a/tests/cputestdata/x86-host-incomp-arch.xml b/tests/cputestdata/x86_64-host-incomp-arch.xml
similarity index 100%
rename from tests/cputestdata/x86-host-incomp-arch.xml
rename to tests/cputestdata/x86_64-host-incomp-arch.xml
diff --git a/tests/cputestdata/x86-host-invtsc+host-model.xml b/tests/cputestdata/x86_64-host-invtsc+host-model.xml
similarity index 100%
rename from tests/cputestdata/x86-host-invtsc+host-model.xml
rename to tests/cputestdata/x86_64-host-invtsc+host-model.xml
diff --git a/tests/cputestdata/x86-host-invtsc.xml b/tests/cputestdata/x86_64-host-invtsc.xml
similarity index 100%
rename from tests/cputestdata/x86-host-invtsc.xml
rename to tests/cputestdata/x86_64-host-invtsc.xml
diff --git a/tests/cputestdata/x86-host-model-nofallback.xml b/tests/cputestdata/x86_64-host-model-nofallback.xml
similarity index 100%
rename from tests/cputestdata/x86-host-model-nofallback.xml
rename to tests/cputestdata/x86_64-host-model-nofallback.xml
diff --git a/tests/cputestdata/x86-host-model.xml b/tests/cputestdata/x86_64-host-model.xml
similarity index 100%
rename from tests/cputestdata/x86-host-model.xml
rename to tests/cputestdata/x86_64-host-model.xml
diff --git a/tests/cputestdata/x86-host-no-vendor.xml b/tests/cputestdata/x86_64-host-no-vendor.xml
similarity index 100%
rename from tests/cputestdata/x86-host-no-vendor.xml
rename to tests/cputestdata/x86_64-host-no-vendor.xml
diff --git a/tests/cputestdata/x86-host-passthrough-features.xml b/tests/cputestdata/x86_64-host-passthrough-features.xml
similarity index 100%
rename from tests/cputestdata/x86-host-passthrough-features.xml
rename to tests/cputestdata/x86_64-host-passthrough-features.xml
diff --git a/tests/cputestdata/x86-host-passthrough.xml b/tests/cputestdata/x86_64-host-passthrough.xml
similarity index 100%
rename from tests/cputestdata/x86-host-passthrough.xml
rename to tests/cputestdata/x86_64-host-passthrough.xml
diff --git a/tests/cputestdata/x86-host-worse+guest-result.xml b/tests/cputestdata/x86_64-host-worse+guest-result.xml
similarity index 100%
rename from tests/cputestdata/x86-host-worse+guest-result.xml
rename to tests/cputestdata/x86_64-host-worse+guest-result.xml
diff --git a/tests/cputestdata/x86-host-worse.xml b/tests/cputestdata/x86_64-host-worse.xml
similarity index 100%
rename from tests/cputestdata/x86-host-worse.xml
rename to tests/cputestdata/x86_64-host-worse.xml
diff --git a/tests/cputestdata/x86-host.xml b/tests/cputestdata/x86_64-host.xml
similarity index 100%
rename from tests/cputestdata/x86-host.xml
rename to tests/cputestdata/x86_64-host.xml
diff --git a/tests/cputestdata/x86-min.xml b/tests/cputestdata/x86_64-min.xml
similarity index 100%
rename from tests/cputestdata/x86-min.xml
rename to tests/cputestdata/x86_64-min.xml
diff --git a/tests/cputestdata/x86-penryn-force.xml b/tests/cputestdata/x86_64-penryn-force.xml
similarity index 100%
rename from tests/cputestdata/x86-penryn-force.xml
rename to tests/cputestdata/x86_64-penryn-force.xml
diff --git a/tests/cputestdata/x86-pentium3-amd.xml b/tests/cputestdata/x86_64-pentium3-amd.xml
similarity index 100%
rename from tests/cputestdata/x86-pentium3-amd.xml
rename to tests/cputestdata/x86_64-pentium3-amd.xml
diff --git a/tests/cputestdata/x86-pentium3.xml b/tests/cputestdata/x86_64-pentium3.xml
similarity index 100%
rename from tests/cputestdata/x86-pentium3.xml
rename to tests/cputestdata/x86_64-pentium3.xml
diff --git a/tests/cputestdata/x86-strict-disable.xml b/tests/cputestdata/x86_64-strict-disable.xml
similarity index 100%
rename from tests/cputestdata/x86-strict-disable.xml
rename to tests/cputestdata/x86_64-strict-disable.xml
diff --git a/tests/cputestdata/x86-strict-force-extra.xml b/tests/cputestdata/x86_64-strict-force-extra.xml
similarity index 100%
rename from tests/cputestdata/x86-strict-force-extra.xml
rename to tests/cputestdata/x86_64-strict-force-extra.xml
diff --git a/tests/cputestdata/x86-strict-full.xml b/tests/cputestdata/x86_64-strict-full.xml
similarity index 100%
rename from tests/cputestdata/x86-strict-full.xml
rename to tests/cputestdata/x86_64-strict-full.xml
diff --git a/tests/cputestdata/x86-strict.xml b/tests/cputestdata/x86_64-strict.xml
similarity index 100%
rename from tests/cputestdata/x86-strict.xml
rename to tests/cputestdata/x86_64-strict.xml
-- 
2.11.1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]