From nobody Thu May  9 14:36:01 2024
Delivered-To: importer@patchew.org
Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied
 by domain of lists.libvirt.org) client-ip=8.43.85.245;
 envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org;
Authentication-Results: mx.zohomail.com;
	spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain
 of lists.libvirt.org)  smtp.mailfrom=devel-bounces@lists.libvirt.org;
	dmarc=fail(p=none dis=none)  header.from=redhat.com
Return-Path: <devel-bounces@lists.libvirt.org>
Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by
 mx.zohomail.com
	with SMTPS id 170713146900298.95778850516194;
 Mon, 5 Feb 2024 03:11:09 -0800 (PST)
Received: by lists.libvirt.org (Postfix, from userid 996)
	id 82B8C1D07; Mon,  5 Feb 2024 06:11:07 -0500 (EST)
Received: from lists.libvirt.org.85.43.8.in-addr.arpa (localhost [IPv6:::1])
	by lists.libvirt.org (Postfix) with ESMTP id 8868C1D9F;
	Mon,  5 Feb 2024 05:45:37 -0500 (EST)
Received: by lists.libvirt.org (Postfix, from userid 996)
	id D01811B82; Mon,  5 Feb 2024 05:44:44 -0500 (EST)
Received: from us-smtp-delivery-124.mimecast.com
 (us-smtp-delivery-124.mimecast.com [170.10.133.124])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by lists.libvirt.org (Postfix) with ESMTPS id 758CC1B82
	for <devel@lists.libvirt.org>; Mon,  5 Feb 2024 05:44:32 -0500 (EST)
Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73])
 by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,
 cipher=TLS_AES_256_GCM_SHA384) id us-mta-136-xfDa1TZ6PeeKY-vTkYntLw-1; Mon,
 05 Feb 2024 05:44:26 -0500
Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com
 [10.11.54.4])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest
 SHA256)
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8FB4E1C06900
	for <devel@lists.libvirt.org>; Mon,  5 Feb 2024 10:44:26 +0000 (UTC)
Received: from work.redhat.com (unknown [10.39.194.112])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 941B92026D66;
	Mon,  5 Feb 2024 10:44:25 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org
X-Spam-Level: 
X-Spam-Status: No,
 score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5,
	RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE
	autolearn=unavailable autolearn_force=no version=3.4.4
X-MC-Unique: xfDa1TZ6PeeKY-vTkYntLw-1
From: Tim Wiederhake <twiederh@redhat.com>
To: devel@lists.libvirt.org
Subject: [PATCH v2 1/4] cpu_map: Sort cpu features
Date: Mon,  5 Feb 2024 11:44:21 +0100
Message-ID: <20240205104424.80104-2-twiederh@redhat.com>
In-Reply-To: <20240205104424.80104-1-twiederh@redhat.com>
References: <20240205104424.80104-1-twiederh@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Message-ID-Hash: 23NUONBXTSIF5JOEJD5DCEIRY34JMHJH
X-Message-ID-Hash: 23NUONBXTSIF5JOEJD5DCEIRY34JMHJH
X-MailFrom: twiederh@redhat.com
X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency;
 loop; banned-address; member-moderation; header-match-config-1;
 header-match-config-2; header-match-config-3;
 header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia;
 implicit-dest; max-recipients; max-size; news-moderation; no-subject;
 suspicious-header
CC: Tim Wiederhake <twiederh@redhat.com>
X-Mailman-Version: 3.2.2
Precedence: list
List-Id: Development discussions about the libvirt library & tools
 <devel.lists.libvirt.org>
Archived-At: 
 <https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/message/23NUONBXTSIF5JOEJD5DCEIRY34JMHJH/>
List-Archive: 
 <https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/>
List-Help: <mailto:devel-request@lists.libvirt.org?subject=help>
List-Post: <mailto:devel@lists.libvirt.org>
List-Subscribe: <mailto:devel-join@lists.libvirt.org>
List-Unsubscribe: <mailto:devel-leave@lists.libvirt.org>
Content-Type: text/plain; charset="utf-8"; x-default="true"
Content-Transfer-Encoding: quoted-printable
X-ZM-MESSAGEID: 1707131471517100001

Some feature words were not sorted correctly.

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
---
 src/cpu_map/x86_features.xml                  | 292 +++++++++---------
 ...4-baseline-Westmere+Nehalem-migratable.xml |   4 +-
 ...86_64-baseline-Westmere+Nehalem-result.xml |   4 +-
 .../x86_64-baseline-features-result.xml       |   4 +-
 .../x86_64-cpuid-A10-5800K-guest.xml          |   8 +-
 .../x86_64-cpuid-A10-5800K-host.xml           |   8 +-
 .../x86_64-cpuid-A10-5800K-json.xml           |   8 +-
 .../x86_64-cpuid-Atom-D510-guest.xml          |  16 +-
 .../x86_64-cpuid-Atom-D510-host.xml           |  16 +-
 .../x86_64-cpuid-Atom-N450-guest.xml          |  14 +-
 .../x86_64-cpuid-Atom-N450-host.xml           |  14 +-
 .../x86_64-cpuid-Atom-P5362-guest.xml         |  12 +-
 .../x86_64-cpuid-Atom-P5362-host.xml          |  18 +-
 .../x86_64-cpuid-Atom-P5362-json.xml          |   8 +-
 .../x86_64-cpuid-Cooperlake-guest.xml         |  12 +-
 .../x86_64-cpuid-Cooperlake-host.xml          |  12 +-
 .../x86_64-cpuid-Cooperlake-json.xml          |   8 +-
 .../x86_64-cpuid-Core-i5-2500-guest.xml       |  14 +-
 .../x86_64-cpuid-Core-i5-2500-host.xml        |  14 +-
 .../x86_64-cpuid-Core-i5-2500-json.xml        |   4 +-
 .../x86_64-cpuid-Core-i5-2540M-guest.xml      |  14 +-
 .../x86_64-cpuid-Core-i5-2540M-host.xml       |  14 +-
 .../x86_64-cpuid-Core-i5-2540M-json.xml       |   4 +-
 .../x86_64-cpuid-Core-i5-4670T-guest.xml      |  16 +-
 .../x86_64-cpuid-Core-i5-4670T-host.xml       |  16 +-
 .../x86_64-cpuid-Core-i5-4670T-json.xml       |   6 +-
 .../x86_64-cpuid-Core-i5-650-guest.xml        |  14 +-
 .../x86_64-cpuid-Core-i5-650-host.xml         |  14 +-
 .../x86_64-cpuid-Core-i5-650-json.xml         |   4 +-
 .../x86_64-cpuid-Core-i5-6600-guest.xml       |  12 +-
 .../x86_64-cpuid-Core-i5-6600-host.xml        |  12 +-
 .../x86_64-cpuid-Core-i5-6600-json.xml        |   2 +-
 .../x86_64-cpuid-Core-i7-2600-guest.xml       |  14 +-
 .../x86_64-cpuid-Core-i7-2600-host.xml        |  14 +-
 .../x86_64-cpuid-Core-i7-2600-json.xml        |   4 +-
 ...6_64-cpuid-Core-i7-2600-xsaveopt-guest.xml |  14 +-
 ...86_64-cpuid-Core-i7-2600-xsaveopt-host.xml |  14 +-
 ...86_64-cpuid-Core-i7-2600-xsaveopt-json.xml |   4 +-
 .../x86_64-cpuid-Core-i7-3520M-guest.xml      |  12 +-
 .../x86_64-cpuid-Core-i7-3520M-host.xml       |  12 +-
 .../x86_64-cpuid-Core-i7-3740QM-guest.xml     |  12 +-
 .../x86_64-cpuid-Core-i7-3740QM-host.xml      |  12 +-
 .../x86_64-cpuid-Core-i7-3740QM-json.xml      |   2 +-
 .../x86_64-cpuid-Core-i7-3770-guest.xml       |  12 +-
 .../x86_64-cpuid-Core-i7-3770-host.xml        |  12 +-
 .../x86_64-cpuid-Core-i7-3770-json.xml        |   2 +-
 .../x86_64-cpuid-Core-i7-4510U-guest.xml      |  16 +-
 .../x86_64-cpuid-Core-i7-4510U-host.xml       |  16 +-
 .../x86_64-cpuid-Core-i7-4510U-json.xml       |   6 +-
 .../x86_64-cpuid-Core-i7-4600U-guest.xml      |  16 +-
 .../x86_64-cpuid-Core-i7-4600U-host.xml       |  16 +-
 .../x86_64-cpuid-Core-i7-4600U-json.xml       |   6 +-
 .../x86_64-cpuid-Core-i7-5600U-arat-guest.xml |  16 +-
 .../x86_64-cpuid-Core-i7-5600U-arat-host.xml  |  16 +-
 .../x86_64-cpuid-Core-i7-5600U-arat-json.xml  |   6 +-
 .../x86_64-cpuid-Core-i7-5600U-guest.xml      |  16 +-
 .../x86_64-cpuid-Core-i7-5600U-host.xml       |  16 +-
 .../x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml |  16 +-
 .../x86_64-cpuid-Core-i7-5600U-ibrs-host.xml  |  16 +-
 .../x86_64-cpuid-Core-i7-5600U-ibrs-json.xml  |   6 +-
 .../x86_64-cpuid-Core-i7-5600U-json.xml       |   6 +-
 .../x86_64-cpuid-Core-i7-7600U-guest.xml      |  12 +-
 .../x86_64-cpuid-Core-i7-7600U-host.xml       |  12 +-
 .../x86_64-cpuid-Core-i7-7600U-json.xml       |   2 +-
 .../x86_64-cpuid-Core-i7-7700-guest.xml       |  12 +-
 .../x86_64-cpuid-Core-i7-7700-host.xml        |  12 +-
 .../x86_64-cpuid-Core-i7-7700-json.xml        |   2 +-
 .../x86_64-cpuid-Core-i7-8550U-guest.xml      |  12 +-
 .../x86_64-cpuid-Core-i7-8550U-host.xml       |  12 +-
 .../x86_64-cpuid-Core-i7-8550U-json.xml       |   8 +-
 .../x86_64-cpuid-Core-i7-8700-guest.xml       |  12 +-
 .../x86_64-cpuid-Core-i7-8700-host.xml        |  12 +-
 .../x86_64-cpuid-Core-i7-8700-json.xml        |   2 +-
 .../x86_64-cpuid-Core2-E6850-guest.xml        |  14 +-
 .../x86_64-cpuid-Core2-E6850-host.xml         |  14 +-
 .../x86_64-cpuid-Core2-E6850-json.xml         |   4 +-
 .../x86_64-cpuid-Core2-Q9500-guest.xml        |  14 +-
 .../x86_64-cpuid-Core2-Q9500-host.xml         |  14 +-
 .../x86_64-cpuid-EPYC-7502-32-Core-guest.xml  |   2 +-
 .../x86_64-cpuid-EPYC-7502-32-Core-host.xml   |   2 +-
 .../x86_64-cpuid-EPYC-7601-32-Core-guest.xml  |   2 +-
 .../x86_64-cpuid-EPYC-7601-32-Core-host.xml   |   2 +-
 ..._64-cpuid-EPYC-7601-32-Core-ibpb-guest.xml |   2 +-
 ...6_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml |   2 +-
 ...6_64-cpuid-EPYC-7601-32-Core-ibpb-json.xml |   2 +-
 .../x86_64-cpuid-FX-8150-guest.xml            |   8 +-
 .../cputestdata/x86_64-cpuid-FX-8150-host.xml |   8 +-
 ..._64-cpuid-Hygon-C86-7185-32-core-guest.xml |   2 +-
 ...6_64-cpuid-Hygon-C86-7185-32-core-host.xml |   2 +-
 .../x86_64-cpuid-Ice-Lake-Server-guest.xml    |  12 +-
 .../x86_64-cpuid-Ice-Lake-Server-host.xml     |  12 +-
 .../x86_64-cpuid-Ice-Lake-Server-json.xml     |   2 +-
 .../x86_64-cpuid-Opteron-1352-guest.xml       |  12 +-
 .../x86_64-cpuid-Opteron-1352-host.xml        |  12 +-
 .../x86_64-cpuid-Opteron-2350-guest.xml       |  12 +-
 .../x86_64-cpuid-Opteron-2350-host.xml        |  12 +-
 .../x86_64-cpuid-Opteron-2350-json.xml        |  10 +-
 .../x86_64-cpuid-Opteron-6234-guest.xml       |   8 +-
 .../x86_64-cpuid-Opteron-6234-host.xml        |   8 +-
 .../x86_64-cpuid-Opteron-6234-json.xml        |   8 +-
 .../x86_64-cpuid-Opteron-6282-guest.xml       |   8 +-
 .../x86_64-cpuid-Opteron-6282-host.xml        |   8 +-
 .../x86_64-cpuid-Pentium-P6100-guest.xml      |  14 +-
 .../x86_64-cpuid-Pentium-P6100-host.xml       |  14 +-
 .../x86_64-cpuid-Phenom-B95-guest.xml         |  12 +-
 .../x86_64-cpuid-Phenom-B95-host.xml          |  16 +-
 .../x86_64-cpuid-Phenom-B95-json.xml          |  12 +-
 ...4-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml |   2 +-
 ...64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml |   2 +-
 ...6_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml |   2 +-
 ...86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml |   2 +-
 .../x86_64-cpuid-Xeon-5110-guest.xml          |  14 +-
 .../x86_64-cpuid-Xeon-5110-host.xml           |  14 +-
 .../x86_64-cpuid-Xeon-E3-1225-v5-guest.xml    |  12 +-
 .../x86_64-cpuid-Xeon-E3-1225-v5-host.xml     |  12 +-
 .../x86_64-cpuid-Xeon-E3-1225-v5-json.xml     |   2 +-
 .../x86_64-cpuid-Xeon-E3-1245-v5-guest.xml    |  12 +-
 .../x86_64-cpuid-Xeon-E3-1245-v5-host.xml     |  12 +-
 .../x86_64-cpuid-Xeon-E3-1245-v5-json.xml     |   2 +-
 .../x86_64-cpuid-Xeon-E5-2609-v3-guest.xml    |  16 +-
 .../x86_64-cpuid-Xeon-E5-2609-v3-host.xml     |  16 +-
 .../x86_64-cpuid-Xeon-E5-2609-v3-json.xml     |   6 +-
 .../x86_64-cpuid-Xeon-E5-2623-v4-guest.xml    |  16 +-
 .../x86_64-cpuid-Xeon-E5-2623-v4-host.xml     |  16 +-
 .../x86_64-cpuid-Xeon-E5-2623-v4-json.xml     |   6 +-
 .../x86_64-cpuid-Xeon-E5-2630-v3-guest.xml    |  16 +-
 .../x86_64-cpuid-Xeon-E5-2630-v3-host.xml     |  16 +-
 .../x86_64-cpuid-Xeon-E5-2630-v3-json.xml     |   6 +-
 .../x86_64-cpuid-Xeon-E5-2630-v4-guest.xml    |  16 +-
 .../x86_64-cpuid-Xeon-E5-2630-v4-host.xml     |  16 +-
 .../x86_64-cpuid-Xeon-E5-2630-v4-json.xml     |   6 +-
 .../x86_64-cpuid-Xeon-E5-2650-guest.xml       |  14 +-
 .../x86_64-cpuid-Xeon-E5-2650-host.xml        |  14 +-
 .../x86_64-cpuid-Xeon-E5-2650-json.xml        |   4 +-
 .../x86_64-cpuid-Xeon-E5-2650-v3-guest.xml    |  16 +-
 .../x86_64-cpuid-Xeon-E5-2650-v3-host.xml     |  16 +-
 .../x86_64-cpuid-Xeon-E5-2650-v3-json.xml     |   6 +-
 .../x86_64-cpuid-Xeon-E5-2650-v4-guest.xml    |  16 +-
 .../x86_64-cpuid-Xeon-E5-2650-v4-host.xml     |  16 +-
 .../x86_64-cpuid-Xeon-E5-2650-v4-json.xml     |   6 +-
 .../x86_64-cpuid-Xeon-E7-4820-guest.xml       |  14 +-
 .../x86_64-cpuid-Xeon-E7-4820-host.xml        |  14 +-
 .../x86_64-cpuid-Xeon-E7-4820-json.xml        |   4 +-
 .../x86_64-cpuid-Xeon-E7-4830-guest.xml       |  14 +-
 .../x86_64-cpuid-Xeon-E7-4830-host.xml        |  14 +-
 .../x86_64-cpuid-Xeon-E7-4830-json.xml        |   4 +-
 .../x86_64-cpuid-Xeon-E7-8890-v3-guest.xml    |  16 +-
 .../x86_64-cpuid-Xeon-E7-8890-v3-host.xml     |  16 +-
 .../x86_64-cpuid-Xeon-E7-8890-v3-json.xml     |   6 +-
 .../x86_64-cpuid-Xeon-E7540-guest.xml         |  14 +-
 .../x86_64-cpuid-Xeon-E7540-host.xml          |  14 +-
 .../x86_64-cpuid-Xeon-E7540-json.xml          |   4 +-
 .../x86_64-cpuid-Xeon-Gold-5115-guest.xml     |  12 +-
 .../x86_64-cpuid-Xeon-Gold-5115-host.xml      |  12 +-
 .../x86_64-cpuid-Xeon-Gold-5115-json.xml      |   2 +-
 .../x86_64-cpuid-Xeon-Gold-6130-guest.xml     |  12 +-
 .../x86_64-cpuid-Xeon-Gold-6130-host.xml      |  12 +-
 .../x86_64-cpuid-Xeon-Gold-6130-json.xml      |   2 +-
 .../x86_64-cpuid-Xeon-Gold-6148-guest.xml     |  12 +-
 .../x86_64-cpuid-Xeon-Gold-6148-host.xml      |  12 +-
 .../x86_64-cpuid-Xeon-Gold-6148-json.xml      |   2 +-
 .../x86_64-cpuid-Xeon-Platinum-8268-guest.xml |  12 +-
 .../x86_64-cpuid-Xeon-Platinum-8268-host.xml  |  12 +-
 .../x86_64-cpuid-Xeon-Platinum-8268-json.xml  |   2 +-
 .../x86_64-cpuid-Xeon-Platinum-9242-guest.xml |  12 +-
 .../x86_64-cpuid-Xeon-Platinum-9242-host.xml  |  12 +-
 .../x86_64-cpuid-Xeon-Platinum-9242-json.xml  |   8 +-
 .../x86_64-cpuid-Xeon-W3520-guest.xml         |  14 +-
 .../x86_64-cpuid-Xeon-W3520-host.xml          |  14 +-
 .../x86_64-cpuid-Xeon-W3520-json.xml          |   4 +-
 .../x86_64-cpuid-Xeon-X5460-guest.xml         |  14 +-
 .../x86_64-cpuid-Xeon-X5460-host.xml          |  14 +-
 ...id-baseline-Broadwell-IBRS+Cascadelake.xml |   6 +-
 ..._64-cpuid-baseline-Cascadelake+Icelake.xml |   2 +-
 ...puid-baseline-Cascadelake+Skylake-IBRS.xml |   2 +-
 ..._64-cpuid-baseline-Cascadelake+Skylake.xml |   2 +-
 ...-cpuid-baseline-Cooperlake+Cascadelake.xml |   8 +-
 ...6_64-cpuid-baseline-Cooperlake+Icelake.xml |   2 +-
 .../x86_64-cpuid-baseline-Haswell+Skylake.xml |   6 +-
 ...-baseline-Haswell-noTSX-IBRS+Broadwell.xml |   6 +-
 ...seline-Haswell-noTSX-IBRS+Skylake-IBRS.xml |   6 +-
 ...id-baseline-Haswell-noTSX-IBRS+Skylake.xml |   6 +-
 ...4-cpuid-baseline-Skylake-Client+Server.xml |   2 +-
 .../x86_64-host+guest,model486-result.xml     |  18 +-
 .../x86_64-host+guest,models-result.xml       |   4 +-
 ..._64-host+host+host-model,models-result.xml |  12 +-
 .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml  |   8 +-
 .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml  |   6 +-
 tests/domaincapsdata/qemu_4.2.0.x86_64.xml    |   8 +-
 .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml  |   8 +-
 .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml  |   6 +-
 tests/domaincapsdata/qemu_5.0.0.x86_64.xml    |   8 +-
 .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml  |   6 +-
 .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml  |   6 +-
 .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml  |   6 +-
 .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml  |   6 +-
 .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml  |   6 +-
 .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml  |   6 +-
 .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml  |   6 +-
 .../qemu_7.2.0-tcg.x86_64+hvf.xml             |   6 +-
 .../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml  |   6 +-
 .../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml  |   6 +-
 .../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml  |   6 +-
 .../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml  |   6 +-
 .../domaincapsdata/qemu_9.0.0-tcg.x86_64.xml  |   6 +-
 ...-host-model-fallback-kvm.x86_64-4.2.0.args |   2 +-
 ...-host-model-fallback-kvm.x86_64-5.0.0.args |   2 +-
 ...-host-model-fallback-tcg.x86_64-4.2.0.args |   2 +-
 ...-host-model-fallback-tcg.x86_64-5.0.0.args |   2 +-
 ...-host-model-fallback-tcg.x86_64-5.1.0.args |   2 +-
 ...-host-model-fallback-tcg.x86_64-5.2.0.args |   2 +-
 ...-host-model-fallback-tcg.x86_64-6.0.0.args |   2 +-
 ...-host-model-fallback-tcg.x86_64-6.1.0.args |   2 +-
 ...-host-model-fallback-tcg.x86_64-6.2.0.args |   2 +-
 ...-host-model-fallback-tcg.x86_64-7.0.0.args |   2 +-
 ...-host-model-fallback-tcg.x86_64-7.1.0.args |   2 +-
 ...-host-model-fallback-tcg.x86_64-7.2.0.args |   2 +-
 ...-host-model-fallback-tcg.x86_64-8.0.0.args |   2 +-
 ...-host-model-fallback-tcg.x86_64-8.1.0.args |   2 +-
 ...host-model-fallback-tcg.x86_64-latest.args |   2 +-
 .../cpu-host-model-kvm.x86_64-4.2.0.args      |   2 +-
 .../cpu-host-model-kvm.x86_64-5.0.0.args      |   2 +-
 ...ost-model-nofallback-kvm.x86_64-4.2.0.args |   2 +-
 ...ost-model-nofallback-kvm.x86_64-5.0.0.args |   2 +-
 ...ost-model-nofallback-tcg.x86_64-4.2.0.args |   2 +-
 ...ost-model-nofallback-tcg.x86_64-5.0.0.args |   2 +-
 ...ost-model-nofallback-tcg.x86_64-5.1.0.args |   2 +-
 ...ost-model-nofallback-tcg.x86_64-5.2.0.args |   2 +-
 ...ost-model-nofallback-tcg.x86_64-6.0.0.args |   2 +-
 ...ost-model-nofallback-tcg.x86_64-6.1.0.args |   2 +-
 ...ost-model-nofallback-tcg.x86_64-6.2.0.args |   2 +-
 ...ost-model-nofallback-tcg.x86_64-7.0.0.args |   2 +-
 ...ost-model-nofallback-tcg.x86_64-7.1.0.args |   2 +-
 ...ost-model-nofallback-tcg.x86_64-7.2.0.args |   2 +-
 ...ost-model-nofallback-tcg.x86_64-8.0.0.args |   2 +-
 ...ost-model-nofallback-tcg.x86_64-8.1.0.args |   2 +-
 ...st-model-nofallback-tcg.x86_64-latest.args |   2 +-
 .../cpu-host-model-tcg.x86_64-4.2.0.args      |   2 +-
 .../cpu-host-model-tcg.x86_64-5.0.0.args      |   2 +-
 .../cpu-host-model-tcg.x86_64-5.1.0.args      |   2 +-
 .../cpu-host-model-tcg.x86_64-5.2.0.args      |   2 +-
 .../cpu-host-model-tcg.x86_64-6.0.0.args      |   2 +-
 .../cpu-host-model-tcg.x86_64-6.1.0.args      |   2 +-
 .../cpu-host-model-tcg.x86_64-6.2.0.args      |   2 +-
 .../cpu-host-model-tcg.x86_64-7.0.0.args      |   2 +-
 .../cpu-host-model-tcg.x86_64-7.1.0.args      |   2 +-
 .../cpu-host-model-tcg.x86_64-7.2.0.args      |   2 +-
 .../cpu-host-model-tcg.x86_64-8.0.0.args      |   2 +-
 .../cpu-host-model-tcg.x86_64-8.1.0.args      |   2 +-
 .../cpu-host-model-tcg.x86_64-latest.args     |   2 +-
 250 files changed, 1158 insertions(+), 1158 deletions(-)

diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
index b79ed579b2..ded81c3667 100644
--- a/src/cpu_map/x86_features.xml
+++ b/src/cpu_map/x86_features.xml
@@ -5,98 +5,6 @@
=20
 -->
 <cpus>
-  <!-- standard features, EDX -->
-  <feature name=3D'fpu'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x00000001'/>
-  </feature>
-  <feature name=3D'vme'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x00000002'/>
-  </feature>
-  <feature name=3D'de'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x00000004'/>
-  </feature>
-  <feature name=3D'pse'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x00000008'/>
-  </feature>
-  <feature name=3D'tsc'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x00000010'/>
-  </feature>
-  <feature name=3D'msr'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x00000020'/>
-  </feature>
-  <feature name=3D'pae'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x00000040'/>
-  </feature>
-  <feature name=3D'mce'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x00000080'/>
-  </feature>
-  <feature name=3D'cx8'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x00000100'/>
-  </feature>
-  <feature name=3D'apic'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x00000200'/>
-  </feature>
-  <feature name=3D'sep'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x00000800'/>
-  </feature>
-  <feature name=3D'mtrr'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x00001000'/>
-  </feature>
-  <feature name=3D'pge'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x00002000'/>
-  </feature>
-  <feature name=3D'mca'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x00004000'/>
-  </feature>
-  <feature name=3D'cmov'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x00008000'/>
-  </feature>
-  <feature name=3D'pat'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x00010000'/>
-  </feature>
-  <feature name=3D'pse36'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x00020000'/>
-  </feature>
-  <feature name=3D'pn'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x00040000'/>
-  </feature>
-  <feature name=3D'clflush'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x00080000'/>
-  </feature>
-  <feature name=3D'ds'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x00200000'/>
-  </feature>
-  <feature name=3D'acpi'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x00400000'/>
-  </feature>
-  <feature name=3D'mmx'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x00800000'/>
-  </feature>
-  <feature name=3D'fxsr'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x01000000'/>
-  </feature>
-  <feature name=3D'sse'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x02000000'/>
-  </feature>
-  <feature name=3D'sse2'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x04000000'/>
-  </feature>
-  <feature name=3D'ss'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x08000000'/>
-  </feature>
-  <feature name=3D'ht'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x10000000'/>
-  </feature>
-  <feature name=3D'tm'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x20000000'/>
-  </feature>
-  <feature name=3D'ia64'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x40000000'/>
-  </feature>
-  <feature name=3D'pbe'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x80000000'/>
-  </feature>
-
   <!-- standard features, ECX -->
   <feature name=3D'pni'>
     <alias name=3D'sse3' source=3D'qemu'/>
@@ -196,6 +104,98 @@
     <cpuid eax_in=3D'0x01' ecx=3D'0x80000000'/>
   </feature>
=20
+  <!-- standard features, EDX -->
+  <feature name=3D'fpu'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x00000001'/>
+  </feature>
+  <feature name=3D'vme'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x00000002'/>
+  </feature>
+  <feature name=3D'de'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x00000004'/>
+  </feature>
+  <feature name=3D'pse'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x00000008'/>
+  </feature>
+  <feature name=3D'tsc'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x00000010'/>
+  </feature>
+  <feature name=3D'msr'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x00000020'/>
+  </feature>
+  <feature name=3D'pae'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x00000040'/>
+  </feature>
+  <feature name=3D'mce'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x00000080'/>
+  </feature>
+  <feature name=3D'cx8'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x00000100'/>
+  </feature>
+  <feature name=3D'apic'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x00000200'/>
+  </feature>
+  <feature name=3D'sep'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x00000800'/>
+  </feature>
+  <feature name=3D'mtrr'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x00001000'/>
+  </feature>
+  <feature name=3D'pge'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x00002000'/>
+  </feature>
+  <feature name=3D'mca'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x00004000'/>
+  </feature>
+  <feature name=3D'cmov'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x00008000'/>
+  </feature>
+  <feature name=3D'pat'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x00010000'/>
+  </feature>
+  <feature name=3D'pse36'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x00020000'/>
+  </feature>
+  <feature name=3D'pn'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x00040000'/>
+  </feature>
+  <feature name=3D'clflush'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x00080000'/>
+  </feature>
+  <feature name=3D'ds'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x00200000'/>
+  </feature>
+  <feature name=3D'acpi'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x00400000'/>
+  </feature>
+  <feature name=3D'mmx'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x00800000'/>
+  </feature>
+  <feature name=3D'fxsr'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x01000000'/>
+  </feature>
+  <feature name=3D'sse'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x02000000'/>
+  </feature>
+  <feature name=3D'sse2'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x04000000'/>
+  </feature>
+  <feature name=3D'ss'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x08000000'/>
+  </feature>
+  <feature name=3D'ht'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x10000000'/>
+  </feature>
+  <feature name=3D'tm'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x20000000'/>
+  </feature>
+  <feature name=3D'ia64'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x40000000'/>
+  </feature>
+  <feature name=3D'pbe'>
+    <cpuid eax_in=3D'0x01' edx=3D'0x80000000'/>
+  </feature>
+
   <!-- Termal Power and Management -->
   <feature name=3D'arat'>
     <cpuid eax_in=3D'0x06' eax=3D'0x00000004'/>
@@ -520,39 +520,6 @@
     <cpuid eax_in=3D'0x14' ecx_in=3D'0x00' ecx=3D'0x80000000'/>
   </feature>
=20
-  <!-- extended features, EDX -->
-  <feature name=3D'syscall'>
-    <cpuid eax_in=3D'0x80000001' edx=3D'0x00000800'/>
-  </feature>
-  <feature name=3D'nx'>
-    <alias name=3D'xd' source=3D'qemu'/>
-    <cpuid eax_in=3D'0x80000001' edx=3D'0x00100000'/>
-  </feature>
-  <feature name=3D'mmxext'>
-    <cpuid eax_in=3D'0x80000001' edx=3D'0x00400000'/>
-  </feature>
-  <feature name=3D'fxsr_opt'>
-    <alias name=3D'ffxsr' source=3D'qemu'/>
-    <alias name=3D'fxsr-opt' source=3D'qemu'/>
-    <cpuid eax_in=3D'0x80000001' edx=3D'0x02000000'/>
-  </feature>
-  <feature name=3D'pdpe1gb'>
-    <cpuid eax_in=3D'0x80000001' edx=3D'0x04000000'/>
-  </feature>
-  <feature name=3D'rdtscp'>
-    <cpuid eax_in=3D'0x80000001' edx=3D'0x08000000'/>
-  </feature>
-  <feature name=3D'lm'>
-    <alias name=3D'i64' source=3D'qemu'/>
-    <cpuid eax_in=3D'0x80000001' edx=3D'0x20000000'/>
-  </feature>
-  <feature name=3D'3dnowext'>
-    <cpuid eax_in=3D'0x80000001' edx=3D'0x40000000'/>
-  </feature>
-  <feature name=3D'3dnow'>
-    <cpuid eax_in=3D'0x80000001' edx=3D'0x80000000'/>
-  </feature>
-
   <!-- extended features, ECX -->
   <feature name=3D'lahf_lm'>
     <alias name=3D'lahf-lm' source=3D'qemu'/>
@@ -629,6 +596,39 @@
     <cpuid eax_in=3D'0x80000001' ecx=3D'0x01000000'/>
   </feature>
=20
+  <!-- extended features, EDX -->
+  <feature name=3D'syscall'>
+    <cpuid eax_in=3D'0x80000001' edx=3D'0x00000800'/>
+  </feature>
+  <feature name=3D'nx'>
+    <alias name=3D'xd' source=3D'qemu'/>
+    <cpuid eax_in=3D'0x80000001' edx=3D'0x00100000'/>
+  </feature>
+  <feature name=3D'mmxext'>
+    <cpuid eax_in=3D'0x80000001' edx=3D'0x00400000'/>
+  </feature>
+  <feature name=3D'fxsr_opt'>
+    <alias name=3D'ffxsr' source=3D'qemu'/>
+    <alias name=3D'fxsr-opt' source=3D'qemu'/>
+    <cpuid eax_in=3D'0x80000001' edx=3D'0x02000000'/>
+  </feature>
+  <feature name=3D'pdpe1gb'>
+    <cpuid eax_in=3D'0x80000001' edx=3D'0x04000000'/>
+  </feature>
+  <feature name=3D'rdtscp'>
+    <cpuid eax_in=3D'0x80000001' edx=3D'0x08000000'/>
+  </feature>
+  <feature name=3D'lm'>
+    <alias name=3D'i64' source=3D'qemu'/>
+    <cpuid eax_in=3D'0x80000001' edx=3D'0x20000000'/>
+  </feature>
+  <feature name=3D'3dnowext'>
+    <cpuid eax_in=3D'0x80000001' edx=3D'0x40000000'/>
+  </feature>
+  <feature name=3D'3dnow'>
+    <cpuid eax_in=3D'0x80000001' edx=3D'0x80000000'/>
+  </feature>
+
   <!-- Advanced Power Management edx features -->
   <feature name=3D'invtsc' migratable=3D'no'>
     <cpuid eax_in=3D'0x80000007' edx=3D'0x00000100'/>
@@ -735,6 +735,11 @@
     <cpuid eax_in=3D'0x80000021' eax=3D'0x00000100'/>
   </feature>
=20
+  <!-- IA32_CORE_CAPABILITIES features -->
+  <feature name=3D'split-lock-detect'>
+    <msr index=3D'0xcf' edx=3D'0x00000000' eax=3D'0x00000020'/>
+  </feature>
+
   <!-- IA32_ARCH_CAPABILITIES features -->
   <feature name=3D'rdctl-no'>
     <msr index=3D'0x10a' edx=3D'0x00000000' eax=3D'0x00000001'/>
@@ -782,11 +787,6 @@
     <msr index=3D'0x10a' edx=3D'0x00000000' eax=3D'0x04000000'/>
   </feature>
=20
-  <!-- IA32_CORE_CAPABILITIES features -->
-  <feature name=3D'split-lock-detect'>
-    <msr index=3D'0xcf' edx=3D'0x00000000' eax=3D'0x00000020'/>
-  </feature>
-
   <feature name=3D'vmx-ins-outs'>
     <msr index=3D'0x480' edx=3D'0x00400000' eax=3D'0x00000000'/>
   </feature>
@@ -880,22 +880,6 @@
     <msr index=3D'0x48b' edx=3D'0x00000000' eax=3D'0x04000000'/>
   </feature>
=20
-  <feature name=3D'vmx-invvpid'>
-    <msr index=3D'0x48c' edx=3D'0x00000001' eax=3D'0x00000000'/>
-  </feature>
-  <feature name=3D'vmx-invvpid-single-addr'>
-    <msr index=3D'0x48c' edx=3D'0x00000100' eax=3D'0x00000000'/>
-  </feature>
-  <feature name=3D'vmx-invvpid-single-context'>
-    <msr index=3D'0x48c' edx=3D'0x00000200' eax=3D'0x00000000'/>
-  </feature>
-  <feature name=3D'vmx-invvpid-all-context'>
-    <msr index=3D'0x48c' edx=3D'0x00000400' eax=3D'0x00000000'/>
-  </feature>
-  <feature name=3D'vmx-invvpid-single-context-noglobals'>
-    <alias name=3D'vmx-invept-single-context-noglobals' source=3D'qemu'/>
-    <msr index=3D'0x48c' edx=3D'0x00000800' eax=3D'0x00000000'/>
-  </feature>
   <feature name=3D'vmx-ept-execonly'>
     <msr index=3D'0x48c' edx=3D'0x00000000' eax=3D'0x00000001'/>
   </feature>
@@ -932,6 +916,22 @@
   <feature name=3D'vmx-invept-all-context'>
     <msr index=3D'0x48c' edx=3D'0x00000000' eax=3D'0x04000000'/>
   </feature>
+  <feature name=3D'vmx-invvpid'>
+    <msr index=3D'0x48c' edx=3D'0x00000001' eax=3D'0x00000000'/>
+  </feature>
+  <feature name=3D'vmx-invvpid-single-addr'>
+    <msr index=3D'0x48c' edx=3D'0x00000100' eax=3D'0x00000000'/>
+  </feature>
+  <feature name=3D'vmx-invvpid-single-context'>
+    <msr index=3D'0x48c' edx=3D'0x00000200' eax=3D'0x00000000'/>
+  </feature>
+  <feature name=3D'vmx-invvpid-all-context'>
+    <msr index=3D'0x48c' edx=3D'0x00000400' eax=3D'0x00000000'/>
+  </feature>
+  <feature name=3D'vmx-invvpid-single-context-noglobals'>
+    <alias name=3D'vmx-invept-single-context-noglobals' source=3D'qemu'/>
+    <msr index=3D'0x48c' edx=3D'0x00000800' eax=3D'0x00000000'/>
+  </feature>
=20
   <feature name=3D'vmx-intr-exit'>
     <msr index=3D'0x48d' edx=3D'0x00000000' eax=3D'0x00000001'/>
diff --git a/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-migratable.=
xml b/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-migratable.xml
index f5846b1619..6730ad9cb4 100644
--- a/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-migratable.xml
+++ b/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-migratable.xml
@@ -1,8 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'allow'>Westmere</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'pclmuldq'/>
   <feature policy=3D'require' name=3D'pcid'/>
   <feature policy=3D'require' name=3D'x2apic'/>
@@ -11,4 +9,6 @@
   <feature policy=3D'require' name=3D'osxsave'/>
   <feature policy=3D'require' name=3D'avx'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ss'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-result.xml =
b/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-result.xml
index 166833276c..40e2dfc8fe 100644
--- a/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-result.xml
+++ b/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-result.xml
@@ -1,8 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'allow'>Westmere</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'pclmuldq'/>
   <feature policy=3D'require' name=3D'pcid'/>
   <feature policy=3D'require' name=3D'x2apic'/>
@@ -11,5 +9,7 @@
   <feature policy=3D'require' name=3D'osxsave'/>
   <feature policy=3D'require' name=3D'avx'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-baseline-features-result.xml b/tests/=
cputestdata/x86_64-baseline-features-result.xml
index 1461a5b430..2e58f84acf 100644
--- a/tests/cputestdata/x86_64-baseline-features-result.xml
+++ b/tests/cputestdata/x86_64-baseline-features-result.xml
@@ -1,8 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Westmere</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'pclmuldq'/>
   <feature policy=3D'require' name=3D'pcid'/>
   <feature policy=3D'require' name=3D'x2apic'/>
@@ -11,4 +9,6 @@
   <feature policy=3D'require' name=3D'osxsave'/>
   <feature policy=3D'require' name=3D'avx'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ss'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-A10-5800K-guest.xml b/tests/cpu=
testdata/x86_64-cpuid-A10-5800K-guest.xml
index 8401e53d30..3a2118522e 100644
--- a/tests/cputestdata/x86_64-cpuid-A10-5800K-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-A10-5800K-guest.xml
@@ -1,13 +1,11 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Opteron_G5</model>
   <vendor>AMD</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ht'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'osxsave'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ht'/>
   <feature policy=3D'require' name=3D'bmi1'/>
-  <feature policy=3D'require' name=3D'mmxext'/>
-  <feature policy=3D'require' name=3D'fxsr_opt'/>
   <feature policy=3D'require' name=3D'cmp_legacy'/>
   <feature policy=3D'require' name=3D'extapic'/>
   <feature policy=3D'require' name=3D'cr8legacy'/>
@@ -21,6 +19,8 @@
   <feature policy=3D'require' name=3D'topoext'/>
   <feature policy=3D'require' name=3D'perfctr_core'/>
   <feature policy=3D'require' name=3D'perfctr_nb'/>
+  <feature policy=3D'require' name=3D'mmxext'/>
+  <feature policy=3D'require' name=3D'fxsr_opt'/>
   <feature policy=3D'require' name=3D'invtsc'/>
   <feature policy=3D'require' name=3D'npt'/>
   <feature policy=3D'require' name=3D'lbrv'/>
diff --git a/tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml b/tests/cput=
estdata/x86_64-cpuid-A10-5800K-host.xml
index 220dfb6467..e4a455df15 100644
--- a/tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml
@@ -3,13 +3,11 @@
   <model>Opteron_G5</model>
   <vendor>AMD</vendor>
   <signature family=3D'21' model=3D'16' stepping=3D'1'/>
-  <feature name=3D'vme'/>
-  <feature name=3D'ht'/>
   <feature name=3D'monitor'/>
   <feature name=3D'osxsave'/>
+  <feature name=3D'vme'/>
+  <feature name=3D'ht'/>
   <feature name=3D'bmi1'/>
-  <feature name=3D'mmxext'/>
-  <feature name=3D'fxsr_opt'/>
   <feature name=3D'cmp_legacy'/>
   <feature name=3D'extapic'/>
   <feature name=3D'cr8legacy'/>
@@ -23,6 +21,8 @@
   <feature name=3D'topoext'/>
   <feature name=3D'perfctr_core'/>
   <feature name=3D'perfctr_nb'/>
+  <feature name=3D'mmxext'/>
+  <feature name=3D'fxsr_opt'/>
   <feature name=3D'invtsc'/>
   <feature name=3D'npt'/>
   <feature name=3D'lbrv'/>
diff --git a/tests/cputestdata/x86_64-cpuid-A10-5800K-json.xml b/tests/cput=
estdata/x86_64-cpuid-A10-5800K-json.xml
index 51e6d2b660..a62263c8bf 100644
--- a/tests/cputestdata/x86_64-cpuid-A10-5800K-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-A10-5800K-json.xml
@@ -1,18 +1,18 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Opteron_G5</model>
   <vendor>AMD</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'x2apic'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'bmi1'/>
-  <feature policy=3D'require' name=3D'mmxext'/>
-  <feature policy=3D'require' name=3D'fxsr_opt'/>
   <feature policy=3D'require' name=3D'cmp_legacy'/>
   <feature policy=3D'require' name=3D'cr8legacy'/>
   <feature policy=3D'require' name=3D'osvw'/>
+  <feature policy=3D'require' name=3D'mmxext'/>
+  <feature policy=3D'require' name=3D'fxsr_opt'/>
   <feature policy=3D'require' name=3D'npt'/>
   <feature policy=3D'require' name=3D'nrip-save'/>
-  <feature policy=3D'disable' name=3D'rdtscp'/>
   <feature policy=3D'disable' name=3D'svm'/>
+  <feature policy=3D'disable' name=3D'rdtscp'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Atom-D510-guest.xml b/tests/cpu=
testdata/x86_64-cpuid-Atom-D510-guest.xml
index d2f7a79074..977607e7fc 100644
--- a/tests/cputestdata/x86_64-cpuid-Atom-D510-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-D510-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>n270</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'pse36'/>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
   <feature policy=3D'require' name=3D'tm2'/>
@@ -15,6 +8,13 @@
   <feature policy=3D'require' name=3D'xtpr'/>
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'movbe'/>
-  <feature policy=3D'require' name=3D'lm'/>
+  <feature policy=3D'require' name=3D'pse36'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'lahf_lm'/>
+  <feature policy=3D'require' name=3D'lm'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml b/tests/cput=
estdata/x86_64-cpuid-Atom-D510-host.xml
index 3c8a005122..1e9c6782e9 100644
--- a/tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml
@@ -3,13 +3,6 @@
   <model>n270</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'28' stepping=3D'10'/>
-  <feature name=3D'pse36'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'ds_cpl'/>
   <feature name=3D'tm2'/>
@@ -17,6 +10,13 @@
   <feature name=3D'xtpr'/>
   <feature name=3D'pdcm'/>
   <feature name=3D'movbe'/>
-  <feature name=3D'lm'/>
+  <feature name=3D'pse36'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
   <feature name=3D'lahf_lm'/>
+  <feature name=3D'lm'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Atom-N450-guest.xml b/tests/cpu=
testdata/x86_64-cpuid-Atom-N450-guest.xml
index 779faf6cef..7fbaa2d189 100644
--- a/tests/cputestdata/x86_64-cpuid-Atom-N450-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-N450-guest.xml
@@ -1,12 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>n270</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
   <feature policy=3D'require' name=3D'est'/>
@@ -15,7 +9,13 @@
   <feature policy=3D'require' name=3D'xtpr'/>
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'movbe'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
+  <feature policy=3D'require' name=3D'lahf_lm'/>
   <feature policy=3D'require' name=3D'syscall'/>
   <feature policy=3D'require' name=3D'lm'/>
-  <feature policy=3D'require' name=3D'lahf_lm'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml b/tests/cput=
estdata/x86_64-cpuid-Atom-N450-host.xml
index 1f4eb7b727..4856cf53c4 100644
--- a/tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml
@@ -3,12 +3,6 @@
   <model>n270</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'28' stepping=3D'10'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'ds_cpl'/>
   <feature name=3D'est'/>
@@ -17,7 +11,13 @@
   <feature name=3D'xtpr'/>
   <feature name=3D'pdcm'/>
   <feature name=3D'movbe'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
+  <feature name=3D'lahf_lm'/>
   <feature name=3D'syscall'/>
   <feature name=3D'lm'/>
-  <feature name=3D'lahf_lm'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml b/tests/cp=
utestdata/x86_64-cpuid-Atom-P5362-guest.xml
index c595f04e32..9077b95178 100644
--- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml
@@ -1,12 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Snowridge</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
@@ -17,6 +11,12 @@
   <feature policy=3D'require' name=3D'xtpr'/>
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'osxsave'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'cmt'/>
   <feature policy=3D'require' name=3D'intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml b/tests/cpu=
testdata/x86_64-cpuid-Atom-P5362-host.xml
index 074342911a..c830b8a649 100644
--- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml
@@ -3,13 +3,6 @@
   <model>Westmere-IBRS</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'134' stepping=3D'5'/>
-  <feature name=3D'vme'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'pclmuldq'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
@@ -26,6 +19,13 @@
   <feature name=3D'xsave'/>
   <feature name=3D'osxsave'/>
   <feature name=3D'rdrand'/>
+  <feature name=3D'vme'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
   <feature name=3D'arat'/>
   <feature name=3D'fsgsbase'/>
   <feature name=3D'tsc_adjust'/>
@@ -58,14 +58,14 @@
   <feature name=3D'mbm_total'/>
   <feature name=3D'mbm_local'/>
   <feature name=3D'intel-pt-lip'/>
-  <feature name=3D'rdtscp'/>
   <feature name=3D'3dnowprefetch'/>
+  <feature name=3D'rdtscp'/>
   <feature name=3D'invtsc'/>
+  <feature name=3D'split-lock-detect'/>
   <feature name=3D'rdctl-no'/>
   <feature name=3D'ibrs-all'/>
   <feature name=3D'skip-l1dfl-vmentry'/>
   <feature name=3D'mds-no'/>
   <feature name=3D'pschange-mc-no'/>
   <feature name=3D'taa-no'/>
-  <feature name=3D'split-lock-detect'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml b/tests/cpu=
testdata/x86_64-cpuid-Atom-P5362-json.xml
index ff7ac5b391..b334e9062c 100644
--- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-json.xml
@@ -1,10 +1,10 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Snowridge</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'vmx'/>
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'rdpid'/>
   <feature policy=3D'require' name=3D'md-clear'/>
@@ -39,9 +39,6 @@
   <feature policy=3D'require' name=3D'vmx-rdseed-exit'/>
   <feature policy=3D'require' name=3D'vmx-pml'/>
   <feature policy=3D'require' name=3D'vmx-xsaves'/>
-  <feature policy=3D'require' name=3D'vmx-invvpid'/>
-  <feature policy=3D'require' name=3D'vmx-invvpid-single-addr'/>
-  <feature policy=3D'require' name=3D'vmx-invvpid-all-context'/>
   <feature policy=3D'require' name=3D'vmx-ept-execonly'/>
   <feature policy=3D'require' name=3D'vmx-page-walk-4'/>
   <feature policy=3D'require' name=3D'vmx-ept-2mb'/>
@@ -50,6 +47,9 @@
   <feature policy=3D'require' name=3D'vmx-eptad'/>
   <feature policy=3D'require' name=3D'vmx-invept-single-context'/>
   <feature policy=3D'require' name=3D'vmx-invept-all-context'/>
+  <feature policy=3D'require' name=3D'vmx-invvpid'/>
+  <feature policy=3D'require' name=3D'vmx-invvpid-single-addr'/>
+  <feature policy=3D'require' name=3D'vmx-invvpid-all-context'/>
   <feature policy=3D'require' name=3D'vmx-intr-exit'/>
   <feature policy=3D'require' name=3D'vmx-nmi-exit'/>
   <feature policy=3D'require' name=3D'vmx-vnmi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-guest.xml b/tests/cp=
utestdata/x86_64-cpuid-Cooperlake-guest.xml
index ff516a47c7..b878e13c62 100644
--- a/tests/cputestdata/x86_64-cpuid-Cooperlake-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-guest.xml
@@ -1,12 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Cooperlake</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
@@ -18,6 +12,12 @@
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'dca'/>
   <feature policy=3D'require' name=3D'osxsave'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'cmt'/>
   <feature policy=3D'require' name=3D'mpx'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml b/tests/cpu=
testdata/x86_64-cpuid-Cooperlake-host.xml
index 8dfc62a5c1..9ff74bc029 100644
--- a/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml
@@ -3,12 +3,6 @@
   <model>Cooperlake</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'85' stepping=3D'11'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
   <feature name=3D'ds_cpl'/>
@@ -20,6 +14,12 @@
   <feature name=3D'pdcm'/>
   <feature name=3D'dca'/>
   <feature name=3D'osxsave'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'cmt'/>
   <feature name=3D'mpx'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml b/tests/cpu=
testdata/x86_64-cpuid-Cooperlake-json.xml
index 9dbb92e74f..822deb46cf 100644
--- a/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml
@@ -1,9 +1,9 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Cooperlake</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'vmx'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'mpx'/>
   <feature policy=3D'require' name=3D'umip'/>
@@ -35,9 +35,6 @@
   <feature policy=3D'require' name=3D'vmx-rdseed-exit'/>
   <feature policy=3D'require' name=3D'vmx-pml'/>
   <feature policy=3D'require' name=3D'vmx-xsaves'/>
-  <feature policy=3D'require' name=3D'vmx-invvpid'/>
-  <feature policy=3D'require' name=3D'vmx-invvpid-single-addr'/>
-  <feature policy=3D'require' name=3D'vmx-invvpid-all-context'/>
   <feature policy=3D'require' name=3D'vmx-ept-execonly'/>
   <feature policy=3D'require' name=3D'vmx-page-walk-4'/>
   <feature policy=3D'require' name=3D'vmx-ept-2mb'/>
@@ -46,6 +43,9 @@
   <feature policy=3D'require' name=3D'vmx-eptad'/>
   <feature policy=3D'require' name=3D'vmx-invept-single-context'/>
   <feature policy=3D'require' name=3D'vmx-invept-all-context'/>
+  <feature policy=3D'require' name=3D'vmx-invvpid'/>
+  <feature policy=3D'require' name=3D'vmx-invvpid-single-addr'/>
+  <feature policy=3D'require' name=3D'vmx-invvpid-all-context'/>
   <feature policy=3D'require' name=3D'vmx-intr-exit'/>
   <feature policy=3D'require' name=3D'vmx-nmi-exit'/>
   <feature policy=3D'require' name=3D'vmx-vnmi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-guest.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i5-2500-guest.xml
index 22b5cf31fd..ab2c85eede 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>SandyBridge</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
@@ -19,6 +12,13 @@
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'pcid'/>
   <feature policy=3D'require' name=3D'osxsave'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'invtsc'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-host.xml b/tests/c=
putestdata/x86_64-cpuid-Core-i5-2500-host.xml
index cf8b175db1..4d721b4d07 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-host.xml
@@ -3,13 +3,6 @@
   <model>SandyBridge</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'42' stepping=3D'7'/>
-  <feature name=3D'vme'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
   <feature name=3D'ds_cpl'/>
@@ -21,6 +14,13 @@
   <feature name=3D'pdcm'/>
   <feature name=3D'pcid'/>
   <feature name=3D'osxsave'/>
+  <feature name=3D'vme'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
   <feature name=3D'arat'/>
   <feature name=3D'xsaveopt'/>
   <feature name=3D'invtsc'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-json.xml b/tests/c=
putestdata/x86_64-cpuid-Core-i5-2500-json.xml
index c9ae651922..e83229f5eb 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-json.xml
@@ -1,10 +1,10 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>SandyBridge</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'pcid'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-guest.xml b/tests=
/cputestdata/x86_64-cpuid-Core-i5-2540M-guest.xml
index 22b5cf31fd..ab2c85eede 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>SandyBridge</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
@@ -19,6 +12,13 @@
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'pcid'/>
   <feature policy=3D'require' name=3D'osxsave'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'invtsc'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-host.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i5-2540M-host.xml
index cf8b175db1..4d721b4d07 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-host.xml
@@ -3,13 +3,6 @@
   <model>SandyBridge</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'42' stepping=3D'7'/>
-  <feature name=3D'vme'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
   <feature name=3D'ds_cpl'/>
@@ -21,6 +14,13 @@
   <feature name=3D'pdcm'/>
   <feature name=3D'pcid'/>
   <feature name=3D'osxsave'/>
+  <feature name=3D'vme'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
   <feature name=3D'arat'/>
   <feature name=3D'xsaveopt'/>
   <feature name=3D'invtsc'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-json.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i5-2540M-json.xml
index c9ae651922..e83229f5eb 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-json.xml
@@ -1,10 +1,10 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>SandyBridge</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'pcid'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-guest.xml b/tests=
/cputestdata/x86_64-cpuid-Core-i5-4670T-guest.xml
index 0ccbcd0629..e06bafe12a 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Haswell-noTSX</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
@@ -20,9 +13,16 @@
   <feature policy=3D'require' name=3D'osxsave'/>
   <feature policy=3D'require' name=3D'f16c'/>
   <feature policy=3D'require' name=3D'rdrand'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
-  <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'abm'/>
+  <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml
index 827b16cb69..bb15f84c47 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml
@@ -3,13 +3,6 @@
   <model>Haswell-noTSX</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'60' stepping=3D'3'/>
-  <feature name=3D'vme'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
   <feature name=3D'ds_cpl'/>
@@ -22,9 +15,16 @@
   <feature name=3D'osxsave'/>
   <feature name=3D'f16c'/>
   <feature name=3D'rdrand'/>
+  <feature name=3D'vme'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
   <feature name=3D'arat'/>
   <feature name=3D'tsc_adjust'/>
-  <feature name=3D'pdpe1gb'/>
   <feature name=3D'abm'/>
+  <feature name=3D'pdpe1gb'/>
   <feature name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-json.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i5-4670T-json.xml
index 489de49fb0..6c8aa67f54 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-json.xml
@@ -1,14 +1,14 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Haswell-noTSX</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'vmx'/>
   <feature policy=3D'require' name=3D'f16c'/>
   <feature policy=3D'require' name=3D'rdrand'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
-  <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'abm'/>
+  <feature policy=3D'require' name=3D'pdpe1gb'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-650-guest.xml b/tests/c=
putestdata/x86_64-cpuid-Core-i5-650-guest.xml
index 1c0d44dc0a..8290d2773d 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-650-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-650-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Westmere</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'pclmuldq'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
@@ -18,6 +11,13 @@
   <feature policy=3D'require' name=3D'tm2'/>
   <feature policy=3D'require' name=3D'xtpr'/>
   <feature policy=3D'require' name=3D'pdcm'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'rdtscp'/>
   <feature policy=3D'require' name=3D'invtsc'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-650-host.xml b/tests/cp=
utestdata/x86_64-cpuid-Core-i5-650-host.xml
index 4234c4df5a..c074a5c6ec 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-650-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-650-host.xml
@@ -3,13 +3,6 @@
   <model>Westmere</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'37' stepping=3D'2'/>
-  <feature name=3D'vme'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'pclmuldq'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
@@ -20,6 +13,13 @@
   <feature name=3D'tm2'/>
   <feature name=3D'xtpr'/>
   <feature name=3D'pdcm'/>
+  <feature name=3D'vme'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
   <feature name=3D'arat'/>
   <feature name=3D'rdtscp'/>
   <feature name=3D'invtsc'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-650-json.xml b/tests/cp=
utestdata/x86_64-cpuid-Core-i5-650-json.xml
index cb21e48a9f..76d96fc1c5 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-650-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-650-json.xml
@@ -1,12 +1,12 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Westmere</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'pclmuldq'/>
   <feature policy=3D'require' name=3D'x2apic'/>
   <feature policy=3D'require' name=3D'tsc-deadline'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'rdtscp'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml
index 5777a0bfba..4cc7ca2d90 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml
@@ -1,12 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Skylake-Client</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
@@ -17,6 +11,12 @@
   <feature policy=3D'require' name=3D'xtpr'/>
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'osxsave'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
   <feature policy=3D'require' name=3D'intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml b/tests/c=
putestdata/x86_64-cpuid-Core-i5-6600-host.xml
index c52e8db235..52ae60e86c 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml
@@ -3,12 +3,6 @@
   <model>Skylake-Client</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'94' stepping=3D'3'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
   <feature name=3D'ds_cpl'/>
@@ -19,6 +13,12 @@
   <feature name=3D'xtpr'/>
   <feature name=3D'pdcm'/>
   <feature name=3D'osxsave'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'clflushopt'/>
   <feature name=3D'intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-json.xml b/tests/c=
putestdata/x86_64-cpuid-Core-i5-6600-json.xml
index 61a52212a6..8c505d0d8f 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-json.xml
@@ -1,8 +1,8 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Skylake-Client</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
   <feature policy=3D'require' name=3D'xsaves'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-guest.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i7-2600-guest.xml
index 22b5cf31fd..ab2c85eede 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>SandyBridge</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
@@ -19,6 +12,13 @@
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'pcid'/>
   <feature policy=3D'require' name=3D'osxsave'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'invtsc'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-host.xml b/tests/c=
putestdata/x86_64-cpuid-Core-i7-2600-host.xml
index cf8b175db1..4d721b4d07 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-host.xml
@@ -3,13 +3,6 @@
   <model>SandyBridge</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'42' stepping=3D'7'/>
-  <feature name=3D'vme'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
   <feature name=3D'ds_cpl'/>
@@ -21,6 +14,13 @@
   <feature name=3D'pdcm'/>
   <feature name=3D'pcid'/>
   <feature name=3D'osxsave'/>
+  <feature name=3D'vme'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
   <feature name=3D'arat'/>
   <feature name=3D'xsaveopt'/>
   <feature name=3D'invtsc'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-json.xml b/tests/c=
putestdata/x86_64-cpuid-Core-i7-2600-json.xml
index c9ae651922..e83229f5eb 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-json.xml
@@ -1,10 +1,10 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>SandyBridge</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'pcid'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-guest.xml=
 b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-guest.xml
index 9bb60009e8..ca783d1809 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>SandyBridge</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
@@ -19,6 +12,13 @@
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'pcid'/>
   <feature policy=3D'require' name=3D'osxsave'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'invtsc'/>
   <feature policy=3D'disable' name=3D'xsaveopt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-host.xml =
b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-host.xml
index adcc4b86c5..32612c78e7 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-host.xml
@@ -3,13 +3,6 @@
   <model>SandyBridge</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'42' stepping=3D'7'/>
-  <feature name=3D'vme'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
   <feature name=3D'ds_cpl'/>
@@ -21,6 +14,13 @@
   <feature name=3D'pdcm'/>
   <feature name=3D'pcid'/>
   <feature name=3D'osxsave'/>
+  <feature name=3D'vme'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
   <feature name=3D'arat'/>
   <feature name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-json.xml =
b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-json.xml
index 3a799052e7..584fb06e51 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-json.xml
@@ -1,10 +1,10 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>SandyBridge</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'pcid'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'disable' name=3D'xsaveopt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-guest.xml b/tests=
/cputestdata/x86_64-cpuid-Core-i7-3520M-guest.xml
index fa1a43a8a4..b9490e69d2 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-guest.xml
@@ -1,12 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>IvyBridge</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
@@ -18,6 +12,12 @@
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'pcid'/>
   <feature policy=3D'require' name=3D'osxsave'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'invtsc'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-host.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i7-3520M-host.xml
index 94352ee8bf..0a31450732 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-host.xml
@@ -3,12 +3,6 @@
   <model>IvyBridge</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'58' stepping=3D'9'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
   <feature name=3D'ds_cpl'/>
@@ -20,6 +14,12 @@
   <feature name=3D'pdcm'/>
   <feature name=3D'pcid'/>
   <feature name=3D'osxsave'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
   <feature name=3D'arat'/>
   <feature name=3D'xsaveopt'/>
   <feature name=3D'invtsc'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-guest.xml b/test=
s/cputestdata/x86_64-cpuid-Core-i7-3740QM-guest.xml
index d52f49d30a..94bb757b17 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-guest.xml
@@ -1,12 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>IvyBridge</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
@@ -18,6 +12,12 @@
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'pcid'/>
   <feature policy=3D'require' name=3D'osxsave'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-host.xml b/tests=
/cputestdata/x86_64-cpuid-Core-i7-3740QM-host.xml
index e2503cd35c..126eb09786 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-host.xml
@@ -3,12 +3,6 @@
   <model>IvyBridge</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'58' stepping=3D'9'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
   <feature name=3D'ds_cpl'/>
@@ -20,6 +14,12 @@
   <feature name=3D'pdcm'/>
   <feature name=3D'pcid'/>
   <feature name=3D'osxsave'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
   <feature name=3D'arat'/>
   <feature name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-json.xml b/tests=
/cputestdata/x86_64-cpuid-Core-i7-3740QM-json.xml
index 60086b8b14..d6f88204de 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-json.xml
@@ -1,10 +1,10 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>IvyBridge</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'vmx'/>
   <feature policy=3D'require' name=3D'pcid'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-guest.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i7-3770-guest.xml
index fa1a43a8a4..b9490e69d2 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-guest.xml
@@ -1,12 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>IvyBridge</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
@@ -18,6 +12,12 @@
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'pcid'/>
   <feature policy=3D'require' name=3D'osxsave'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'invtsc'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-host.xml b/tests/c=
putestdata/x86_64-cpuid-Core-i7-3770-host.xml
index 94352ee8bf..0a31450732 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-host.xml
@@ -3,12 +3,6 @@
   <model>IvyBridge</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'58' stepping=3D'9'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
   <feature name=3D'ds_cpl'/>
@@ -20,6 +14,12 @@
   <feature name=3D'pdcm'/>
   <feature name=3D'pcid'/>
   <feature name=3D'osxsave'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
   <feature name=3D'arat'/>
   <feature name=3D'xsaveopt'/>
   <feature name=3D'invtsc'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-json.xml b/tests/c=
putestdata/x86_64-cpuid-Core-i7-3770-json.xml
index 1dc866dba1..3f7026d468 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-json.xml
@@ -1,9 +1,9 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>IvyBridge</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'pcid'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-guest.xml b/tests=
/cputestdata/x86_64-cpuid-Core-i7-4510U-guest.xml
index bcce4ece11..618b266e41 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Haswell-noTSX</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
@@ -19,11 +12,18 @@
   <feature policy=3D'require' name=3D'osxsave'/>
   <feature policy=3D'require' name=3D'f16c'/>
   <feature policy=3D'require' name=3D'rdrand'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
-  <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'abm'/>
+  <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'invtsc'/>
   <feature policy=3D'disable' name=3D'x2apic'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-host.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i7-4510U-host.xml
index a6307e834e..0e994e0623 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-host.xml
@@ -3,13 +3,6 @@
   <model>Westmere</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'69' stepping=3D'1'/>
-  <feature name=3D'vme'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'pclmuldq'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
@@ -28,6 +21,13 @@
   <feature name=3D'avx'/>
   <feature name=3D'f16c'/>
   <feature name=3D'rdrand'/>
+  <feature name=3D'vme'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
   <feature name=3D'arat'/>
   <feature name=3D'fsgsbase'/>
   <feature name=3D'tsc_adjust'/>
@@ -38,8 +38,8 @@
   <feature name=3D'erms'/>
   <feature name=3D'invpcid'/>
   <feature name=3D'xsaveopt'/>
+  <feature name=3D'abm'/>
   <feature name=3D'pdpe1gb'/>
   <feature name=3D'rdtscp'/>
-  <feature name=3D'abm'/>
   <feature name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-json.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i7-4510U-json.xml
index 3ca3b0f243..c56852e96c 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-json.xml
@@ -1,15 +1,15 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Haswell-noTSX</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'vmx'/>
   <feature policy=3D'require' name=3D'f16c'/>
   <feature policy=3D'require' name=3D'rdrand'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
-  <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'abm'/>
+  <feature policy=3D'require' name=3D'pdpe1gb'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-guest.xml b/tests=
/cputestdata/x86_64-cpuid-Core-i7-4600U-guest.xml
index 42e7c90112..a5cf3a8ebb 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Haswell-noTSX</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
@@ -20,10 +13,17 @@
   <feature policy=3D'require' name=3D'osxsave'/>
   <feature policy=3D'require' name=3D'f16c'/>
   <feature policy=3D'require' name=3D'rdrand'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
-  <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'abm'/>
+  <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml
index 8bbac47a2e..fbcb3bd63f 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml
@@ -3,13 +3,6 @@
   <model>Haswell-noTSX</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'69' stepping=3D'1'/>
-  <feature name=3D'vme'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
   <feature name=3D'ds_cpl'/>
@@ -22,10 +15,17 @@
   <feature name=3D'osxsave'/>
   <feature name=3D'f16c'/>
   <feature name=3D'rdrand'/>
+  <feature name=3D'vme'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
   <feature name=3D'arat'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'xsaveopt'/>
-  <feature name=3D'pdpe1gb'/>
   <feature name=3D'abm'/>
+  <feature name=3D'pdpe1gb'/>
   <feature name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-json.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i7-4600U-json.xml
index 3ca3b0f243..c56852e96c 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-json.xml
@@ -1,15 +1,15 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Haswell-noTSX</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'vmx'/>
   <feature policy=3D'require' name=3D'f16c'/>
   <feature policy=3D'require' name=3D'rdrand'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
-  <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'abm'/>
+  <feature policy=3D'require' name=3D'pdpe1gb'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-guest.xml b/=
tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-guest.xml
index e825e2a0fb..da6e4f8a9b 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Broadwell</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
@@ -20,11 +13,18 @@
   <feature policy=3D'require' name=3D'osxsave'/>
   <feature policy=3D'require' name=3D'f16c'/>
   <feature policy=3D'require' name=3D'rdrand'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'intel-pt'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
-  <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'abm'/>
+  <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml b/t=
ests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml
index b39148f37f..32bfc2521e 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml
@@ -3,13 +3,6 @@
   <model>Broadwell</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'61' stepping=3D'4'/>
-  <feature name=3D'vme'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
   <feature name=3D'ds_cpl'/>
@@ -22,11 +15,18 @@
   <feature name=3D'osxsave'/>
   <feature name=3D'f16c'/>
   <feature name=3D'rdrand'/>
+  <feature name=3D'vme'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
   <feature name=3D'arat'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'intel-pt'/>
   <feature name=3D'xsaveopt'/>
-  <feature name=3D'pdpe1gb'/>
   <feature name=3D'abm'/>
+  <feature name=3D'pdpe1gb'/>
   <feature name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-json.xml b/t=
ests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-json.xml
index 4f253fc08a..156765f312 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-json.xml
@@ -1,14 +1,14 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Broadwell</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'vmx'/>
   <feature policy=3D'require' name=3D'f16c'/>
   <feature policy=3D'require' name=3D'rdrand'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
-  <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'abm'/>
+  <feature policy=3D'require' name=3D'pdpe1gb'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml b/tests=
/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml
index e825e2a0fb..da6e4f8a9b 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Broadwell</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
@@ -20,11 +13,18 @@
   <feature policy=3D'require' name=3D'osxsave'/>
   <feature policy=3D'require' name=3D'f16c'/>
   <feature policy=3D'require' name=3D'rdrand'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'intel-pt'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
-  <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'abm'/>
+  <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml
index b39148f37f..32bfc2521e 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml
@@ -3,13 +3,6 @@
   <model>Broadwell</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'61' stepping=3D'4'/>
-  <feature name=3D'vme'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
   <feature name=3D'ds_cpl'/>
@@ -22,11 +15,18 @@
   <feature name=3D'osxsave'/>
   <feature name=3D'f16c'/>
   <feature name=3D'rdrand'/>
+  <feature name=3D'vme'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
   <feature name=3D'arat'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'intel-pt'/>
   <feature name=3D'xsaveopt'/>
-  <feature name=3D'pdpe1gb'/>
   <feature name=3D'abm'/>
+  <feature name=3D'pdpe1gb'/>
   <feature name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml b/=
tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml
index 5d3093cec1..2fe2645ee3 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Broadwell-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
@@ -20,12 +13,19 @@
   <feature policy=3D'require' name=3D'osxsave'/>
   <feature policy=3D'require' name=3D'f16c'/>
   <feature policy=3D'require' name=3D'rdrand'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'intel-pt'/>
   <feature policy=3D'require' name=3D'stibp'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
-  <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'abm'/>
+  <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml b/t=
ests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml
index 2ab8890464..aeea45b444 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml
@@ -3,13 +3,6 @@
   <model>Broadwell-IBRS</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'61' stepping=3D'4'/>
-  <feature name=3D'vme'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
   <feature name=3D'ds_cpl'/>
@@ -22,12 +15,19 @@
   <feature name=3D'osxsave'/>
   <feature name=3D'f16c'/>
   <feature name=3D'rdrand'/>
+  <feature name=3D'vme'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
   <feature name=3D'arat'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'intel-pt'/>
   <feature name=3D'stibp'/>
   <feature name=3D'xsaveopt'/>
-  <feature name=3D'pdpe1gb'/>
   <feature name=3D'abm'/>
+  <feature name=3D'pdpe1gb'/>
   <feature name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-json.xml b/t=
ests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-json.xml
index a736cdfb04..746165c496 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-json.xml
@@ -1,15 +1,15 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Broadwell</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'vmx'/>
   <feature policy=3D'require' name=3D'f16c'/>
   <feature policy=3D'require' name=3D'rdrand'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
-  <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'abm'/>
+  <feature policy=3D'require' name=3D'pdpe1gb'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-json.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i7-5600U-json.xml
index a736cdfb04..746165c496 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-json.xml
@@ -1,15 +1,15 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Broadwell</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'vmx'/>
   <feature policy=3D'require' name=3D'f16c'/>
   <feature policy=3D'require' name=3D'rdrand'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
-  <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'abm'/>
+  <feature policy=3D'require' name=3D'pdpe1gb'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-guest.xml b/tests=
/cputestdata/x86_64-cpuid-Core-i7-7600U-guest.xml
index b6e643cd08..fa81abf661 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-guest.xml
@@ -1,12 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Skylake-Client-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
@@ -17,6 +11,12 @@
   <feature policy=3D'require' name=3D'xtpr'/>
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'osxsave'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'sgx'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml
index 2a7493f941..949e8de327 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml
@@ -3,12 +3,6 @@
   <model>Skylake-Client-IBRS</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'142' stepping=3D'9'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
   <feature name=3D'ds_cpl'/>
@@ -19,6 +13,12 @@
   <feature name=3D'xtpr'/>
   <feature name=3D'pdcm'/>
   <feature name=3D'osxsave'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'sgx'/>
   <feature name=3D'clflushopt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-json.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i7-7600U-json.xml
index 690081493b..a0f4bc07bb 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-json.xml
@@ -1,9 +1,9 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Skylake-Client-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'vmx'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
   <feature policy=3D'require' name=3D'umip'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-guest.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i7-7700-guest.xml
index 60bace9ed6..073b099b76 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-guest.xml
@@ -1,12 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Skylake-Client</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
@@ -17,6 +11,12 @@
   <feature policy=3D'require' name=3D'xtpr'/>
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'osxsave'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'sgx'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml b/tests/c=
putestdata/x86_64-cpuid-Core-i7-7700-host.xml
index 6b9323842a..47294064f2 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml
@@ -3,12 +3,6 @@
   <model>Skylake-Client</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'158' stepping=3D'9'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
   <feature name=3D'ds_cpl'/>
@@ -19,6 +13,12 @@
   <feature name=3D'xtpr'/>
   <feature name=3D'pdcm'/>
   <feature name=3D'osxsave'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'sgx'/>
   <feature name=3D'clflushopt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-json.xml b/tests/c=
putestdata/x86_64-cpuid-Core-i7-7700-json.xml
index 12424bc67c..f797656851 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-json.xml
@@ -1,8 +1,8 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Skylake-Client</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml b/tests=
/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml
index 5ed8ac37a3..bbf4ad6c60 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml
@@ -1,12 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Skylake-Client-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
@@ -16,6 +10,12 @@
   <feature policy=3D'require' name=3D'xtpr'/>
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'osxsave'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'sgx'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml
index 805a31411d..e93b04aabd 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml
@@ -3,12 +3,6 @@
   <model>Skylake-Client-noTSX-IBRS</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'142' stepping=3D'10'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
   <feature name=3D'ds_cpl'/>
@@ -18,6 +12,12 @@
   <feature name=3D'xtpr'/>
   <feature name=3D'pdcm'/>
   <feature name=3D'osxsave'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'sgx'/>
   <feature name=3D'clflushopt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml
index e933265248..685a3aa7e3 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml
@@ -1,9 +1,9 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Skylake-Client-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'vmx'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
   <feature policy=3D'require' name=3D'umip'/>
@@ -35,9 +35,6 @@
   <feature policy=3D'require' name=3D'vmx-rdseed-exit'/>
   <feature policy=3D'require' name=3D'vmx-pml'/>
   <feature policy=3D'require' name=3D'vmx-xsaves'/>
-  <feature policy=3D'require' name=3D'vmx-invvpid'/>
-  <feature policy=3D'require' name=3D'vmx-invvpid-single-addr'/>
-  <feature policy=3D'require' name=3D'vmx-invvpid-all-context'/>
   <feature policy=3D'require' name=3D'vmx-ept-execonly'/>
   <feature policy=3D'require' name=3D'vmx-page-walk-4'/>
   <feature policy=3D'require' name=3D'vmx-ept-2mb'/>
@@ -46,6 +43,9 @@
   <feature policy=3D'require' name=3D'vmx-eptad'/>
   <feature policy=3D'require' name=3D'vmx-invept-single-context'/>
   <feature policy=3D'require' name=3D'vmx-invept-all-context'/>
+  <feature policy=3D'require' name=3D'vmx-invvpid'/>
+  <feature policy=3D'require' name=3D'vmx-invvpid-single-addr'/>
+  <feature policy=3D'require' name=3D'vmx-invvpid-all-context'/>
   <feature policy=3D'require' name=3D'vmx-intr-exit'/>
   <feature policy=3D'require' name=3D'vmx-nmi-exit'/>
   <feature policy=3D'require' name=3D'vmx-vnmi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml
index 6cedb93633..e1c1311bc2 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml
@@ -1,12 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Skylake-Client-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
@@ -17,6 +11,12 @@
   <feature policy=3D'require' name=3D'xtpr'/>
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'osxsave'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'sgx'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml b/tests/c=
putestdata/x86_64-cpuid-Core-i7-8700-host.xml
index 0cc65b4322..6eb860d82a 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml
@@ -3,12 +3,6 @@
   <model>Skylake-Client-IBRS</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'158' stepping=3D'10'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
   <feature name=3D'ds_cpl'/>
@@ -19,6 +13,12 @@
   <feature name=3D'xtpr'/>
   <feature name=3D'pdcm'/>
   <feature name=3D'osxsave'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'sgx'/>
   <feature name=3D'clflushopt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-json.xml b/tests/c=
putestdata/x86_64-cpuid-Core-i7-8700-json.xml
index fd7539f7ce..02c671e5f1 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-json.xml
@@ -1,8 +1,8 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Skylake-Client-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
   <feature policy=3D'require' name=3D'umip'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core2-E6850-guest.xml b/tests/c=
putestdata/x86_64-cpuid-Core2-E6850-guest.xml
index 2392de6ce4..c5e2d6da7a 100644
--- a/tests/cputestdata/x86_64-cpuid-Core2-E6850-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core2-E6850-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Conroe</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
@@ -18,4 +11,11 @@
   <feature policy=3D'require' name=3D'cx16'/>
   <feature policy=3D'require' name=3D'xtpr'/>
   <feature policy=3D'require' name=3D'pdcm'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core2-E6850-host.xml b/tests/cp=
utestdata/x86_64-cpuid-Core2-E6850-host.xml
index e0ec4cd795..dae7f8846e 100644
--- a/tests/cputestdata/x86_64-cpuid-Core2-E6850-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core2-E6850-host.xml
@@ -3,13 +3,6 @@
   <model>Conroe</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'15' stepping=3D'11'/>
-  <feature name=3D'vme'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
   <feature name=3D'ds_cpl'/>
@@ -20,4 +13,11 @@
   <feature name=3D'cx16'/>
   <feature name=3D'xtpr'/>
   <feature name=3D'pdcm'/>
+  <feature name=3D'vme'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core2-E6850-json.xml b/tests/cp=
utestdata/x86_64-cpuid-Core2-E6850-json.xml
index e4117c293f..735652acc2 100644
--- a/tests/cputestdata/x86_64-cpuid-Core2-E6850-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core2-E6850-json.xml
@@ -1,11 +1,11 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Conroe</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'cx16'/>
   <feature policy=3D'require' name=3D'x2apic'/>
   <feature policy=3D'require' name=3D'tsc-deadline'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core2-Q9500-guest.xml b/tests/c=
putestdata/x86_64-cpuid-Core2-Q9500-guest.xml
index aa151bc545..e69f8a6443 100644
--- a/tests/cputestdata/x86_64-cpuid-Core2-Q9500-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core2-Q9500-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Penryn</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
@@ -18,4 +11,11 @@
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'xsave'/>
   <feature policy=3D'require' name=3D'osxsave'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml b/tests/cp=
utestdata/x86_64-cpuid-Core2-Q9500-host.xml
index 586b8e0f59..dac84ba5fc 100644
--- a/tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml
@@ -3,13 +3,6 @@
   <model>Penryn</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'23' stepping=3D'10'/>
-  <feature name=3D'vme'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
   <feature name=3D'ds_cpl'/>
@@ -20,4 +13,11 @@
   <feature name=3D'pdcm'/>
   <feature name=3D'xsave'/>
   <feature name=3D'osxsave'/>
+  <feature name=3D'vme'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml b/t=
ests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml
index 9b4ee7b959..a3d4534cff 100644
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml
@@ -1,9 +1,9 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>EPYC-Rome</model>
   <vendor>AMD</vendor>
-  <feature policy=3D'require' name=3D'ht'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'osxsave'/>
+  <feature policy=3D'require' name=3D'ht'/>
   <feature policy=3D'require' name=3D'cmt'/>
   <feature policy=3D'require' name=3D'xsaves'/>
   <feature policy=3D'require' name=3D'mbm_total'/>
diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml b/te=
sts/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml
index e348e0f6f6..7829e529e7 100644
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml
@@ -3,9 +3,9 @@
   <model>EPYC-Rome</model>
   <vendor>AMD</vendor>
   <signature family=3D'23' model=3D'49' stepping=3D'0'/>
-  <feature name=3D'ht'/>
   <feature name=3D'monitor'/>
   <feature name=3D'osxsave'/>
+  <feature name=3D'ht'/>
   <feature name=3D'cmt'/>
   <feature name=3D'xsaves'/>
   <feature name=3D'mbm_total'/>
diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-guest.xml b/t=
ests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-guest.xml
index 486b41815d..68fa956557 100644
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-guest.xml
@@ -1,9 +1,9 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>EPYC</model>
   <vendor>AMD</vendor>
-  <feature policy=3D'require' name=3D'ht'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'osxsave'/>
+  <feature policy=3D'require' name=3D'ht'/>
   <feature policy=3D'require' name=3D'xsaves'/>
   <feature policy=3D'require' name=3D'cmp_legacy'/>
   <feature policy=3D'require' name=3D'extapic'/>
diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml b/te=
sts/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml
index 94f832071b..d43aaef6ff 100644
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml
@@ -3,9 +3,9 @@
   <model>EPYC</model>
   <vendor>AMD</vendor>
   <signature family=3D'23' model=3D'1' stepping=3D'2'/>
-  <feature name=3D'ht'/>
   <feature name=3D'monitor'/>
   <feature name=3D'osxsave'/>
+  <feature name=3D'ht'/>
   <feature name=3D'xsaves'/>
   <feature name=3D'cmp_legacy'/>
   <feature name=3D'extapic'/>
diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-guest.xm=
l b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-guest.xml
index ca877b867b..7960807d54 100644
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-guest.xml
@@ -1,9 +1,9 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>EPYC-IBPB</model>
   <vendor>AMD</vendor>
-  <feature policy=3D'require' name=3D'ht'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'osxsave'/>
+  <feature policy=3D'require' name=3D'ht'/>
   <feature policy=3D'require' name=3D'xsaves'/>
   <feature policy=3D'require' name=3D'cmp_legacy'/>
   <feature policy=3D'require' name=3D'extapic'/>
diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml=
 b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml
index 42b8b5f986..c5274892e9 100644
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml
@@ -3,9 +3,9 @@
   <model>EPYC-IBPB</model>
   <vendor>AMD</vendor>
   <signature family=3D'23' model=3D'1' stepping=3D'2'/>
-  <feature name=3D'ht'/>
   <feature name=3D'monitor'/>
   <feature name=3D'osxsave'/>
+  <feature name=3D'ht'/>
   <feature name=3D'xsaves'/>
   <feature name=3D'cmp_legacy'/>
   <feature name=3D'extapic'/>
diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-json.xml=
 b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-json.xml
index 45f27a9a1f..a48cec96c0 100644
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-json.xml
@@ -8,7 +8,7 @@
   <feature policy=3D'require' name=3D'cmp_legacy'/>
   <feature policy=3D'require' name=3D'npt'/>
   <feature policy=3D'require' name=3D'nrip-save'/>
-  <feature policy=3D'disable' name=3D'rdtscp'/>
   <feature policy=3D'disable' name=3D'svm'/>
+  <feature policy=3D'disable' name=3D'rdtscp'/>
   <feature policy=3D'disable' name=3D'monitor'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-FX-8150-guest.xml b/tests/cpute=
stdata/x86_64-cpuid-FX-8150-guest.xml
index ee34ea8547..1adbaaa499 100644
--- a/tests/cputestdata/x86_64-cpuid-FX-8150-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-FX-8150-guest.xml
@@ -1,12 +1,10 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Opteron_G4</model>
   <vendor>AMD</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ht'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'osxsave'/>
-  <feature policy=3D'require' name=3D'mmxext'/>
-  <feature policy=3D'require' name=3D'fxsr_opt'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ht'/>
   <feature policy=3D'require' name=3D'cmp_legacy'/>
   <feature policy=3D'require' name=3D'extapic'/>
   <feature policy=3D'require' name=3D'cr8legacy'/>
@@ -19,6 +17,8 @@
   <feature policy=3D'require' name=3D'topoext'/>
   <feature policy=3D'require' name=3D'perfctr_core'/>
   <feature policy=3D'require' name=3D'perfctr_nb'/>
+  <feature policy=3D'require' name=3D'mmxext'/>
+  <feature policy=3D'require' name=3D'fxsr_opt'/>
   <feature policy=3D'require' name=3D'invtsc'/>
   <feature policy=3D'require' name=3D'npt'/>
   <feature policy=3D'require' name=3D'lbrv'/>
diff --git a/tests/cputestdata/x86_64-cpuid-FX-8150-host.xml b/tests/cputes=
tdata/x86_64-cpuid-FX-8150-host.xml
index 4fb2d3978b..d8c6a8ac0f 100644
--- a/tests/cputestdata/x86_64-cpuid-FX-8150-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-FX-8150-host.xml
@@ -3,12 +3,10 @@
   <model>Opteron_G4</model>
   <vendor>AMD</vendor>
   <signature family=3D'21' model=3D'1' stepping=3D'2'/>
-  <feature name=3D'vme'/>
-  <feature name=3D'ht'/>
   <feature name=3D'monitor'/>
   <feature name=3D'osxsave'/>
-  <feature name=3D'mmxext'/>
-  <feature name=3D'fxsr_opt'/>
+  <feature name=3D'vme'/>
+  <feature name=3D'ht'/>
   <feature name=3D'cmp_legacy'/>
   <feature name=3D'extapic'/>
   <feature name=3D'cr8legacy'/>
@@ -21,6 +19,8 @@
   <feature name=3D'topoext'/>
   <feature name=3D'perfctr_core'/>
   <feature name=3D'perfctr_nb'/>
+  <feature name=3D'mmxext'/>
+  <feature name=3D'fxsr_opt'/>
   <feature name=3D'invtsc'/>
   <feature name=3D'npt'/>
   <feature name=3D'lbrv'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-guest.xm=
l b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-guest.xml
index 8669e5bd1b..69124529bf 100644
--- a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-guest.xml
@@ -1,9 +1,9 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Dhyana</model>
   <vendor>Hygon</vendor>
-  <feature policy=3D'require' name=3D'ht'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'osxsave'/>
+  <feature policy=3D'require' name=3D'ht'/>
   <feature policy=3D'require' name=3D'xsaves'/>
   <feature policy=3D'require' name=3D'cmp_legacy'/>
   <feature policy=3D'require' name=3D'extapic'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-host.xml=
 b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-host.xml
index ddb14c0440..8eb4095556 100644
--- a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-host.xml
@@ -3,9 +3,9 @@
   <model>Dhyana</model>
   <vendor>Hygon</vendor>
   <signature family=3D'24' model=3D'0' stepping=3D'1'/>
-  <feature name=3D'ht'/>
   <feature name=3D'monitor'/>
   <feature name=3D'osxsave'/>
+  <feature name=3D'ht'/>
   <feature name=3D'xsaves'/>
   <feature name=3D'cmp_legacy'/>
   <feature name=3D'extapic'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml b/tes=
ts/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml
index 38d95680d3..77d66956f1 100644
--- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml
@@ -1,12 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Icelake-Server</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
@@ -18,6 +12,12 @@
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'dca'/>
   <feature policy=3D'require' name=3D'osxsave'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'sgx'/>
   <feature policy=3D'require' name=3D'cmt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml b/test=
s/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml
index ccb74f41ef..6cb3a28910 100644
--- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml
@@ -3,12 +3,6 @@
   <model>Icelake-Server</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'106' stepping=3D'0'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
   <feature name=3D'ds_cpl'/>
@@ -20,6 +14,12 @@
   <feature name=3D'pdcm'/>
   <feature name=3D'dca'/>
   <feature name=3D'osxsave'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'sgx'/>
   <feature name=3D'cmt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-json.xml b/test=
s/cputestdata/x86_64-cpuid-Ice-Lake-Server-json.xml
index ada11d2608..2eded58846 100644
--- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-json.xml
@@ -1,8 +1,8 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Icelake-Server</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'avx512ifma'/>
   <feature policy=3D'require' name=3D'sha-ni'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-1352-guest.xml b/tests/=
cputestdata/x86_64-cpuid-Opteron-1352-guest.xml
index 99c6420579..881f025393 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-1352-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-1352-guest.xml
@@ -1,20 +1,20 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Opteron_G3</model>
   <vendor>AMD</vendor>
+  <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'monitor'/>
-  <feature policy=3D'require' name=3D'mmxext'/>
-  <feature policy=3D'require' name=3D'fxsr_opt'/>
-  <feature policy=3D'require' name=3D'pdpe1gb'/>
-  <feature policy=3D'require' name=3D'3dnowext'/>
-  <feature policy=3D'require' name=3D'3dnow'/>
   <feature policy=3D'require' name=3D'cmp_legacy'/>
   <feature policy=3D'require' name=3D'extapic'/>
   <feature policy=3D'require' name=3D'cr8legacy'/>
   <feature policy=3D'require' name=3D'3dnowprefetch'/>
   <feature policy=3D'require' name=3D'osvw'/>
   <feature policy=3D'require' name=3D'ibs'/>
+  <feature policy=3D'require' name=3D'mmxext'/>
+  <feature policy=3D'require' name=3D'fxsr_opt'/>
+  <feature policy=3D'require' name=3D'pdpe1gb'/>
+  <feature policy=3D'require' name=3D'3dnowext'/>
+  <feature policy=3D'require' name=3D'3dnow'/>
   <feature policy=3D'require' name=3D'invtsc'/>
   <feature policy=3D'require' name=3D'npt'/>
   <feature policy=3D'require' name=3D'lbrv'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml b/tests/c=
putestdata/x86_64-cpuid-Opteron-1352-host.xml
index 7b0b3dfe6a..53b98713e5 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml
@@ -3,20 +3,20 @@
   <model>Opteron_G3</model>
   <vendor>AMD</vendor>
   <signature family=3D'16' model=3D'2' stepping=3D'3'/>
+  <feature name=3D'monitor'/>
   <feature name=3D'vme'/>
   <feature name=3D'ht'/>
-  <feature name=3D'monitor'/>
-  <feature name=3D'mmxext'/>
-  <feature name=3D'fxsr_opt'/>
-  <feature name=3D'pdpe1gb'/>
-  <feature name=3D'3dnowext'/>
-  <feature name=3D'3dnow'/>
   <feature name=3D'cmp_legacy'/>
   <feature name=3D'extapic'/>
   <feature name=3D'cr8legacy'/>
   <feature name=3D'3dnowprefetch'/>
   <feature name=3D'osvw'/>
   <feature name=3D'ibs'/>
+  <feature name=3D'mmxext'/>
+  <feature name=3D'fxsr_opt'/>
+  <feature name=3D'pdpe1gb'/>
+  <feature name=3D'3dnowext'/>
+  <feature name=3D'3dnow'/>
   <feature name=3D'invtsc'/>
   <feature name=3D'npt'/>
   <feature name=3D'lbrv'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350-guest.xml b/tests/=
cputestdata/x86_64-cpuid-Opteron-2350-guest.xml
index 99c6420579..881f025393 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-2350-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350-guest.xml
@@ -1,20 +1,20 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Opteron_G3</model>
   <vendor>AMD</vendor>
+  <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'monitor'/>
-  <feature policy=3D'require' name=3D'mmxext'/>
-  <feature policy=3D'require' name=3D'fxsr_opt'/>
-  <feature policy=3D'require' name=3D'pdpe1gb'/>
-  <feature policy=3D'require' name=3D'3dnowext'/>
-  <feature policy=3D'require' name=3D'3dnow'/>
   <feature policy=3D'require' name=3D'cmp_legacy'/>
   <feature policy=3D'require' name=3D'extapic'/>
   <feature policy=3D'require' name=3D'cr8legacy'/>
   <feature policy=3D'require' name=3D'3dnowprefetch'/>
   <feature policy=3D'require' name=3D'osvw'/>
   <feature policy=3D'require' name=3D'ibs'/>
+  <feature policy=3D'require' name=3D'mmxext'/>
+  <feature policy=3D'require' name=3D'fxsr_opt'/>
+  <feature policy=3D'require' name=3D'pdpe1gb'/>
+  <feature policy=3D'require' name=3D'3dnowext'/>
+  <feature policy=3D'require' name=3D'3dnow'/>
   <feature policy=3D'require' name=3D'invtsc'/>
   <feature policy=3D'require' name=3D'npt'/>
   <feature policy=3D'require' name=3D'lbrv'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml b/tests/c=
putestdata/x86_64-cpuid-Opteron-2350-host.xml
index 7b0b3dfe6a..53b98713e5 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml
@@ -3,20 +3,20 @@
   <model>Opteron_G3</model>
   <vendor>AMD</vendor>
   <signature family=3D'16' model=3D'2' stepping=3D'3'/>
+  <feature name=3D'monitor'/>
   <feature name=3D'vme'/>
   <feature name=3D'ht'/>
-  <feature name=3D'monitor'/>
-  <feature name=3D'mmxext'/>
-  <feature name=3D'fxsr_opt'/>
-  <feature name=3D'pdpe1gb'/>
-  <feature name=3D'3dnowext'/>
-  <feature name=3D'3dnow'/>
   <feature name=3D'cmp_legacy'/>
   <feature name=3D'extapic'/>
   <feature name=3D'cr8legacy'/>
   <feature name=3D'3dnowprefetch'/>
   <feature name=3D'osvw'/>
   <feature name=3D'ibs'/>
+  <feature name=3D'mmxext'/>
+  <feature name=3D'fxsr_opt'/>
+  <feature name=3D'pdpe1gb'/>
+  <feature name=3D'3dnowext'/>
+  <feature name=3D'3dnow'/>
   <feature name=3D'invtsc'/>
   <feature name=3D'npt'/>
   <feature name=3D'lbrv'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350-json.xml b/tests/c=
putestdata/x86_64-cpuid-Opteron-2350-json.xml
index d874bfc049..5fc5010160 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-2350-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350-json.xml
@@ -1,19 +1,19 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Opteron_G3</model>
   <vendor>AMD</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'x2apic'/>
   <feature policy=3D'require' name=3D'tsc-deadline'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'cmp_legacy'/>
+  <feature policy=3D'require' name=3D'cr8legacy'/>
+  <feature policy=3D'require' name=3D'3dnowprefetch'/>
+  <feature policy=3D'require' name=3D'osvw'/>
   <feature policy=3D'require' name=3D'mmxext'/>
   <feature policy=3D'require' name=3D'fxsr_opt'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'3dnowext'/>
   <feature policy=3D'require' name=3D'3dnow'/>
-  <feature policy=3D'require' name=3D'cmp_legacy'/>
-  <feature policy=3D'require' name=3D'cr8legacy'/>
-  <feature policy=3D'require' name=3D'3dnowprefetch'/>
-  <feature policy=3D'require' name=3D'osvw'/>
   <feature policy=3D'require' name=3D'npt'/>
   <feature policy=3D'disable' name=3D'rdtscp'/>
   <feature policy=3D'disable' name=3D'monitor'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6234-guest.xml b/tests/=
cputestdata/x86_64-cpuid-Opteron-6234-guest.xml
index ee34ea8547..1adbaaa499 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-6234-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6234-guest.xml
@@ -1,12 +1,10 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Opteron_G4</model>
   <vendor>AMD</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ht'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'osxsave'/>
-  <feature policy=3D'require' name=3D'mmxext'/>
-  <feature policy=3D'require' name=3D'fxsr_opt'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ht'/>
   <feature policy=3D'require' name=3D'cmp_legacy'/>
   <feature policy=3D'require' name=3D'extapic'/>
   <feature policy=3D'require' name=3D'cr8legacy'/>
@@ -19,6 +17,8 @@
   <feature policy=3D'require' name=3D'topoext'/>
   <feature policy=3D'require' name=3D'perfctr_core'/>
   <feature policy=3D'require' name=3D'perfctr_nb'/>
+  <feature policy=3D'require' name=3D'mmxext'/>
+  <feature policy=3D'require' name=3D'fxsr_opt'/>
   <feature policy=3D'require' name=3D'invtsc'/>
   <feature policy=3D'require' name=3D'npt'/>
   <feature policy=3D'require' name=3D'lbrv'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml b/tests/c=
putestdata/x86_64-cpuid-Opteron-6234-host.xml
index 4fb2d3978b..d8c6a8ac0f 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml
@@ -3,12 +3,10 @@
   <model>Opteron_G4</model>
   <vendor>AMD</vendor>
   <signature family=3D'21' model=3D'1' stepping=3D'2'/>
-  <feature name=3D'vme'/>
-  <feature name=3D'ht'/>
   <feature name=3D'monitor'/>
   <feature name=3D'osxsave'/>
-  <feature name=3D'mmxext'/>
-  <feature name=3D'fxsr_opt'/>
+  <feature name=3D'vme'/>
+  <feature name=3D'ht'/>
   <feature name=3D'cmp_legacy'/>
   <feature name=3D'extapic'/>
   <feature name=3D'cr8legacy'/>
@@ -21,6 +19,8 @@
   <feature name=3D'topoext'/>
   <feature name=3D'perfctr_core'/>
   <feature name=3D'perfctr_nb'/>
+  <feature name=3D'mmxext'/>
+  <feature name=3D'fxsr_opt'/>
   <feature name=3D'invtsc'/>
   <feature name=3D'npt'/>
   <feature name=3D'lbrv'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6234-json.xml b/tests/c=
putestdata/x86_64-cpuid-Opteron-6234-json.xml
index abfc8db290..9ebdddcc8d 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-6234-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6234-json.xml
@@ -1,19 +1,19 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Opteron_G4</model>
   <vendor>AMD</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'x2apic'/>
   <feature policy=3D'require' name=3D'tsc-deadline'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
-  <feature policy=3D'require' name=3D'mmxext'/>
-  <feature policy=3D'require' name=3D'fxsr_opt'/>
   <feature policy=3D'require' name=3D'cmp_legacy'/>
   <feature policy=3D'require' name=3D'cr8legacy'/>
   <feature policy=3D'require' name=3D'osvw'/>
+  <feature policy=3D'require' name=3D'mmxext'/>
+  <feature policy=3D'require' name=3D'fxsr_opt'/>
   <feature policy=3D'require' name=3D'npt'/>
   <feature policy=3D'require' name=3D'nrip-save'/>
-  <feature policy=3D'disable' name=3D'rdtscp'/>
   <feature policy=3D'disable' name=3D'svm'/>
+  <feature policy=3D'disable' name=3D'rdtscp'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6282-guest.xml b/tests/=
cputestdata/x86_64-cpuid-Opteron-6282-guest.xml
index ee34ea8547..1adbaaa499 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-6282-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6282-guest.xml
@@ -1,12 +1,10 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Opteron_G4</model>
   <vendor>AMD</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ht'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'osxsave'/>
-  <feature policy=3D'require' name=3D'mmxext'/>
-  <feature policy=3D'require' name=3D'fxsr_opt'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ht'/>
   <feature policy=3D'require' name=3D'cmp_legacy'/>
   <feature policy=3D'require' name=3D'extapic'/>
   <feature policy=3D'require' name=3D'cr8legacy'/>
@@ -19,6 +17,8 @@
   <feature policy=3D'require' name=3D'topoext'/>
   <feature policy=3D'require' name=3D'perfctr_core'/>
   <feature policy=3D'require' name=3D'perfctr_nb'/>
+  <feature policy=3D'require' name=3D'mmxext'/>
+  <feature policy=3D'require' name=3D'fxsr_opt'/>
   <feature policy=3D'require' name=3D'invtsc'/>
   <feature policy=3D'require' name=3D'npt'/>
   <feature policy=3D'require' name=3D'lbrv'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml b/tests/c=
putestdata/x86_64-cpuid-Opteron-6282-host.xml
index 4fb2d3978b..d8c6a8ac0f 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml
@@ -3,12 +3,10 @@
   <model>Opteron_G4</model>
   <vendor>AMD</vendor>
   <signature family=3D'21' model=3D'1' stepping=3D'2'/>
-  <feature name=3D'vme'/>
-  <feature name=3D'ht'/>
   <feature name=3D'monitor'/>
   <feature name=3D'osxsave'/>
-  <feature name=3D'mmxext'/>
-  <feature name=3D'fxsr_opt'/>
+  <feature name=3D'vme'/>
+  <feature name=3D'ht'/>
   <feature name=3D'cmp_legacy'/>
   <feature name=3D'extapic'/>
   <feature name=3D'cr8legacy'/>
@@ -21,6 +19,8 @@
   <feature name=3D'topoext'/>
   <feature name=3D'perfctr_core'/>
   <feature name=3D'perfctr_nb'/>
+  <feature name=3D'mmxext'/>
+  <feature name=3D'fxsr_opt'/>
   <feature name=3D'invtsc'/>
   <feature name=3D'npt'/>
   <feature name=3D'lbrv'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Pentium-P6100-guest.xml b/tests=
/cputestdata/x86_64-cpuid-Pentium-P6100-guest.xml
index 20e2fa363a..820a1a06c1 100644
--- a/tests/cputestdata/x86_64-cpuid-Pentium-P6100-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Pentium-P6100-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Westmere</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
@@ -16,6 +9,13 @@
   <feature policy=3D'require' name=3D'xtpr'/>
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'pcid'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'rdtscp'/>
   <feature policy=3D'require' name=3D'invtsc'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml b/tests/=
cputestdata/x86_64-cpuid-Pentium-P6100-host.xml
index a70f8ccd46..a1a42d4b83 100644
--- a/tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml
@@ -3,12 +3,6 @@
   <model>core2duo</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'37' stepping=3D'5'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'ds_cpl'/>
   <feature name=3D'est'/>
@@ -18,8 +12,14 @@
   <feature name=3D'pdcm'/>
   <feature name=3D'pcid'/>
   <feature name=3D'popcnt'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
   <feature name=3D'arat'/>
-  <feature name=3D'rdtscp'/>
   <feature name=3D'lahf_lm'/>
+  <feature name=3D'rdtscp'/>
   <feature name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95-guest.xml b/tests/cp=
utestdata/x86_64-cpuid-Phenom-B95-guest.xml
index f6106fdb1f..480d62865a 100644
--- a/tests/cputestdata/x86_64-cpuid-Phenom-B95-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95-guest.xml
@@ -1,14 +1,9 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Opteron_G3</model>
   <vendor>AMD</vendor>
+  <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'monitor'/>
-  <feature policy=3D'require' name=3D'mmxext'/>
-  <feature policy=3D'require' name=3D'fxsr_opt'/>
-  <feature policy=3D'require' name=3D'pdpe1gb'/>
-  <feature policy=3D'require' name=3D'3dnowext'/>
-  <feature policy=3D'require' name=3D'3dnow'/>
   <feature policy=3D'require' name=3D'cmp_legacy'/>
   <feature policy=3D'require' name=3D'extapic'/>
   <feature policy=3D'require' name=3D'cr8legacy'/>
@@ -17,6 +12,11 @@
   <feature policy=3D'require' name=3D'ibs'/>
   <feature policy=3D'require' name=3D'skinit'/>
   <feature policy=3D'require' name=3D'wdt'/>
+  <feature policy=3D'require' name=3D'mmxext'/>
+  <feature policy=3D'require' name=3D'fxsr_opt'/>
+  <feature policy=3D'require' name=3D'pdpe1gb'/>
+  <feature policy=3D'require' name=3D'3dnowext'/>
+  <feature policy=3D'require' name=3D'3dnow'/>
   <feature policy=3D'require' name=3D'invtsc'/>
   <feature policy=3D'require' name=3D'npt'/>
   <feature policy=3D'require' name=3D'lbrv'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml b/tests/cpu=
testdata/x86_64-cpuid-Phenom-B95-host.xml
index dba7b2b161..6a4196b735 100644
--- a/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml
@@ -3,18 +3,13 @@
   <model>athlon</model>
   <vendor>AMD</vendor>
   <signature family=3D'16' model=3D'4' stepping=3D'2'/>
-  <feature name=3D'mca'/>
-  <feature name=3D'clflush'/>
-  <feature name=3D'ht'/>
   <feature name=3D'pni'/>
   <feature name=3D'monitor'/>
   <feature name=3D'cx16'/>
   <feature name=3D'popcnt'/>
-  <feature name=3D'syscall'/>
-  <feature name=3D'fxsr_opt'/>
-  <feature name=3D'pdpe1gb'/>
-  <feature name=3D'rdtscp'/>
-  <feature name=3D'lm'/>
+  <feature name=3D'mca'/>
+  <feature name=3D'clflush'/>
+  <feature name=3D'ht'/>
   <feature name=3D'lahf_lm'/>
   <feature name=3D'cmp_legacy'/>
   <feature name=3D'svm'/>
@@ -28,6 +23,11 @@
   <feature name=3D'ibs'/>
   <feature name=3D'skinit'/>
   <feature name=3D'wdt'/>
+  <feature name=3D'syscall'/>
+  <feature name=3D'fxsr_opt'/>
+  <feature name=3D'pdpe1gb'/>
+  <feature name=3D'rdtscp'/>
+  <feature name=3D'lm'/>
   <feature name=3D'invtsc'/>
   <feature name=3D'npt'/>
   <feature name=3D'lbrv'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml b/tests/cpu=
testdata/x86_64-cpuid-Phenom-B95-json.xml
index 7f6289c6d7..91bfb6244a 100644
--- a/tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml
@@ -1,17 +1,13 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>athlon</model>
   <vendor>AMD</vendor>
-  <feature policy=3D'require' name=3D'mca'/>
-  <feature policy=3D'require' name=3D'clflush'/>
   <feature policy=3D'require' name=3D'pni'/>
   <feature policy=3D'require' name=3D'cx16'/>
   <feature policy=3D'require' name=3D'x2apic'/>
   <feature policy=3D'require' name=3D'popcnt'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
-  <feature policy=3D'require' name=3D'syscall'/>
-  <feature policy=3D'require' name=3D'fxsr_opt'/>
-  <feature policy=3D'require' name=3D'pdpe1gb'/>
-  <feature policy=3D'require' name=3D'lm'/>
+  <feature policy=3D'require' name=3D'mca'/>
+  <feature policy=3D'require' name=3D'clflush'/>
   <feature policy=3D'require' name=3D'lahf_lm'/>
   <feature policy=3D'require' name=3D'cmp_legacy'/>
   <feature policy=3D'require' name=3D'cr8legacy'/>
@@ -20,6 +16,10 @@
   <feature policy=3D'require' name=3D'misalignsse'/>
   <feature policy=3D'require' name=3D'3dnowprefetch'/>
   <feature policy=3D'require' name=3D'osvw'/>
+  <feature policy=3D'require' name=3D'syscall'/>
+  <feature policy=3D'require' name=3D'fxsr_opt'/>
+  <feature policy=3D'require' name=3D'pdpe1gb'/>
+  <feature policy=3D'require' name=3D'lm'/>
   <feature policy=3D'require' name=3D'npt'/>
   <feature policy=3D'require' name=3D'nrip-save'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-guest.=
xml b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml
index 486b41815d..68fa956557 100644
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml
@@ -1,9 +1,9 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>EPYC</model>
   <vendor>AMD</vendor>
-  <feature policy=3D'require' name=3D'ht'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'osxsave'/>
+  <feature policy=3D'require' name=3D'ht'/>
   <feature policy=3D'require' name=3D'xsaves'/>
   <feature policy=3D'require' name=3D'cmp_legacy'/>
   <feature policy=3D'require' name=3D'extapic'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-host.x=
ml b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml
index 1b0b0d4407..0f7a5ad4e4 100644
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml
@@ -3,9 +3,9 @@
   <model>EPYC</model>
   <vendor>AMD</vendor>
   <signature family=3D'23' model=3D'1' stepping=3D'1'/>
-  <feature name=3D'ht'/>
   <feature name=3D'monitor'/>
   <feature name=3D'osxsave'/>
+  <feature name=3D'ht'/>
   <feature name=3D'xsaves'/>
   <feature name=3D'cmp_legacy'/>
   <feature name=3D'extapic'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml=
 b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml
index e934f4e8ef..8ab0737eb3 100644
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml
@@ -1,9 +1,9 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>EPYC-Rome</model>
   <vendor>AMD</vendor>
-  <feature policy=3D'require' name=3D'ht'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'osxsave'/>
+  <feature policy=3D'require' name=3D'ht'/>
   <feature policy=3D'require' name=3D'cmt'/>
   <feature policy=3D'require' name=3D'xsaves'/>
   <feature policy=3D'require' name=3D'mbm_total'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml =
b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml
index f1f4df1176..25e1f45186 100644
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml
@@ -3,9 +3,9 @@
   <model>EPYC-Rome</model>
   <vendor>AMD</vendor>
   <signature family=3D'23' model=3D'113' stepping=3D'0'/>
-  <feature name=3D'ht'/>
   <feature name=3D'monitor'/>
   <feature name=3D'osxsave'/>
+  <feature name=3D'ht'/>
   <feature name=3D'cmt'/>
   <feature name=3D'xsaves'/>
   <feature name=3D'mbm_total'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-5110-guest.xml b/tests/cpu=
testdata/x86_64-cpuid-Xeon-5110-guest.xml
index d1b442d33f..7561906d88 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-5110-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-5110-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Conroe</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
@@ -17,4 +10,11 @@
   <feature policy=3D'require' name=3D'xtpr'/>
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'dca'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-5110-host.xml b/tests/cput=
estdata/x86_64-cpuid-Xeon-5110-host.xml
index beb465df86..ec509f92e4 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-5110-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-5110-host.xml
@@ -3,13 +3,6 @@
   <model>Conroe</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'15' stepping=3D'6'/>
-  <feature name=3D'vme'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
   <feature name=3D'ds_cpl'/>
@@ -19,4 +12,11 @@
   <feature name=3D'xtpr'/>
   <feature name=3D'pdcm'/>
   <feature name=3D'dca'/>
+  <feature name=3D'vme'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml b/tes=
ts/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
index ea1c79c0df..43038faac3 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
@@ -1,12 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Skylake-Client-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
@@ -17,6 +11,12 @@
   <feature policy=3D'require' name=3D'xtpr'/>
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'osxsave'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'sgx'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
index d7a7f30b9e..be752ae794 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
@@ -3,12 +3,6 @@
   <model>Skylake-Client-IBRS</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'94' stepping=3D'3'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
   <feature name=3D'ds_cpl'/>
@@ -19,6 +13,12 @@
   <feature name=3D'xtpr'/>
   <feature name=3D'pdcm'/>
   <feature name=3D'osxsave'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'sgx'/>
   <feature name=3D'clflushopt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml
index a5591278df..9ff862a51b 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml
@@ -1,8 +1,8 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Skylake-Client-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
   <feature policy=3D'require' name=3D'md-clear'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-guest.xml b/tes=
ts/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-guest.xml
index 60bace9ed6..073b099b76 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-guest.xml
@@ -1,12 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Skylake-Client</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
@@ -17,6 +11,12 @@
   <feature policy=3D'require' name=3D'xtpr'/>
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'osxsave'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'sgx'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml
index d2f808f9a6..50890d7006 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml
@@ -3,12 +3,6 @@
   <model>Skylake-Client</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'94' stepping=3D'3'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
   <feature name=3D'ds_cpl'/>
@@ -19,6 +13,12 @@
   <feature name=3D'xtpr'/>
   <feature name=3D'pdcm'/>
   <feature name=3D'osxsave'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'sgx'/>
   <feature name=3D'clflushopt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-json.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-json.xml
index ad98679027..df83cf79a0 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-json.xml
@@ -1,9 +1,9 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Skylake-Client</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'vmx'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
   <feature policy=3D'require' name=3D'xsaves'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-guest.xml b/tes=
ts/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-guest.xml
index d8aaaad29d..9f7b0376b5 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Haswell-noTSX-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
@@ -21,12 +14,19 @@
   <feature policy=3D'require' name=3D'osxsave'/>
   <feature policy=3D'require' name=3D'f16c'/>
   <feature policy=3D'require' name=3D'rdrand'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'cmt'/>
   <feature policy=3D'require' name=3D'stibp'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
-  <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'abm'/>
+  <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml
index bc39536de9..d641d70bbd 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml
@@ -3,13 +3,6 @@
   <model>Haswell-noTSX-IBRS</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'63' stepping=3D'2'/>
-  <feature name=3D'vme'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
   <feature name=3D'ds_cpl'/>
@@ -23,12 +16,19 @@
   <feature name=3D'osxsave'/>
   <feature name=3D'f16c'/>
   <feature name=3D'rdrand'/>
+  <feature name=3D'vme'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
   <feature name=3D'arat'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'cmt'/>
   <feature name=3D'stibp'/>
   <feature name=3D'xsaveopt'/>
-  <feature name=3D'pdpe1gb'/>
   <feature name=3D'abm'/>
+  <feature name=3D'pdpe1gb'/>
   <feature name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-json.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-json.xml
index 20e24c387d..07100abac9 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-json.xml
@@ -1,14 +1,14 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Haswell-noTSX-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'f16c'/>
   <feature policy=3D'require' name=3D'rdrand'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
-  <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'abm'/>
+  <feature policy=3D'require' name=3D'pdpe1gb'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml b/tes=
ts/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml
index a5c6d9b471..49ed41e473 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Broadwell-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
@@ -21,6 +14,13 @@
   <feature policy=3D'require' name=3D'osxsave'/>
   <feature policy=3D'require' name=3D'f16c'/>
   <feature policy=3D'require' name=3D'rdrand'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'cmt'/>
@@ -29,7 +29,7 @@
   <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'mbm_total'/>
   <feature policy=3D'require' name=3D'mbm_local'/>
-  <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'abm'/>
+  <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml
index 70419d7944..ab7c422861 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml
@@ -3,13 +3,6 @@
   <model>Broadwell-IBRS</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'79' stepping=3D'1'/>
-  <feature name=3D'vme'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
   <feature name=3D'ds_cpl'/>
@@ -23,6 +16,13 @@
   <feature name=3D'osxsave'/>
   <feature name=3D'f16c'/>
   <feature name=3D'rdrand'/>
+  <feature name=3D'vme'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
   <feature name=3D'arat'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'cmt'/>
@@ -31,7 +31,7 @@
   <feature name=3D'xsaveopt'/>
   <feature name=3D'mbm_total'/>
   <feature name=3D'mbm_local'/>
-  <feature name=3D'pdpe1gb'/>
   <feature name=3D'abm'/>
+  <feature name=3D'pdpe1gb'/>
   <feature name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-json.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-json.xml
index de082dbd93..c76a4b4cd4 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-json.xml
@@ -1,14 +1,14 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Broadwell-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'f16c'/>
   <feature policy=3D'require' name=3D'rdrand'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
-  <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'abm'/>
+  <feature policy=3D'require' name=3D'pdpe1gb'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-guest.xml b/tes=
ts/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-guest.xml
index 980af07890..833b859048 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Haswell-noTSX</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
@@ -21,11 +14,18 @@
   <feature policy=3D'require' name=3D'osxsave'/>
   <feature policy=3D'require' name=3D'f16c'/>
   <feature policy=3D'require' name=3D'rdrand'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'cmt'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
-  <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'abm'/>
+  <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-host.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-host.xml
index 6d959eedc3..b8bafccab3 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-host.xml
@@ -3,13 +3,6 @@
   <model>Haswell-noTSX</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'63' stepping=3D'2'/>
-  <feature name=3D'vme'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
   <feature name=3D'ds_cpl'/>
@@ -23,11 +16,18 @@
   <feature name=3D'osxsave'/>
   <feature name=3D'f16c'/>
   <feature name=3D'rdrand'/>
+  <feature name=3D'vme'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
   <feature name=3D'arat'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'cmt'/>
   <feature name=3D'xsaveopt'/>
-  <feature name=3D'pdpe1gb'/>
   <feature name=3D'abm'/>
+  <feature name=3D'pdpe1gb'/>
   <feature name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-json.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-json.xml
index 78b8be1118..53cfd07643 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-json.xml
@@ -1,13 +1,13 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Haswell-noTSX</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'f16c'/>
   <feature policy=3D'require' name=3D'rdrand'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
-  <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'abm'/>
+  <feature policy=3D'require' name=3D'pdpe1gb'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml b/tes=
ts/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml
index e2999db8e9..2cd4308710 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Broadwell</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
@@ -21,6 +14,13 @@
   <feature policy=3D'require' name=3D'osxsave'/>
   <feature policy=3D'require' name=3D'f16c'/>
   <feature policy=3D'require' name=3D'rdrand'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'cmt'/>
@@ -28,7 +28,7 @@
   <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'mbm_total'/>
   <feature policy=3D'require' name=3D'mbm_local'/>
-  <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'abm'/>
+  <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml
index e2ace9021b..feb5514d22 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml
@@ -3,13 +3,6 @@
   <model>Broadwell</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'79' stepping=3D'1'/>
-  <feature name=3D'vme'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
   <feature name=3D'ds_cpl'/>
@@ -23,6 +16,13 @@
   <feature name=3D'osxsave'/>
   <feature name=3D'f16c'/>
   <feature name=3D'rdrand'/>
+  <feature name=3D'vme'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
   <feature name=3D'arat'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'cmt'/>
@@ -30,7 +30,7 @@
   <feature name=3D'xsaveopt'/>
   <feature name=3D'mbm_total'/>
   <feature name=3D'mbm_local'/>
-  <feature name=3D'pdpe1gb'/>
   <feature name=3D'abm'/>
+  <feature name=3D'pdpe1gb'/>
   <feature name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-json.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-json.xml
index 5b8891093a..ffa518e2a4 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-json.xml
@@ -1,14 +1,14 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Broadwell</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'f16c'/>
   <feature policy=3D'require' name=3D'rdrand'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
-  <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'abm'/>
+  <feature policy=3D'require' name=3D'pdpe1gb'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-guest.xml b/tests/=
cputestdata/x86_64-cpuid-Xeon-E5-2650-guest.xml
index db1efe0549..d681717372 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>SandyBridge-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
@@ -20,6 +13,13 @@
   <feature policy=3D'require' name=3D'pcid'/>
   <feature policy=3D'require' name=3D'dca'/>
   <feature policy=3D'require' name=3D'osxsave'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'stibp'/>
   <feature policy=3D'require' name=3D'flush-l1d'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml b/tests/c=
putestdata/x86_64-cpuid-Xeon-E5-2650-host.xml
index 6f2de0ca5b..8f56d42213 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml
@@ -3,13 +3,6 @@
   <model>SandyBridge-IBRS</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'45' stepping=3D'7'/>
-  <feature name=3D'vme'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
   <feature name=3D'ds_cpl'/>
@@ -22,6 +15,13 @@
   <feature name=3D'pcid'/>
   <feature name=3D'dca'/>
   <feature name=3D'osxsave'/>
+  <feature name=3D'vme'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
   <feature name=3D'arat'/>
   <feature name=3D'stibp'/>
   <feature name=3D'flush-l1d'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-json.xml b/tests/c=
putestdata/x86_64-cpuid-Xeon-E5-2650-json.xml
index bf587d3ffc..b7e1891225 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-json.xml
@@ -1,10 +1,10 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>SandyBridge-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'pcid'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'stibp'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-guest.xml b/tes=
ts/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-guest.xml
index 980af07890..833b859048 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Haswell-noTSX</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
@@ -21,11 +14,18 @@
   <feature policy=3D'require' name=3D'osxsave'/>
   <feature policy=3D'require' name=3D'f16c'/>
   <feature policy=3D'require' name=3D'rdrand'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'cmt'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
-  <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'abm'/>
+  <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-host.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-host.xml
index 6d959eedc3..b8bafccab3 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-host.xml
@@ -3,13 +3,6 @@
   <model>Haswell-noTSX</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'63' stepping=3D'2'/>
-  <feature name=3D'vme'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
   <feature name=3D'ds_cpl'/>
@@ -23,11 +16,18 @@
   <feature name=3D'osxsave'/>
   <feature name=3D'f16c'/>
   <feature name=3D'rdrand'/>
+  <feature name=3D'vme'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
   <feature name=3D'arat'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'cmt'/>
   <feature name=3D'xsaveopt'/>
-  <feature name=3D'pdpe1gb'/>
   <feature name=3D'abm'/>
+  <feature name=3D'pdpe1gb'/>
   <feature name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-json.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-json.xml
index 2227ed0031..db42950fe6 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-json.xml
@@ -1,12 +1,12 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Haswell-noTSX</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'vmx'/>
   <feature policy=3D'require' name=3D'f16c'/>
   <feature policy=3D'require' name=3D'rdrand'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
-  <feature policy=3D'require' name=3D'pdpe1gb'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'abm'/>
+  <feature policy=3D'require' name=3D'pdpe1gb'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml b/tes=
ts/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml
index e2999db8e9..2cd4308710 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Broadwell</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
@@ -21,6 +14,13 @@
   <feature policy=3D'require' name=3D'osxsave'/>
   <feature policy=3D'require' name=3D'f16c'/>
   <feature policy=3D'require' name=3D'rdrand'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'cmt'/>
@@ -28,7 +28,7 @@
   <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'mbm_total'/>
   <feature policy=3D'require' name=3D'mbm_local'/>
-  <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'abm'/>
+  <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml
index e2ace9021b..feb5514d22 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml
@@ -3,13 +3,6 @@
   <model>Broadwell</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'79' stepping=3D'1'/>
-  <feature name=3D'vme'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
   <feature name=3D'ds_cpl'/>
@@ -23,6 +16,13 @@
   <feature name=3D'osxsave'/>
   <feature name=3D'f16c'/>
   <feature name=3D'rdrand'/>
+  <feature name=3D'vme'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
   <feature name=3D'arat'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'cmt'/>
@@ -30,7 +30,7 @@
   <feature name=3D'xsaveopt'/>
   <feature name=3D'mbm_total'/>
   <feature name=3D'mbm_local'/>
-  <feature name=3D'pdpe1gb'/>
   <feature name=3D'abm'/>
+  <feature name=3D'pdpe1gb'/>
   <feature name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-json.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-json.xml
index 5b8891093a..ffa518e2a4 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-json.xml
@@ -1,14 +1,14 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Broadwell</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'f16c'/>
   <feature policy=3D'require' name=3D'rdrand'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
-  <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'abm'/>
+  <feature policy=3D'require' name=3D'pdpe1gb'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-guest.xml b/tests/=
cputestdata/x86_64-cpuid-Xeon-E7-4820-guest.xml
index 659779687a..b7ddd7e1d7 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Westmere</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'pclmuldq'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
@@ -21,6 +14,13 @@
   <feature policy=3D'require' name=3D'pcid'/>
   <feature policy=3D'require' name=3D'dca'/>
   <feature policy=3D'require' name=3D'x2apic'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'rdtscp'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-host.xml b/tests/c=
putestdata/x86_64-cpuid-Xeon-E7-4820-host.xml
index 58468cd096..728c9c4264 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-host.xml
@@ -3,13 +3,6 @@
   <model>Westmere</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'47' stepping=3D'2'/>
-  <feature name=3D'vme'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'pclmuldq'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
@@ -23,6 +16,13 @@
   <feature name=3D'pcid'/>
   <feature name=3D'dca'/>
   <feature name=3D'x2apic'/>
+  <feature name=3D'vme'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
   <feature name=3D'arat'/>
   <feature name=3D'pdpe1gb'/>
   <feature name=3D'rdtscp'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-json.xml b/tests/c=
putestdata/x86_64-cpuid-Xeon-E7-4820-json.xml
index e8b74c5c30..f9d226917b 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-json.xml
@@ -1,13 +1,13 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Westmere</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'pclmuldq'/>
   <feature policy=3D'require' name=3D'pcid'/>
   <feature policy=3D'require' name=3D'x2apic'/>
   <feature policy=3D'require' name=3D'tsc-deadline'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'rdtscp'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-guest.xml b/tests/=
cputestdata/x86_64-cpuid-Xeon-E7-4830-guest.xml
index 659779687a..b7ddd7e1d7 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Westmere</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'pclmuldq'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
@@ -21,6 +14,13 @@
   <feature policy=3D'require' name=3D'pcid'/>
   <feature policy=3D'require' name=3D'dca'/>
   <feature policy=3D'require' name=3D'x2apic'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'rdtscp'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-host.xml b/tests/c=
putestdata/x86_64-cpuid-Xeon-E7-4830-host.xml
index 58468cd096..728c9c4264 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-host.xml
@@ -3,13 +3,6 @@
   <model>Westmere</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'47' stepping=3D'2'/>
-  <feature name=3D'vme'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'pclmuldq'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
@@ -23,6 +16,13 @@
   <feature name=3D'pcid'/>
   <feature name=3D'dca'/>
   <feature name=3D'x2apic'/>
+  <feature name=3D'vme'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
   <feature name=3D'arat'/>
   <feature name=3D'pdpe1gb'/>
   <feature name=3D'rdtscp'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-json.xml b/tests/c=
putestdata/x86_64-cpuid-Xeon-E7-4830-json.xml
index da949ad25e..7e9b5f2ba4 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-json.xml
@@ -1,13 +1,13 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Westmere</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'pclmuldq'/>
   <feature policy=3D'require' name=3D'pcid'/>
   <feature policy=3D'require' name=3D'x2apic'/>
   <feature policy=3D'require' name=3D'tsc-deadline'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-guest.xml b/tes=
ts/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-guest.xml
index 16d333aa26..dc91fceaef 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Haswell</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
@@ -21,11 +14,18 @@
   <feature policy=3D'require' name=3D'osxsave'/>
   <feature policy=3D'require' name=3D'f16c'/>
   <feature policy=3D'require' name=3D'rdrand'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'cmt'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
-  <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'abm'/>
+  <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-host.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-host.xml
index 6a18204c02..92d9206242 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-host.xml
@@ -3,13 +3,6 @@
   <model>Haswell</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'63' stepping=3D'4'/>
-  <feature name=3D'vme'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
   <feature name=3D'ds_cpl'/>
@@ -23,11 +16,18 @@
   <feature name=3D'osxsave'/>
   <feature name=3D'f16c'/>
   <feature name=3D'rdrand'/>
+  <feature name=3D'vme'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
   <feature name=3D'arat'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'cmt'/>
   <feature name=3D'xsaveopt'/>
-  <feature name=3D'pdpe1gb'/>
   <feature name=3D'abm'/>
+  <feature name=3D'pdpe1gb'/>
   <feature name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-json.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-json.xml
index e542456c8b..9d49bb9aa6 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-json.xml
@@ -1,14 +1,14 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Haswell</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'f16c'/>
   <feature policy=3D'require' name=3D'rdrand'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
-  <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'abm'/>
+  <feature policy=3D'require' name=3D'pdpe1gb'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7540-guest.xml b/tests/cp=
utestdata/x86_64-cpuid-Xeon-E7540-guest.xml
index fbc05fe0d8..18211373a9 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7540-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7540-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Nehalem-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
@@ -18,6 +11,13 @@
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'dca'/>
   <feature policy=3D'require' name=3D'x2apic'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'stibp'/>
   <feature policy=3D'require' name=3D'flush-l1d'/>
   <feature policy=3D'require' name=3D'ssbd'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7540-host.xml b/tests/cpu=
testdata/x86_64-cpuid-Xeon-E7540-host.xml
index 15fea29e06..3575991eae 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7540-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7540-host.xml
@@ -3,13 +3,6 @@
   <model>Nehalem-IBRS</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'46' stepping=3D'6'/>
-  <feature name=3D'vme'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
   <feature name=3D'ds_cpl'/>
@@ -20,6 +13,13 @@
   <feature name=3D'pdcm'/>
   <feature name=3D'dca'/>
   <feature name=3D'x2apic'/>
+  <feature name=3D'vme'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
   <feature name=3D'stibp'/>
   <feature name=3D'flush-l1d'/>
   <feature name=3D'ssbd'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7540-json.xml b/tests/cpu=
testdata/x86_64-cpuid-Xeon-E7540-json.xml
index 32cd1000c8..d2acd9cabf 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7540-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7540-json.xml
@@ -1,11 +1,11 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Nehalem-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'x2apic'/>
   <feature policy=3D'require' name=3D'tsc-deadline'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'stibp'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml
index 8f014f6e28..d0fdec7691 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml
@@ -1,12 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Skylake-Server-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
@@ -18,6 +12,12 @@
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'dca'/>
   <feature policy=3D'require' name=3D'osxsave'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'cmt'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml b/tests=
/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml
index e004747ada..bbf82dfd9f 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml
@@ -3,12 +3,6 @@
   <model>Skylake-Server-IBRS</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'85' stepping=3D'4'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
   <feature name=3D'ds_cpl'/>
@@ -20,6 +14,12 @@
   <feature name=3D'pdcm'/>
   <feature name=3D'dca'/>
   <feature name=3D'osxsave'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'cmt'/>
   <feature name=3D'clflushopt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-json.xml b/tests=
/cputestdata/x86_64-cpuid-Xeon-Gold-5115-json.xml
index 7c7e95ce0d..e92cfaba48 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-json.xml
@@ -1,8 +1,8 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Skylake-Server-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml
index f4f0199607..4a42d170c2 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml
@@ -1,12 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Skylake-Server-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
@@ -18,6 +12,12 @@
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'dca'/>
   <feature policy=3D'require' name=3D'osxsave'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'cmt'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml b/tests=
/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml
index 325c2fe26f..44a0e1a30f 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml
@@ -3,12 +3,6 @@
   <model>Skylake-Server-IBRS</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'85' stepping=3D'4'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
   <feature name=3D'ds_cpl'/>
@@ -20,6 +14,12 @@
   <feature name=3D'pdcm'/>
   <feature name=3D'dca'/>
   <feature name=3D'osxsave'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'cmt'/>
   <feature name=3D'clflushopt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-json.xml b/tests=
/cputestdata/x86_64-cpuid-Xeon-Gold-6130-json.xml
index b482043ccf..a1b79e7e18 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-json.xml
@@ -1,9 +1,9 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Skylake-Server-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'vmx'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
   <feature policy=3D'require' name=3D'umip'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml
index f31ca1ffc5..4b2d012e72 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml
@@ -1,12 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Skylake-Server</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
@@ -18,6 +12,12 @@
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'dca'/>
   <feature policy=3D'require' name=3D'osxsave'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'cmt'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml b/tests=
/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml
index da7e96e533..2959878fe6 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml
@@ -3,12 +3,6 @@
   <model>Skylake-Server</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'85' stepping=3D'4'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
   <feature name=3D'ds_cpl'/>
@@ -20,6 +14,12 @@
   <feature name=3D'pdcm'/>
   <feature name=3D'dca'/>
   <feature name=3D'osxsave'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'cmt'/>
   <feature name=3D'clflushopt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-json.xml b/tests=
/cputestdata/x86_64-cpuid-Xeon-Gold-6148-json.xml
index 1dfad4a0cb..ccf9875dc9 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-json.xml
@@ -1,8 +1,8 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Skylake-Server</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml b/=
tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
index 8fd1611842..d707faf63d 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
@@ -1,12 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Cascadelake-Server</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
@@ -18,6 +12,12 @@
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'dca'/>
   <feature policy=3D'require' name=3D'osxsave'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'cmt'/>
   <feature policy=3D'require' name=3D'intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml b/t=
ests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
index 7055c72112..6cb65b2a90 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
@@ -3,12 +3,6 @@
   <model>Cascadelake-Server</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'85' stepping=3D'6'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
   <feature name=3D'ds_cpl'/>
@@ -20,6 +14,12 @@
   <feature name=3D'pdcm'/>
   <feature name=3D'dca'/>
   <feature name=3D'osxsave'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'cmt'/>
   <feature name=3D'intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-json.xml b/t=
ests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-json.xml
index 78863c61d1..d8ac5f373f 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-json.xml
@@ -1,8 +1,8 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Cascadelake-Server</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'umip'/>
   <feature policy=3D'require' name=3D'pku'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-guest.xml b/=
tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-guest.xml
index 88c2d84d65..f86d2889c6 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-guest.xml
@@ -1,12 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Cascadelake-Server</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
@@ -18,6 +12,12 @@
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'dca'/>
   <feature policy=3D'require' name=3D'osxsave'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'cmt'/>
   <feature policy=3D'require' name=3D'intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml b/t=
ests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml
index 5e59520919..7289d4cda5 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml
@@ -3,12 +3,6 @@
   <model>Cascadelake-Server</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'85' stepping=3D'7'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
   <feature name=3D'ds_cpl'/>
@@ -20,6 +14,12 @@
   <feature name=3D'pdcm'/>
   <feature name=3D'dca'/>
   <feature name=3D'osxsave'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'cmt'/>
   <feature name=3D'intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml b/t=
ests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml
index ac0e520767..bd187b3d72 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml
@@ -1,9 +1,9 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Cascadelake-Server</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'vmx'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'umip'/>
   <feature policy=3D'require' name=3D'pku'/>
@@ -41,9 +41,6 @@
   <feature policy=3D'require' name=3D'vmx-rdseed-exit'/>
   <feature policy=3D'require' name=3D'vmx-pml'/>
   <feature policy=3D'require' name=3D'vmx-xsaves'/>
-  <feature policy=3D'require' name=3D'vmx-invvpid'/>
-  <feature policy=3D'require' name=3D'vmx-invvpid-single-addr'/>
-  <feature policy=3D'require' name=3D'vmx-invvpid-all-context'/>
   <feature policy=3D'require' name=3D'vmx-ept-execonly'/>
   <feature policy=3D'require' name=3D'vmx-page-walk-4'/>
   <feature policy=3D'require' name=3D'vmx-ept-2mb'/>
@@ -52,6 +49,9 @@
   <feature policy=3D'require' name=3D'vmx-eptad'/>
   <feature policy=3D'require' name=3D'vmx-invept-single-context'/>
   <feature policy=3D'require' name=3D'vmx-invept-all-context'/>
+  <feature policy=3D'require' name=3D'vmx-invvpid'/>
+  <feature policy=3D'require' name=3D'vmx-invvpid-single-addr'/>
+  <feature policy=3D'require' name=3D'vmx-invvpid-all-context'/>
   <feature policy=3D'require' name=3D'vmx-intr-exit'/>
   <feature policy=3D'require' name=3D'vmx-nmi-exit'/>
   <feature policy=3D'require' name=3D'vmx-vnmi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-guest.xml b/tests/cp=
utestdata/x86_64-cpuid-Xeon-W3520-guest.xml
index 9c975c6792..f5ce1183c6 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Nehalem</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
@@ -17,6 +10,13 @@
   <feature policy=3D'require' name=3D'xtpr'/>
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'dca'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'rdtscp'/>
   <feature policy=3D'require' name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-host.xml b/tests/cpu=
testdata/x86_64-cpuid-Xeon-W3520-host.xml
index 35dd63f360..453b56ff1f 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-host.xml
@@ -3,13 +3,6 @@
   <model>Nehalem</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'26' stepping=3D'5'/>
-  <feature name=3D'vme'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
   <feature name=3D'ds_cpl'/>
@@ -19,6 +12,13 @@
   <feature name=3D'xtpr'/>
   <feature name=3D'pdcm'/>
   <feature name=3D'dca'/>
+  <feature name=3D'vme'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
   <feature name=3D'rdtscp'/>
   <feature name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-json.xml b/tests/cpu=
testdata/x86_64-cpuid-Xeon-W3520-json.xml
index 038c98e1d1..b708bae41d 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-json.xml
@@ -1,10 +1,10 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Nehalem</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'x2apic'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'rdtscp'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-X5460-guest.xml b/tests/cp=
utestdata/x86_64-cpuid-Xeon-X5460-guest.xml
index a97efc5657..b02cca7595 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-X5460-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-X5460-guest.xml
@@ -1,13 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Penryn</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
@@ -17,4 +10,11 @@
   <feature policy=3D'require' name=3D'xtpr'/>
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'dca'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml b/tests/cpu=
testdata/x86_64-cpuid-Xeon-X5460-host.xml
index 91ab9726da..b7bc4cbb5b 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml
@@ -3,13 +3,6 @@
   <model>Penryn</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'23' stepping=3D'6'/>
-  <feature name=3D'vme'/>
-  <feature name=3D'ds'/>
-  <feature name=3D'acpi'/>
-  <feature name=3D'ss'/>
-  <feature name=3D'ht'/>
-  <feature name=3D'tm'/>
-  <feature name=3D'pbe'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
   <feature name=3D'ds_cpl'/>
@@ -19,4 +12,11 @@
   <feature name=3D'xtpr'/>
   <feature name=3D'pdcm'/>
   <feature name=3D'dca'/>
+  <feature name=3D'vme'/>
+  <feature name=3D'ds'/>
+  <feature name=3D'acpi'/>
+  <feature name=3D'ss'/>
+  <feature name=3D'ht'/>
+  <feature name=3D'tm'/>
+  <feature name=3D'pbe'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Broadwell-IBRS+Cascade=
lake.xml b/tests/cputestdata/x86_64-cpuid-baseline-Broadwell-IBRS+Cascadela=
ke.xml
index 99bce8db87..8d75dc29fb 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-Broadwell-IBRS+Cascadelake.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Broadwell-IBRS+Cascadelake.xml
@@ -1,14 +1,14 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'allow'>Broadwell-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'f16c'/>
   <feature policy=3D'require' name=3D'rdrand'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
-  <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'abm'/>
+  <feature policy=3D'require' name=3D'pdpe1gb'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Icelake.xm=
l b/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Icelake.xml
index 071c799ba2..bdc005acc5 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Icelake.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Icelake.xml
@@ -1,8 +1,8 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'allow'>Cascadelake-Server</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'umip'/>
   <feature policy=3D'require' name=3D'pku'/>
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Skylake-IB=
RS.xml b/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Skylake-IBRS.x=
ml
index 5e42876b39..28992ac163 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Skylake-IBRS.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Skylake-IBRS.xml
@@ -1,8 +1,8 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'allow'>Skylake-Server-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
   <feature policy=3D'require' name=3D'umip'/>
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Skylake.xm=
l b/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Skylake.xml
index 906259df0b..98b1c48e70 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Skylake.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Skylake.xml
@@ -1,8 +1,8 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'allow'>Skylake-Server</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake=
.xml b/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml
index f9e9c476b5..833de33a2d 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Cascadelake.xml
@@ -1,9 +1,9 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'allow'>Cascadelake-Server</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'vmx'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'umip'/>
   <feature policy=3D'require' name=3D'pku'/>
@@ -41,9 +41,6 @@
   <feature policy=3D'require' name=3D'vmx-rdseed-exit'/>
   <feature policy=3D'require' name=3D'vmx-pml'/>
   <feature policy=3D'require' name=3D'vmx-xsaves'/>
-  <feature policy=3D'require' name=3D'vmx-invvpid'/>
-  <feature policy=3D'require' name=3D'vmx-invvpid-single-addr'/>
-  <feature policy=3D'require' name=3D'vmx-invvpid-all-context'/>
   <feature policy=3D'require' name=3D'vmx-ept-execonly'/>
   <feature policy=3D'require' name=3D'vmx-page-walk-4'/>
   <feature policy=3D'require' name=3D'vmx-ept-2mb'/>
@@ -52,6 +49,9 @@
   <feature policy=3D'require' name=3D'vmx-eptad'/>
   <feature policy=3D'require' name=3D'vmx-invept-single-context'/>
   <feature policy=3D'require' name=3D'vmx-invept-all-context'/>
+  <feature policy=3D'require' name=3D'vmx-invvpid'/>
+  <feature policy=3D'require' name=3D'vmx-invvpid-single-addr'/>
+  <feature policy=3D'require' name=3D'vmx-invvpid-all-context'/>
   <feature policy=3D'require' name=3D'vmx-intr-exit'/>
   <feature policy=3D'require' name=3D'vmx-nmi-exit'/>
   <feature policy=3D'require' name=3D'vmx-vnmi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Icelake.xml=
 b/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Icelake.xml
index 071c799ba2..bdc005acc5 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Icelake.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Cooperlake+Icelake.xml
@@ -1,8 +1,8 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'allow'>Cascadelake-Server</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'umip'/>
   <feature policy=3D'require' name=3D'pku'/>
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Haswell+Skylake.xml b/=
tests/cputestdata/x86_64-cpuid-baseline-Haswell+Skylake.xml
index e687a679b3..a81ba24fa7 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-Haswell+Skylake.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Haswell+Skylake.xml
@@ -1,14 +1,14 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'allow'>Haswell</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'f16c'/>
   <feature policy=3D'require' name=3D'rdrand'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
-  <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'abm'/>
+  <feature policy=3D'require' name=3D'pdpe1gb'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+Bro=
adwell.xml b/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+Bro=
adwell.xml
index 651457b17a..b937c49fa4 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+Broadwell.=
xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+Broadwell.=
xml
@@ -1,14 +1,14 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'allow'>Haswell-noTSX</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'f16c'/>
   <feature policy=3D'require' name=3D'rdrand'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
-  <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'abm'/>
+  <feature policy=3D'require' name=3D'pdpe1gb'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+Sky=
lake-IBRS.xml b/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+=
Skylake-IBRS.xml
index 8bda1c02e2..1d9e49f109 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+Skylake-IB=
RS.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+Skylake-IB=
RS.xml
@@ -1,14 +1,14 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'allow'>Haswell-noTSX-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'f16c'/>
   <feature policy=3D'require' name=3D'rdrand'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
-  <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'abm'/>
+  <feature policy=3D'require' name=3D'pdpe1gb'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+Sky=
lake.xml b/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+Skyla=
ke.xml
index 651457b17a..b937c49fa4 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+Skylake.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+Skylake.xml
@@ -1,14 +1,14 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'allow'>Haswell-noTSX</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'f16c'/>
   <feature policy=3D'require' name=3D'rdrand'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'vme'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
-  <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'abm'/>
+  <feature policy=3D'require' name=3D'pdpe1gb'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Skylake-Client+Server.=
xml b/tests/cputestdata/x86_64-cpuid-baseline-Skylake-Client+Server.xml
index d46ff26eeb..34331b0f15 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-Skylake-Client+Server.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Skylake-Client+Server.xml
@@ -1,8 +1,8 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'allow'>Skylake-Client</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
+  <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
diff --git a/tests/cputestdata/x86_64-host+guest,model486-result.xml b/test=
s/cputestdata/x86_64-host+guest,model486-result.xml
index b533f22b88..07fc300fe6 100644
--- a/tests/cputestdata/x86_64-host+guest,model486-result.xml
+++ b/tests/cputestdata/x86_64-host+guest,model486-result.xml
@@ -1,6 +1,13 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'allow'>486</model>
   <topology sockets=3D'2' dies=3D'1' clusters=3D'1' cores=3D'4' threads=3D=
'1'/>
+  <feature policy=3D'require' name=3D'pni'/>
+  <feature policy=3D'force' name=3D'monitor'/>
+  <feature policy=3D'require' name=3D'ssse3'/>
+  <feature policy=3D'require' name=3D'cx16'/>
+  <feature policy=3D'require' name=3D'xtpr'/>
+  <feature policy=3D'require' name=3D'dca'/>
+  <feature policy=3D'require' name=3D'sse4.1'/>
   <feature policy=3D'require' name=3D'de'/>
   <feature policy=3D'require' name=3D'tsc'/>
   <feature policy=3D'require' name=3D'msr'/>
@@ -20,19 +27,12 @@
   <feature policy=3D'require' name=3D'fxsr'/>
   <feature policy=3D'require' name=3D'sse2'/>
   <feature policy=3D'force' name=3D'pbe'/>
-  <feature policy=3D'require' name=3D'pni'/>
-  <feature policy=3D'force' name=3D'monitor'/>
-  <feature policy=3D'require' name=3D'ssse3'/>
-  <feature policy=3D'require' name=3D'cx16'/>
-  <feature policy=3D'require' name=3D'xtpr'/>
-  <feature policy=3D'require' name=3D'dca'/>
-  <feature policy=3D'require' name=3D'sse4.1'/>
+  <feature policy=3D'require' name=3D'lahf_lm'/>
+  <feature policy=3D'force' name=3D'svm'/>
   <feature policy=3D'require' name=3D'syscall'/>
   <feature policy=3D'require' name=3D'nx'/>
   <feature policy=3D'require' name=3D'lm'/>
   <feature policy=3D'force' name=3D'3dnowext'/>
-  <feature policy=3D'require' name=3D'lahf_lm'/>
-  <feature policy=3D'force' name=3D'svm'/>
   <feature policy=3D'disable' name=3D'vme'/>
   <feature policy=3D'disable' name=3D'sse4.2'/>
   <feature policy=3D'disable' name=3D'3dnow'/>
diff --git a/tests/cputestdata/x86_64-host+guest,models-result.xml b/tests/=
cputestdata/x86_64-host+guest,models-result.xml
index e975d9bc18..92405750d8 100644
--- a/tests/cputestdata/x86_64-host+guest,models-result.xml
+++ b/tests/cputestdata/x86_64-host+guest,models-result.xml
@@ -1,14 +1,14 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'allow'>qemu64</model>
   <topology sockets=3D'2' dies=3D'1' clusters=3D'1' cores=3D'4' threads=3D=
'1'/>
-  <feature policy=3D'force' name=3D'pbe'/>
   <feature policy=3D'force' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ssse3'/>
   <feature policy=3D'require' name=3D'xtpr'/>
   <feature policy=3D'require' name=3D'dca'/>
   <feature policy=3D'require' name=3D'sse4.1'/>
-  <feature policy=3D'force' name=3D'3dnowext'/>
+  <feature policy=3D'force' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'lahf_lm'/>
+  <feature policy=3D'force' name=3D'3dnowext'/>
   <feature policy=3D'disable' name=3D'sse'/>
   <feature policy=3D'disable' name=3D'sse4.2'/>
   <feature policy=3D'disable' name=3D'3dnow'/>
diff --git a/tests/cputestdata/x86_64-host+host+host-model,models-result.xm=
l b/tests/cputestdata/x86_64-host+host+host-model,models-result.xml
index 4be4701c6e..7ccdad5e3a 100644
--- a/tests/cputestdata/x86_64-host+host+host-model,models-result.xml
+++ b/tests/cputestdata/x86_64-host+host+host-model,models-result.xml
@@ -1,12 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'allow'>core2duo</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'ds'/>
-  <feature policy=3D'require' name=3D'acpi'/>
-  <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'ht'/>
-  <feature policy=3D'require' name=3D'tm'/>
-  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
   <feature policy=3D'require' name=3D'vmx'/>
   <feature policy=3D'require' name=3D'est'/>
@@ -15,6 +9,12 @@
   <feature policy=3D'require' name=3D'xtpr'/>
   <feature policy=3D'require' name=3D'dca'/>
   <feature policy=3D'require' name=3D'sse4.1'/>
+  <feature policy=3D'require' name=3D'ds'/>
+  <feature policy=3D'require' name=3D'acpi'/>
+  <feature policy=3D'require' name=3D'ss'/>
+  <feature policy=3D'require' name=3D'ht'/>
+  <feature policy=3D'require' name=3D'tm'/>
+  <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'lahf_lm'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'vme'/>
diff --git a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml b/tests/domainc=
apsdata/qemu_4.2.0-q35.x86_64.xml
index 152f201ff9..5ac1c405f2 100644
--- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
@@ -44,9 +44,9 @@
       <model fallback=3D'forbid'>Skylake-Client-IBRS</model>
       <vendor>Intel</vendor>
       <maxphysaddr mode=3D'passthrough' limit=3D'64'/>
-      <feature policy=3D'require' name=3D'ss'/>
       <feature policy=3D'require' name=3D'vmx'/>
       <feature policy=3D'require' name=3D'hypervisor'/>
+      <feature policy=3D'require' name=3D'ss'/>
       <feature policy=3D'require' name=3D'tsc_adjust'/>
       <feature policy=3D'require' name=3D'clflushopt'/>
       <feature policy=3D'require' name=3D'umip'/>
@@ -79,9 +79,6 @@
       <feature policy=3D'require' name=3D'vmx-rdseed-exit'/>
       <feature policy=3D'require' name=3D'vmx-pml'/>
       <feature policy=3D'require' name=3D'vmx-xsaves'/>
-      <feature policy=3D'require' name=3D'vmx-invvpid'/>
-      <feature policy=3D'require' name=3D'vmx-invvpid-single-addr'/>
-      <feature policy=3D'require' name=3D'vmx-invvpid-all-context'/>
       <feature policy=3D'require' name=3D'vmx-ept-execonly'/>
       <feature policy=3D'require' name=3D'vmx-page-walk-4'/>
       <feature policy=3D'require' name=3D'vmx-ept-2mb'/>
@@ -90,6 +87,9 @@
       <feature policy=3D'require' name=3D'vmx-eptad'/>
       <feature policy=3D'require' name=3D'vmx-invept-single-context'/>
       <feature policy=3D'require' name=3D'vmx-invept-all-context'/>
+      <feature policy=3D'require' name=3D'vmx-invvpid'/>
+      <feature policy=3D'require' name=3D'vmx-invvpid-single-addr'/>
+      <feature policy=3D'require' name=3D'vmx-invvpid-all-context'/>
       <feature policy=3D'require' name=3D'vmx-intr-exit'/>
       <feature policy=3D'require' name=3D'vmx-nmi-exit'/>
       <feature policy=3D'require' name=3D'vmx-vnmi'/>
diff --git a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml b/tests/domainc=
apsdata/qemu_4.2.0-tcg.x86_64.xml
index cea9377cfe..5766bcc428 100644
--- a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
@@ -37,8 +37,6 @@
     <mode name=3D'host-model' supported=3D'yes'>
       <model fallback=3D'forbid'>Opteron_G3</model>
       <vendor>AMD</vendor>
-      <feature policy=3D'require' name=3D'acpi'/>
-      <feature policy=3D'require' name=3D'ss'/>
       <feature policy=3D'require' name=3D'pclmuldq'/>
       <feature policy=3D'require' name=3D'monitor'/>
       <feature policy=3D'require' name=3D'ssse3'/>
@@ -49,6 +47,8 @@
       <feature policy=3D'require' name=3D'xsave'/>
       <feature policy=3D'require' name=3D'rdrand'/>
       <feature policy=3D'require' name=3D'hypervisor'/>
+      <feature policy=3D'require' name=3D'acpi'/>
+      <feature policy=3D'require' name=3D'ss'/>
       <feature policy=3D'require' name=3D'arat'/>
       <feature policy=3D'require' name=3D'fsgsbase'/>
       <feature policy=3D'require' name=3D'bmi1'/>
@@ -65,11 +65,11 @@
       <feature policy=3D'require' name=3D'la57'/>
       <feature policy=3D'require' name=3D'xsaveopt'/>
       <feature policy=3D'require' name=3D'xgetbv1'/>
+      <feature policy=3D'require' name=3D'cr8legacy'/>
       <feature policy=3D'require' name=3D'mmxext'/>
       <feature policy=3D'require' name=3D'pdpe1gb'/>
       <feature policy=3D'require' name=3D'3dnowext'/>
       <feature policy=3D'require' name=3D'3dnow'/>
-      <feature policy=3D'require' name=3D'cr8legacy'/>
       <feature policy=3D'require' name=3D'npt'/>
       <feature policy=3D'disable' name=3D'misalignsse'/>
     </mode>
diff --git a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml b/tests/domaincapsd=
ata/qemu_4.2.0.x86_64.xml
index 8b7cf44d6d..7b13d3ba3a 100644
--- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
@@ -43,9 +43,9 @@
       <model fallback=3D'forbid'>Skylake-Client-IBRS</model>
       <vendor>Intel</vendor>
       <maxphysaddr mode=3D'passthrough' limit=3D'64'/>
-      <feature policy=3D'require' name=3D'ss'/>
       <feature policy=3D'require' name=3D'vmx'/>
       <feature policy=3D'require' name=3D'hypervisor'/>
+      <feature policy=3D'require' name=3D'ss'/>
       <feature policy=3D'require' name=3D'tsc_adjust'/>
       <feature policy=3D'require' name=3D'clflushopt'/>
       <feature policy=3D'require' name=3D'umip'/>
@@ -78,9 +78,6 @@
       <feature policy=3D'require' name=3D'vmx-rdseed-exit'/>
       <feature policy=3D'require' name=3D'vmx-pml'/>
       <feature policy=3D'require' name=3D'vmx-xsaves'/>
-      <feature policy=3D'require' name=3D'vmx-invvpid'/>
-      <feature policy=3D'require' name=3D'vmx-invvpid-single-addr'/>
-      <feature policy=3D'require' name=3D'vmx-invvpid-all-context'/>
       <feature policy=3D'require' name=3D'vmx-ept-execonly'/>
       <feature policy=3D'require' name=3D'vmx-page-walk-4'/>
       <feature policy=3D'require' name=3D'vmx-ept-2mb'/>
@@ -89,6 +86,9 @@
       <feature policy=3D'require' name=3D'vmx-eptad'/>
       <feature policy=3D'require' name=3D'vmx-invept-single-context'/>
       <feature policy=3D'require' name=3D'vmx-invept-all-context'/>
+      <feature policy=3D'require' name=3D'vmx-invvpid'/>
+      <feature policy=3D'require' name=3D'vmx-invvpid-single-addr'/>
+      <feature policy=3D'require' name=3D'vmx-invvpid-all-context'/>
       <feature policy=3D'require' name=3D'vmx-intr-exit'/>
       <feature policy=3D'require' name=3D'vmx-nmi-exit'/>
       <feature policy=3D'require' name=3D'vmx-vnmi'/>
diff --git a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml b/tests/domainc=
apsdata/qemu_5.0.0-q35.x86_64.xml
index 1d29a40f74..edc36e2a84 100644
--- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
@@ -44,9 +44,9 @@
       <model fallback=3D'forbid'>Skylake-Client-IBRS</model>
       <vendor>Intel</vendor>
       <maxphysaddr mode=3D'passthrough' limit=3D'64'/>
-      <feature policy=3D'require' name=3D'ss'/>
       <feature policy=3D'require' name=3D'vmx'/>
       <feature policy=3D'require' name=3D'hypervisor'/>
+      <feature policy=3D'require' name=3D'ss'/>
       <feature policy=3D'require' name=3D'tsc_adjust'/>
       <feature policy=3D'require' name=3D'clflushopt'/>
       <feature policy=3D'require' name=3D'umip'/>
@@ -79,9 +79,6 @@
       <feature policy=3D'require' name=3D'vmx-rdseed-exit'/>
       <feature policy=3D'require' name=3D'vmx-pml'/>
       <feature policy=3D'require' name=3D'vmx-xsaves'/>
-      <feature policy=3D'require' name=3D'vmx-invvpid'/>
-      <feature policy=3D'require' name=3D'vmx-invvpid-single-addr'/>
-      <feature policy=3D'require' name=3D'vmx-invvpid-all-context'/>
       <feature policy=3D'require' name=3D'vmx-ept-execonly'/>
       <feature policy=3D'require' name=3D'vmx-page-walk-4'/>
       <feature policy=3D'require' name=3D'vmx-ept-2mb'/>
@@ -90,6 +87,9 @@
       <feature policy=3D'require' name=3D'vmx-eptad'/>
       <feature policy=3D'require' name=3D'vmx-invept-single-context'/>
       <feature policy=3D'require' name=3D'vmx-invept-all-context'/>
+      <feature policy=3D'require' name=3D'vmx-invvpid'/>
+      <feature policy=3D'require' name=3D'vmx-invvpid-single-addr'/>
+      <feature policy=3D'require' name=3D'vmx-invvpid-all-context'/>
       <feature policy=3D'require' name=3D'vmx-intr-exit'/>
       <feature policy=3D'require' name=3D'vmx-nmi-exit'/>
       <feature policy=3D'require' name=3D'vmx-vnmi'/>
diff --git a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml b/tests/domainc=
apsdata/qemu_5.0.0-tcg.x86_64.xml
index 7b7420ff8e..d2b82e5581 100644
--- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
@@ -37,8 +37,6 @@
     <mode name=3D'host-model' supported=3D'yes'>
       <model fallback=3D'forbid'>Opteron_G3</model>
       <vendor>AMD</vendor>
-      <feature policy=3D'require' name=3D'acpi'/>
-      <feature policy=3D'require' name=3D'ss'/>
       <feature policy=3D'require' name=3D'pclmuldq'/>
       <feature policy=3D'require' name=3D'monitor'/>
       <feature policy=3D'require' name=3D'ssse3'/>
@@ -49,6 +47,8 @@
       <feature policy=3D'require' name=3D'xsave'/>
       <feature policy=3D'require' name=3D'rdrand'/>
       <feature policy=3D'require' name=3D'hypervisor'/>
+      <feature policy=3D'require' name=3D'acpi'/>
+      <feature policy=3D'require' name=3D'ss'/>
       <feature policy=3D'require' name=3D'arat'/>
       <feature policy=3D'require' name=3D'fsgsbase'/>
       <feature policy=3D'require' name=3D'bmi1'/>
@@ -65,11 +65,11 @@
       <feature policy=3D'require' name=3D'la57'/>
       <feature policy=3D'require' name=3D'xsaveopt'/>
       <feature policy=3D'require' name=3D'xgetbv1'/>
+      <feature policy=3D'require' name=3D'cr8legacy'/>
       <feature policy=3D'require' name=3D'mmxext'/>
       <feature policy=3D'require' name=3D'pdpe1gb'/>
       <feature policy=3D'require' name=3D'3dnowext'/>
       <feature policy=3D'require' name=3D'3dnow'/>
-      <feature policy=3D'require' name=3D'cr8legacy'/>
       <feature policy=3D'require' name=3D'npt'/>
       <feature policy=3D'disable' name=3D'misalignsse'/>
     </mode>
diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml b/tests/domaincapsd=
ata/qemu_5.0.0.x86_64.xml
index f3b3adb19e..7fe44b5e97 100644
--- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
@@ -43,9 +43,9 @@
       <model fallback=3D'forbid'>Skylake-Client-IBRS</model>
       <vendor>Intel</vendor>
       <maxphysaddr mode=3D'passthrough' limit=3D'64'/>
-      <feature policy=3D'require' name=3D'ss'/>
       <feature policy=3D'require' name=3D'vmx'/>
       <feature policy=3D'require' name=3D'hypervisor'/>
+      <feature policy=3D'require' name=3D'ss'/>
       <feature policy=3D'require' name=3D'tsc_adjust'/>
       <feature policy=3D'require' name=3D'clflushopt'/>
       <feature policy=3D'require' name=3D'umip'/>
@@ -78,9 +78,6 @@
       <feature policy=3D'require' name=3D'vmx-rdseed-exit'/>
       <feature policy=3D'require' name=3D'vmx-pml'/>
       <feature policy=3D'require' name=3D'vmx-xsaves'/>
-      <feature policy=3D'require' name=3D'vmx-invvpid'/>
-      <feature policy=3D'require' name=3D'vmx-invvpid-single-addr'/>
-      <feature policy=3D'require' name=3D'vmx-invvpid-all-context'/>
       <feature policy=3D'require' name=3D'vmx-ept-execonly'/>
       <feature policy=3D'require' name=3D'vmx-page-walk-4'/>
       <feature policy=3D'require' name=3D'vmx-ept-2mb'/>
@@ -89,6 +86,9 @@
       <feature policy=3D'require' name=3D'vmx-eptad'/>
       <feature policy=3D'require' name=3D'vmx-invept-single-context'/>
       <feature policy=3D'require' name=3D'vmx-invept-all-context'/>
+      <feature policy=3D'require' name=3D'vmx-invvpid'/>
+      <feature policy=3D'require' name=3D'vmx-invvpid-single-addr'/>
+      <feature policy=3D'require' name=3D'vmx-invvpid-all-context'/>
       <feature policy=3D'require' name=3D'vmx-intr-exit'/>
       <feature policy=3D'require' name=3D'vmx-nmi-exit'/>
       <feature policy=3D'require' name=3D'vmx-vnmi'/>
diff --git a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml b/tests/domainc=
apsdata/qemu_5.1.0-tcg.x86_64.xml
index 272d9bed08..2743f91431 100644
--- a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
@@ -37,8 +37,6 @@
     <mode name=3D'host-model' supported=3D'yes'>
       <model fallback=3D'forbid'>Opteron_G3</model>
       <vendor>AMD</vendor>
-      <feature policy=3D'require' name=3D'acpi'/>
-      <feature policy=3D'require' name=3D'ss'/>
       <feature policy=3D'require' name=3D'pclmuldq'/>
       <feature policy=3D'require' name=3D'monitor'/>
       <feature policy=3D'require' name=3D'ssse3'/>
@@ -49,6 +47,8 @@
       <feature policy=3D'require' name=3D'xsave'/>
       <feature policy=3D'require' name=3D'rdrand'/>
       <feature policy=3D'require' name=3D'hypervisor'/>
+      <feature policy=3D'require' name=3D'acpi'/>
+      <feature policy=3D'require' name=3D'ss'/>
       <feature policy=3D'require' name=3D'arat'/>
       <feature policy=3D'require' name=3D'fsgsbase'/>
       <feature policy=3D'require' name=3D'bmi1'/>
@@ -65,11 +65,11 @@
       <feature policy=3D'require' name=3D'la57'/>
       <feature policy=3D'require' name=3D'xsaveopt'/>
       <feature policy=3D'require' name=3D'xgetbv1'/>
+      <feature policy=3D'require' name=3D'cr8legacy'/>
       <feature policy=3D'require' name=3D'mmxext'/>
       <feature policy=3D'require' name=3D'pdpe1gb'/>
       <feature policy=3D'require' name=3D'3dnowext'/>
       <feature policy=3D'require' name=3D'3dnow'/>
-      <feature policy=3D'require' name=3D'cr8legacy'/>
       <feature policy=3D'require' name=3D'npt'/>
       <feature policy=3D'disable' name=3D'misalignsse'/>
     </mode>
diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domainc=
apsdata/qemu_5.2.0-tcg.x86_64.xml
index 526f39254e..7e5f3c8c2b 100644
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
@@ -37,8 +37,6 @@
     <mode name=3D'host-model' supported=3D'yes'>
       <model fallback=3D'forbid'>Opteron_G3</model>
       <vendor>AMD</vendor>
-      <feature policy=3D'require' name=3D'acpi'/>
-      <feature policy=3D'require' name=3D'ss'/>
       <feature policy=3D'require' name=3D'pclmuldq'/>
       <feature policy=3D'require' name=3D'monitor'/>
       <feature policy=3D'require' name=3D'ssse3'/>
@@ -49,6 +47,8 @@
       <feature policy=3D'require' name=3D'xsave'/>
       <feature policy=3D'require' name=3D'rdrand'/>
       <feature policy=3D'require' name=3D'hypervisor'/>
+      <feature policy=3D'require' name=3D'acpi'/>
+      <feature policy=3D'require' name=3D'ss'/>
       <feature policy=3D'require' name=3D'arat'/>
       <feature policy=3D'require' name=3D'fsgsbase'/>
       <feature policy=3D'require' name=3D'bmi1'/>
@@ -65,11 +65,11 @@
       <feature policy=3D'require' name=3D'la57'/>
       <feature policy=3D'require' name=3D'xsaveopt'/>
       <feature policy=3D'require' name=3D'xgetbv1'/>
+      <feature policy=3D'require' name=3D'cr8legacy'/>
       <feature policy=3D'require' name=3D'mmxext'/>
       <feature policy=3D'require' name=3D'pdpe1gb'/>
       <feature policy=3D'require' name=3D'3dnowext'/>
       <feature policy=3D'require' name=3D'3dnow'/>
-      <feature policy=3D'require' name=3D'cr8legacy'/>
       <feature policy=3D'require' name=3D'npt'/>
       <feature policy=3D'disable' name=3D'misalignsse'/>
     </mode>
diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domainc=
apsdata/qemu_6.0.0-tcg.x86_64.xml
index 0ffd95aee6..169e777644 100644
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
@@ -37,8 +37,6 @@
     <mode name=3D'host-model' supported=3D'yes'>
       <model fallback=3D'forbid'>Opteron_G3</model>
       <vendor>AMD</vendor>
-      <feature policy=3D'require' name=3D'acpi'/>
-      <feature policy=3D'require' name=3D'ss'/>
       <feature policy=3D'require' name=3D'pclmuldq'/>
       <feature policy=3D'require' name=3D'monitor'/>
       <feature policy=3D'require' name=3D'ssse3'/>
@@ -49,6 +47,8 @@
       <feature policy=3D'require' name=3D'xsave'/>
       <feature policy=3D'require' name=3D'rdrand'/>
       <feature policy=3D'require' name=3D'hypervisor'/>
+      <feature policy=3D'require' name=3D'acpi'/>
+      <feature policy=3D'require' name=3D'ss'/>
       <feature policy=3D'require' name=3D'arat'/>
       <feature policy=3D'require' name=3D'fsgsbase'/>
       <feature policy=3D'require' name=3D'bmi1'/>
@@ -66,11 +66,11 @@
       <feature policy=3D'require' name=3D'pks'/>
       <feature policy=3D'require' name=3D'xsaveopt'/>
       <feature policy=3D'require' name=3D'xgetbv1'/>
+      <feature policy=3D'require' name=3D'cr8legacy'/>
       <feature policy=3D'require' name=3D'mmxext'/>
       <feature policy=3D'require' name=3D'pdpe1gb'/>
       <feature policy=3D'require' name=3D'3dnowext'/>
       <feature policy=3D'require' name=3D'3dnow'/>
-      <feature policy=3D'require' name=3D'cr8legacy'/>
       <feature policy=3D'require' name=3D'npt'/>
       <feature policy=3D'disable' name=3D'misalignsse'/>
     </mode>
diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domainc=
apsdata/qemu_6.1.0-tcg.x86_64.xml
index a80c86df4f..35f31f4ae8 100644
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
@@ -37,8 +37,6 @@
     <mode name=3D'host-model' supported=3D'yes'>
       <model fallback=3D'forbid'>Opteron_G3</model>
       <vendor>AMD</vendor>
-      <feature policy=3D'require' name=3D'acpi'/>
-      <feature policy=3D'require' name=3D'ss'/>
       <feature policy=3D'require' name=3D'pclmuldq'/>
       <feature policy=3D'require' name=3D'monitor'/>
       <feature policy=3D'require' name=3D'ssse3'/>
@@ -49,6 +47,8 @@
       <feature policy=3D'require' name=3D'xsave'/>
       <feature policy=3D'require' name=3D'rdrand'/>
       <feature policy=3D'require' name=3D'hypervisor'/>
+      <feature policy=3D'require' name=3D'acpi'/>
+      <feature policy=3D'require' name=3D'ss'/>
       <feature policy=3D'require' name=3D'arat'/>
       <feature policy=3D'require' name=3D'fsgsbase'/>
       <feature policy=3D'require' name=3D'bmi1'/>
@@ -66,11 +66,11 @@
       <feature policy=3D'require' name=3D'pks'/>
       <feature policy=3D'require' name=3D'xsaveopt'/>
       <feature policy=3D'require' name=3D'xgetbv1'/>
+      <feature policy=3D'require' name=3D'cr8legacy'/>
       <feature policy=3D'require' name=3D'mmxext'/>
       <feature policy=3D'require' name=3D'pdpe1gb'/>
       <feature policy=3D'require' name=3D'3dnowext'/>
       <feature policy=3D'require' name=3D'3dnow'/>
-      <feature policy=3D'require' name=3D'cr8legacy'/>
       <feature policy=3D'require' name=3D'npt'/>
       <feature policy=3D'disable' name=3D'misalignsse'/>
     </mode>
diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domainc=
apsdata/qemu_6.2.0-tcg.x86_64.xml
index 7ed62fb522..fa1c32f138 100644
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
@@ -37,8 +37,6 @@
     <mode name=3D'host-model' supported=3D'yes'>
       <model fallback=3D'forbid'>Opteron_G3</model>
       <vendor>AMD</vendor>
-      <feature policy=3D'require' name=3D'acpi'/>
-      <feature policy=3D'require' name=3D'ss'/>
       <feature policy=3D'require' name=3D'pclmuldq'/>
       <feature policy=3D'require' name=3D'monitor'/>
       <feature policy=3D'require' name=3D'ssse3'/>
@@ -49,6 +47,8 @@
       <feature policy=3D'require' name=3D'xsave'/>
       <feature policy=3D'require' name=3D'rdrand'/>
       <feature policy=3D'require' name=3D'hypervisor'/>
+      <feature policy=3D'require' name=3D'acpi'/>
+      <feature policy=3D'require' name=3D'ss'/>
       <feature policy=3D'require' name=3D'arat'/>
       <feature policy=3D'require' name=3D'fsgsbase'/>
       <feature policy=3D'require' name=3D'bmi1'/>
@@ -66,11 +66,11 @@
       <feature policy=3D'require' name=3D'pks'/>
       <feature policy=3D'require' name=3D'xsaveopt'/>
       <feature policy=3D'require' name=3D'xgetbv1'/>
+      <feature policy=3D'require' name=3D'cr8legacy'/>
       <feature policy=3D'require' name=3D'mmxext'/>
       <feature policy=3D'require' name=3D'pdpe1gb'/>
       <feature policy=3D'require' name=3D'3dnowext'/>
       <feature policy=3D'require' name=3D'3dnow'/>
-      <feature policy=3D'require' name=3D'cr8legacy'/>
       <feature policy=3D'require' name=3D'npt'/>
       <feature policy=3D'require' name=3D'vgif'/>
       <feature policy=3D'require' name=3D'svme-addr-chk'/>
diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domainc=
apsdata/qemu_7.0.0-tcg.x86_64.xml
index 3a71b54847..8a98f7ed87 100644
--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
@@ -37,8 +37,6 @@
     <mode name=3D'host-model' supported=3D'yes'>
       <model fallback=3D'forbid'>Opteron_G3</model>
       <vendor>AMD</vendor>
-      <feature policy=3D'require' name=3D'acpi'/>
-      <feature policy=3D'require' name=3D'ss'/>
       <feature policy=3D'require' name=3D'pclmuldq'/>
       <feature policy=3D'require' name=3D'monitor'/>
       <feature policy=3D'require' name=3D'ssse3'/>
@@ -49,6 +47,8 @@
       <feature policy=3D'require' name=3D'xsave'/>
       <feature policy=3D'require' name=3D'rdrand'/>
       <feature policy=3D'require' name=3D'hypervisor'/>
+      <feature policy=3D'require' name=3D'acpi'/>
+      <feature policy=3D'require' name=3D'ss'/>
       <feature policy=3D'require' name=3D'arat'/>
       <feature policy=3D'require' name=3D'fsgsbase'/>
       <feature policy=3D'require' name=3D'bmi1'/>
@@ -67,11 +67,11 @@
       <feature policy=3D'require' name=3D'pks'/>
       <feature policy=3D'require' name=3D'xsaveopt'/>
       <feature policy=3D'require' name=3D'xgetbv1'/>
+      <feature policy=3D'require' name=3D'cr8legacy'/>
       <feature policy=3D'require' name=3D'mmxext'/>
       <feature policy=3D'require' name=3D'pdpe1gb'/>
       <feature policy=3D'require' name=3D'3dnowext'/>
       <feature policy=3D'require' name=3D'3dnow'/>
-      <feature policy=3D'require' name=3D'cr8legacy'/>
       <feature policy=3D'require' name=3D'npt'/>
       <feature policy=3D'require' name=3D'vgif'/>
       <feature policy=3D'require' name=3D'svme-addr-chk'/>
diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domainc=
apsdata/qemu_7.1.0-tcg.x86_64.xml
index 1ae2a7c342..4741164370 100644
--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
@@ -37,8 +37,6 @@
     <mode name=3D'host-model' supported=3D'yes'>
       <model fallback=3D'forbid'>Opteron_G3</model>
       <vendor>AMD</vendor>
-      <feature policy=3D'require' name=3D'acpi'/>
-      <feature policy=3D'require' name=3D'ss'/>
       <feature policy=3D'require' name=3D'pclmuldq'/>
       <feature policy=3D'require' name=3D'monitor'/>
       <feature policy=3D'require' name=3D'ssse3'/>
@@ -49,6 +47,8 @@
       <feature policy=3D'require' name=3D'xsave'/>
       <feature policy=3D'require' name=3D'rdrand'/>
       <feature policy=3D'require' name=3D'hypervisor'/>
+      <feature policy=3D'require' name=3D'acpi'/>
+      <feature policy=3D'require' name=3D'ss'/>
       <feature policy=3D'require' name=3D'arat'/>
       <feature policy=3D'require' name=3D'fsgsbase'/>
       <feature policy=3D'require' name=3D'bmi1'/>
@@ -67,11 +67,11 @@
       <feature policy=3D'require' name=3D'pks'/>
       <feature policy=3D'require' name=3D'xsaveopt'/>
       <feature policy=3D'require' name=3D'xgetbv1'/>
+      <feature policy=3D'require' name=3D'cr8legacy'/>
       <feature policy=3D'require' name=3D'mmxext'/>
       <feature policy=3D'require' name=3D'pdpe1gb'/>
       <feature policy=3D'require' name=3D'3dnowext'/>
       <feature policy=3D'require' name=3D'3dnow'/>
-      <feature policy=3D'require' name=3D'cr8legacy'/>
       <feature policy=3D'require' name=3D'npt'/>
       <feature policy=3D'require' name=3D'vgif'/>
       <feature policy=3D'require' name=3D'svme-addr-chk'/>
diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/dom=
aincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
index 69b6be7616..bba0e5069b 100644
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
@@ -37,10 +37,10 @@
     <mode name=3D'host-model' supported=3D'yes'>
       <model fallback=3D'forbid'>EPYC</model>
       <vendor>AMD</vendor>
-      <feature policy=3D'require' name=3D'acpi'/>
-      <feature policy=3D'require' name=3D'ss'/>
       <feature policy=3D'require' name=3D'monitor'/>
       <feature policy=3D'require' name=3D'hypervisor'/>
+      <feature policy=3D'require' name=3D'acpi'/>
+      <feature policy=3D'require' name=3D'ss'/>
       <feature policy=3D'require' name=3D'erms'/>
       <feature policy=3D'require' name=3D'mpx'/>
       <feature policy=3D'require' name=3D'pcommit'/>
@@ -59,11 +59,11 @@
       <feature policy=3D'disable' name=3D'rdseed'/>
       <feature policy=3D'disable' name=3D'sha-ni'/>
       <feature policy=3D'disable' name=3D'xsavec'/>
-      <feature policy=3D'disable' name=3D'fxsr_opt'/>
       <feature policy=3D'disable' name=3D'misalignsse'/>
       <feature policy=3D'disable' name=3D'3dnowprefetch'/>
       <feature policy=3D'disable' name=3D'osvw'/>
       <feature policy=3D'disable' name=3D'topoext'/>
+      <feature policy=3D'disable' name=3D'fxsr_opt'/>
       <feature policy=3D'disable' name=3D'nrip-save'/>
     </mode>
     <mode name=3D'custom' supported=3D'yes'>
diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domainc=
apsdata/qemu_7.2.0-tcg.x86_64.xml
index 69b6be7616..bba0e5069b 100644
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
@@ -37,10 +37,10 @@
     <mode name=3D'host-model' supported=3D'yes'>
       <model fallback=3D'forbid'>EPYC</model>
       <vendor>AMD</vendor>
-      <feature policy=3D'require' name=3D'acpi'/>
-      <feature policy=3D'require' name=3D'ss'/>
       <feature policy=3D'require' name=3D'monitor'/>
       <feature policy=3D'require' name=3D'hypervisor'/>
+      <feature policy=3D'require' name=3D'acpi'/>
+      <feature policy=3D'require' name=3D'ss'/>
       <feature policy=3D'require' name=3D'erms'/>
       <feature policy=3D'require' name=3D'mpx'/>
       <feature policy=3D'require' name=3D'pcommit'/>
@@ -59,11 +59,11 @@
       <feature policy=3D'disable' name=3D'rdseed'/>
       <feature policy=3D'disable' name=3D'sha-ni'/>
       <feature policy=3D'disable' name=3D'xsavec'/>
-      <feature policy=3D'disable' name=3D'fxsr_opt'/>
       <feature policy=3D'disable' name=3D'misalignsse'/>
       <feature policy=3D'disable' name=3D'3dnowprefetch'/>
       <feature policy=3D'disable' name=3D'osvw'/>
       <feature policy=3D'disable' name=3D'topoext'/>
+      <feature policy=3D'disable' name=3D'fxsr_opt'/>
       <feature policy=3D'disable' name=3D'nrip-save'/>
     </mode>
     <mode name=3D'custom' supported=3D'yes'>
diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domainc=
apsdata/qemu_8.0.0-tcg.x86_64.xml
index efb5fcb99d..ce9035cb9b 100644
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
@@ -37,10 +37,10 @@
     <mode name=3D'host-model' supported=3D'yes'>
       <model fallback=3D'forbid'>EPYC</model>
       <vendor>AMD</vendor>
-      <feature policy=3D'require' name=3D'acpi'/>
-      <feature policy=3D'require' name=3D'ss'/>
       <feature policy=3D'require' name=3D'monitor'/>
       <feature policy=3D'require' name=3D'hypervisor'/>
+      <feature policy=3D'require' name=3D'acpi'/>
+      <feature policy=3D'require' name=3D'ss'/>
       <feature policy=3D'require' name=3D'erms'/>
       <feature policy=3D'require' name=3D'mpx'/>
       <feature policy=3D'require' name=3D'pcommit'/>
@@ -63,11 +63,11 @@
       <feature policy=3D'disable' name=3D'rdseed'/>
       <feature policy=3D'disable' name=3D'sha-ni'/>
       <feature policy=3D'disable' name=3D'xsavec'/>
-      <feature policy=3D'disable' name=3D'fxsr_opt'/>
       <feature policy=3D'disable' name=3D'misalignsse'/>
       <feature policy=3D'disable' name=3D'3dnowprefetch'/>
       <feature policy=3D'disable' name=3D'osvw'/>
       <feature policy=3D'disable' name=3D'topoext'/>
+      <feature policy=3D'disable' name=3D'fxsr_opt'/>
       <feature policy=3D'disable' name=3D'nrip-save'/>
     </mode>
     <mode name=3D'custom' supported=3D'yes'>
diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domainc=
apsdata/qemu_8.1.0-tcg.x86_64.xml
index e32cd80c17..b8a566920f 100644
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
@@ -37,10 +37,10 @@
     <mode name=3D'host-model' supported=3D'yes'>
       <model fallback=3D'forbid'>EPYC</model>
       <vendor>AMD</vendor>
-      <feature policy=3D'require' name=3D'acpi'/>
-      <feature policy=3D'require' name=3D'ss'/>
       <feature policy=3D'require' name=3D'monitor'/>
       <feature policy=3D'require' name=3D'hypervisor'/>
+      <feature policy=3D'require' name=3D'acpi'/>
+      <feature policy=3D'require' name=3D'ss'/>
       <feature policy=3D'require' name=3D'erms'/>
       <feature policy=3D'require' name=3D'mpx'/>
       <feature policy=3D'require' name=3D'pcommit'/>
@@ -65,10 +65,10 @@
       <feature policy=3D'disable' name=3D'vme'/>
       <feature policy=3D'disable' name=3D'sha-ni'/>
       <feature policy=3D'disable' name=3D'xsavec'/>
-      <feature policy=3D'disable' name=3D'fxsr_opt'/>
       <feature policy=3D'disable' name=3D'misalignsse'/>
       <feature policy=3D'disable' name=3D'osvw'/>
       <feature policy=3D'disable' name=3D'topoext'/>
+      <feature policy=3D'disable' name=3D'fxsr_opt'/>
       <feature policy=3D'disable' name=3D'nrip-save'/>
     </mode>
     <mode name=3D'custom' supported=3D'yes'>
diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domainc=
apsdata/qemu_8.2.0-tcg.x86_64.xml
index 784a29acd9..e215b5d946 100644
--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
@@ -37,10 +37,10 @@
     <mode name=3D'host-model' supported=3D'yes'>
       <model fallback=3D'forbid'>EPYC</model>
       <vendor>AMD</vendor>
-      <feature policy=3D'require' name=3D'acpi'/>
-      <feature policy=3D'require' name=3D'ss'/>
       <feature policy=3D'require' name=3D'monitor'/>
       <feature policy=3D'require' name=3D'hypervisor'/>
+      <feature policy=3D'require' name=3D'acpi'/>
+      <feature policy=3D'require' name=3D'ss'/>
       <feature policy=3D'require' name=3D'erms'/>
       <feature policy=3D'require' name=3D'mpx'/>
       <feature policy=3D'require' name=3D'pcommit'/>
@@ -64,10 +64,10 @@
       <feature policy=3D'require' name=3D'svme-addr-chk'/>
       <feature policy=3D'disable' name=3D'vme'/>
       <feature policy=3D'disable' name=3D'xsavec'/>
-      <feature policy=3D'disable' name=3D'fxsr_opt'/>
       <feature policy=3D'disable' name=3D'misalignsse'/>
       <feature policy=3D'disable' name=3D'osvw'/>
       <feature policy=3D'disable' name=3D'topoext'/>
+      <feature policy=3D'disable' name=3D'fxsr_opt'/>
       <feature policy=3D'disable' name=3D'nrip-save'/>
     </mode>
     <mode name=3D'custom' supported=3D'yes'>
diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domainc=
apsdata/qemu_9.0.0-tcg.x86_64.xml
index ab81e07510..53a28902a7 100644
--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
@@ -37,10 +37,10 @@
     <mode name=3D'host-model' supported=3D'yes'>
       <model fallback=3D'forbid'>EPYC</model>
       <vendor>AMD</vendor>
-      <feature policy=3D'require' name=3D'acpi'/>
-      <feature policy=3D'require' name=3D'ss'/>
       <feature policy=3D'require' name=3D'monitor'/>
       <feature policy=3D'require' name=3D'hypervisor'/>
+      <feature policy=3D'require' name=3D'acpi'/>
+      <feature policy=3D'require' name=3D'ss'/>
       <feature policy=3D'require' name=3D'erms'/>
       <feature policy=3D'require' name=3D'mpx'/>
       <feature policy=3D'require' name=3D'pcommit'/>
@@ -65,10 +65,10 @@
       <feature policy=3D'require' name=3D'svme-addr-chk'/>
       <feature policy=3D'disable' name=3D'vme'/>
       <feature policy=3D'disable' name=3D'xsavec'/>
-      <feature policy=3D'disable' name=3D'fxsr_opt'/>
       <feature policy=3D'disable' name=3D'misalignsse'/>
       <feature policy=3D'disable' name=3D'osvw'/>
       <feature policy=3D'disable' name=3D'topoext'/>
+      <feature policy=3D'disable' name=3D'fxsr_opt'/>
       <feature policy=3D'disable' name=3D'nrip-save'/>
     </mode>
     <mode name=3D'custom' supported=3D'yes'>
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-4.2.0=
.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-4.2.0.args
index f5f0e818af..52d2ac7b33 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-4.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-4.2.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
 -machine pc-i440fx-4.2,usb=3Doff,dump-guest-core=3Doff \
 -accel kvm \
--cpu Skylake-Client-IBRS,ss=3Don,vmx=3Don,hypervisor=3Don,tsc-adjust=3Don,=
clflushopt=3Don,umip=3Don,md-clear=3Don,stibp=3Don,arch-capabilities=3Don,s=
sbd=3Don,xsaves=3Don,pdpe1gb=3Don,skip-l1dfl-vmentry=3Don,pschange-mc-no=3D=
on,vmx-ins-outs=3Don,vmx-true-ctls=3Don,vmx-store-lma=3Don,vmx-activity-hlt=
=3Don,vmx-vmwrite-vmexit-fields=3Don,vmx-apicv-xapic=3Don,vmx-ept=3Don,vmx-=
desc-exit=3Don,vmx-rdtscp-exit=3Don,vmx-apicv-x2apic=3Don,vmx-vpid=3Don,vmx=
-wbinvd-exit=3Don,vmx-unrestricted-guest=3Don,vmx-rdrand-exit=3Don,vmx-invp=
cid-exit=3Don,vmx-vmfunc=3Don,vmx-shadow-vmcs=3Don,vmx-rdseed-exit=3Don,vmx=
-pml=3Don,vmx-xsaves=3Don,vmx-invvpid=3Don,vmx-invvpid-single-addr=3Don,vmx=
-invvpid-all-context=3Don,vmx-ept-execonly=3Don,vmx-page-walk-4=3Don,vmx-ep=
t-2mb=3Don,vmx-ept-1gb=3Don,vmx-invept=3Don,vmx-eptad=3Don,vmx-invept-singl=
e-context=3Don,vmx-invept-all-context=3Don,vmx-intr-exit=3Don,vmx-nmi-exit=
=3Don,vmx-vnmi=3Don,vmx-preemption-timer=3Don,vmx-vintr-pending=3Don,vmx-ts=
c-offset=3Don,vmx-hlt-exit=3Don,vmx-invlpg-exit=3Don,vmx-mwait-exit=3Don,vm=
x-rdpmc-exit=3Don,vmx-rdtsc-exit=3Don,vmx-cr3-load-noexit=3Don,vmx-cr3-stor=
e-noexit=3Don,vmx-cr8-load-exit=3Don,vmx-cr8-store-exit=3Don,vmx-flexpriori=
ty=3Don,vmx-vnmi-pending=3Don,vmx-movdr-exit=3Don,vmx-io-exit=3Don,vmx-io-b=
itmap=3Don,vmx-mtf=3Don,vmx-msr-bitmap=3Don,vmx-monitor-exit=3Don,vmx-pause=
-exit=3Don,vmx-secondary-ctls=3Don,vmx-exit-nosave-debugctl=3Don,vmx-exit-a=
ck-intr=3Don,vmx-exit-save-pat=3Don,vmx-exit-load-pat=3Don,vmx-exit-save-ef=
er=3Don,vmx-exit-load-efer=3Don,vmx-exit-save-preemption-timer=3Don,vmx-ent=
ry-noload-debugctl=3Don,vmx-entry-ia32e-mode=3Don,vmx-entry-load-pat=3Don,v=
mx-entry-load-efer=3Don,vmx-eptp-switching=3Don \
+-cpu Skylake-Client-IBRS,vmx=3Don,hypervisor=3Don,ss=3Don,tsc-adjust=3Don,=
clflushopt=3Don,umip=3Don,md-clear=3Don,stibp=3Don,arch-capabilities=3Don,s=
sbd=3Don,xsaves=3Don,pdpe1gb=3Don,skip-l1dfl-vmentry=3Don,pschange-mc-no=3D=
on,vmx-ins-outs=3Don,vmx-true-ctls=3Don,vmx-store-lma=3Don,vmx-activity-hlt=
=3Don,vmx-vmwrite-vmexit-fields=3Don,vmx-apicv-xapic=3Don,vmx-ept=3Don,vmx-=
desc-exit=3Don,vmx-rdtscp-exit=3Don,vmx-apicv-x2apic=3Don,vmx-vpid=3Don,vmx=
-wbinvd-exit=3Don,vmx-unrestricted-guest=3Don,vmx-rdrand-exit=3Don,vmx-invp=
cid-exit=3Don,vmx-vmfunc=3Don,vmx-shadow-vmcs=3Don,vmx-rdseed-exit=3Don,vmx=
-pml=3Don,vmx-xsaves=3Don,vmx-ept-execonly=3Don,vmx-page-walk-4=3Don,vmx-ep=
t-2mb=3Don,vmx-ept-1gb=3Don,vmx-invept=3Don,vmx-eptad=3Don,vmx-invept-singl=
e-context=3Don,vmx-invept-all-context=3Don,vmx-invvpid=3Don,vmx-invvpid-sin=
gle-addr=3Don,vmx-invvpid-all-context=3Don,vmx-intr-exit=3Don,vmx-nmi-exit=
=3Don,vmx-vnmi=3Don,vmx-preemption-timer=3Don,vmx-vintr-pending=3Don,vmx-ts=
c-offset=3Don,vmx-hlt-exit=3Don,vmx-invlpg-exit=3Don,vmx-mwait-exit=3Don,vm=
x-rdpmc-exit=3Don,vmx-rdtsc-exit=3Don,vmx-cr3-load-noexit=3Don,vmx-cr3-stor=
e-noexit=3Don,vmx-cr8-load-exit=3Don,vmx-cr8-store-exit=3Don,vmx-flexpriori=
ty=3Don,vmx-vnmi-pending=3Don,vmx-movdr-exit=3Don,vmx-io-exit=3Don,vmx-io-b=
itmap=3Don,vmx-mtf=3Don,vmx-msr-bitmap=3Don,vmx-monitor-exit=3Don,vmx-pause=
-exit=3Don,vmx-secondary-ctls=3Don,vmx-exit-nosave-debugctl=3Don,vmx-exit-a=
ck-intr=3Don,vmx-exit-save-pat=3Don,vmx-exit-load-pat=3Don,vmx-exit-save-ef=
er=3Don,vmx-exit-load-efer=3Don,vmx-exit-save-preemption-timer=3Don,vmx-ent=
ry-noload-debugctl=3Don,vmx-entry-ia32e-mode=3Don,vmx-entry-load-pat=3Don,v=
mx-entry-load-efer=3Don,vmx-eptp-switching=3Don \
 -m size=3D219136k \
 -overcommit mem-lock=3Doff \
 -smp 6,sockets=3D6,cores=3D1,threads=3D1 \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-5.0.0=
.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-5.0.0.args
index 699f48fbaa..ca8bff1080 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-5.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-5.0.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
 -machine pc-i440fx-5.0,usb=3Doff,dump-guest-core=3Doff \
 -accel kvm \
--cpu Skylake-Client-IBRS,ss=3Don,vmx=3Don,hypervisor=3Don,tsc-adjust=3Don,=
clflushopt=3Don,umip=3Don,md-clear=3Don,stibp=3Don,arch-capabilities=3Don,s=
sbd=3Don,xsaves=3Don,pdpe1gb=3Don,skip-l1dfl-vmentry=3Don,pschange-mc-no=3D=
on,vmx-ins-outs=3Don,vmx-true-ctls=3Don,vmx-store-lma=3Don,vmx-activity-hlt=
=3Don,vmx-vmwrite-vmexit-fields=3Don,vmx-apicv-xapic=3Don,vmx-ept=3Don,vmx-=
desc-exit=3Don,vmx-rdtscp-exit=3Don,vmx-apicv-x2apic=3Don,vmx-vpid=3Don,vmx=
-wbinvd-exit=3Don,vmx-unrestricted-guest=3Don,vmx-rdrand-exit=3Don,vmx-invp=
cid-exit=3Don,vmx-vmfunc=3Don,vmx-shadow-vmcs=3Don,vmx-rdseed-exit=3Don,vmx=
-pml=3Don,vmx-xsaves=3Don,vmx-invvpid=3Don,vmx-invvpid-single-addr=3Don,vmx=
-invvpid-all-context=3Don,vmx-ept-execonly=3Don,vmx-page-walk-4=3Don,vmx-ep=
t-2mb=3Don,vmx-ept-1gb=3Don,vmx-invept=3Don,vmx-eptad=3Don,vmx-invept-singl=
e-context=3Don,vmx-invept-all-context=3Don,vmx-intr-exit=3Don,vmx-nmi-exit=
=3Don,vmx-vnmi=3Don,vmx-preemption-timer=3Don,vmx-vintr-pending=3Don,vmx-ts=
c-offset=3Don,vmx-hlt-exit=3Don,vmx-invlpg-exit=3Don,vmx-mwait-exit=3Don,vm=
x-rdpmc-exit=3Don,vmx-rdtsc-exit=3Don,vmx-cr3-load-noexit=3Don,vmx-cr3-stor=
e-noexit=3Don,vmx-cr8-load-exit=3Don,vmx-cr8-store-exit=3Don,vmx-flexpriori=
ty=3Don,vmx-vnmi-pending=3Don,vmx-movdr-exit=3Don,vmx-io-exit=3Don,vmx-io-b=
itmap=3Don,vmx-mtf=3Don,vmx-msr-bitmap=3Don,vmx-monitor-exit=3Don,vmx-pause=
-exit=3Don,vmx-secondary-ctls=3Don,vmx-exit-nosave-debugctl=3Don,vmx-exit-a=
ck-intr=3Don,vmx-exit-save-pat=3Don,vmx-exit-load-pat=3Don,vmx-exit-save-ef=
er=3Don,vmx-exit-load-efer=3Don,vmx-exit-save-preemption-timer=3Don,vmx-ent=
ry-noload-debugctl=3Don,vmx-entry-ia32e-mode=3Don,vmx-entry-load-pat=3Don,v=
mx-entry-load-efer=3Don,vmx-eptp-switching=3Don \
+-cpu Skylake-Client-IBRS,vmx=3Don,hypervisor=3Don,ss=3Don,tsc-adjust=3Don,=
clflushopt=3Don,umip=3Don,md-clear=3Don,stibp=3Don,arch-capabilities=3Don,s=
sbd=3Don,xsaves=3Don,pdpe1gb=3Don,skip-l1dfl-vmentry=3Don,pschange-mc-no=3D=
on,vmx-ins-outs=3Don,vmx-true-ctls=3Don,vmx-store-lma=3Don,vmx-activity-hlt=
=3Don,vmx-vmwrite-vmexit-fields=3Don,vmx-apicv-xapic=3Don,vmx-ept=3Don,vmx-=
desc-exit=3Don,vmx-rdtscp-exit=3Don,vmx-apicv-x2apic=3Don,vmx-vpid=3Don,vmx=
-wbinvd-exit=3Don,vmx-unrestricted-guest=3Don,vmx-rdrand-exit=3Don,vmx-invp=
cid-exit=3Don,vmx-vmfunc=3Don,vmx-shadow-vmcs=3Don,vmx-rdseed-exit=3Don,vmx=
-pml=3Don,vmx-xsaves=3Don,vmx-ept-execonly=3Don,vmx-page-walk-4=3Don,vmx-ep=
t-2mb=3Don,vmx-ept-1gb=3Don,vmx-invept=3Don,vmx-eptad=3Don,vmx-invept-singl=
e-context=3Don,vmx-invept-all-context=3Don,vmx-invvpid=3Don,vmx-invvpid-sin=
gle-addr=3Don,vmx-invvpid-all-context=3Don,vmx-intr-exit=3Don,vmx-nmi-exit=
=3Don,vmx-vnmi=3Don,vmx-preemption-timer=3Don,vmx-vintr-pending=3Don,vmx-ts=
c-offset=3Don,vmx-hlt-exit=3Don,vmx-invlpg-exit=3Don,vmx-mwait-exit=3Don,vm=
x-rdpmc-exit=3Don,vmx-rdtsc-exit=3Don,vmx-cr3-load-noexit=3Don,vmx-cr3-stor=
e-noexit=3Don,vmx-cr8-load-exit=3Don,vmx-cr8-store-exit=3Don,vmx-flexpriori=
ty=3Don,vmx-vnmi-pending=3Don,vmx-movdr-exit=3Don,vmx-io-exit=3Don,vmx-io-b=
itmap=3Don,vmx-mtf=3Don,vmx-msr-bitmap=3Don,vmx-monitor-exit=3Don,vmx-pause=
-exit=3Don,vmx-secondary-ctls=3Don,vmx-exit-nosave-debugctl=3Don,vmx-exit-a=
ck-intr=3Don,vmx-exit-save-pat=3Don,vmx-exit-load-pat=3Don,vmx-exit-save-ef=
er=3Don,vmx-exit-load-efer=3Don,vmx-exit-save-preemption-timer=3Don,vmx-ent=
ry-noload-debugctl=3Don,vmx-entry-ia32e-mode=3Don,vmx-entry-load-pat=3Don,v=
mx-entry-load-efer=3Don,vmx-eptp-switching=3Don \
 -m size=3D219136k \
 -overcommit mem-lock=3Doff \
 -smp 6,sockets=3D6,cores=3D1,threads=3D1 \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-4.2.0=
.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-4.2.0.args
index cf7ad7b5f4..e4c805bf4e 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-4.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-4.2.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
 -machine pc-i440fx-4.2,usb=3Doff,dump-guest-core=3Doff \
 -accel tcg \
--cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s=
se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso=
r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=3Don,3dnowext=3Don,3=
dnow=3Don,cr8legacy=3Don,npt=3Don,misalignsse=3Doff \
+-cpu Opteron_G3,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,sse4.1=3Don,sse4.2=
=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hypervisor=3Don,acpi=3Don,=
ss=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,xsaveopt=3Don,xgetbv1=3Don,cr8legacy=3Don,mmxext=3Don,pdpe1gb=3Don,=
3dnowext=3Don,3dnow=3Don,npt=3Don,misalignsse=3Doff \
 -m size=3D219136k \
 -overcommit mem-lock=3Doff \
 -smp 6,sockets=3D6,cores=3D1,threads=3D1 \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.0.0=
.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.0.0.args
index 257b271386..b90e177dce 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.0.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
 -machine pc-i440fx-5.0,usb=3Doff,dump-guest-core=3Doff \
 -accel tcg \
--cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s=
se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso=
r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=3Don,3dnowext=3Don,3=
dnow=3Don,cr8legacy=3Don,npt=3Don,misalignsse=3Doff \
+-cpu Opteron_G3,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,sse4.1=3Don,sse4.2=
=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hypervisor=3Don,acpi=3Don,=
ss=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,xsaveopt=3Don,xgetbv1=3Don,cr8legacy=3Don,mmxext=3Don,pdpe1gb=3Don,=
3dnowext=3Don,3dnow=3Don,npt=3Don,misalignsse=3Doff \
 -m size=3D219136k \
 -overcommit mem-lock=3Doff \
 -smp 6,sockets=3D6,cores=3D1,threads=3D1 \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.1.0=
.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.1.0.args
index 71551b51a3..837fb78129 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.1.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
 -machine pc-i440fx-5.1,usb=3Doff,dump-guest-core=3Doff \
 -accel tcg \
--cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s=
se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso=
r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=3Don,3dnowext=3Don,3=
dnow=3Don,cr8legacy=3Don,npt=3Don,misalignsse=3Doff \
+-cpu Opteron_G3,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,sse4.1=3Don,sse4.2=
=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hypervisor=3Don,acpi=3Don,=
ss=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,xsaveopt=3Don,xgetbv1=3Don,cr8legacy=3Don,mmxext=3Don,pdpe1gb=3Don,=
3dnowext=3Don,3dnow=3Don,npt=3Don,misalignsse=3Doff \
 -m size=3D219136k \
 -overcommit mem-lock=3Doff \
 -smp 6,sockets=3D6,cores=3D1,threads=3D1 \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.2.0=
.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.2.0.args
index 834d92c35a..5f356d87d4 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-5.2.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
 -machine pc-i440fx-5.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc=
.ram \
 -accel tcg \
--cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s=
se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso=
r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=3Don,3dnowext=3Don,3=
dnow=3Don,cr8legacy=3Don,npt=3Don,misalignsse=3Doff \
+-cpu Opteron_G3,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,sse4.1=3Don,sse4.2=
=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hypervisor=3Don,acpi=3Don,=
ss=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,xsaveopt=3Don,xgetbv1=3Don,cr8legacy=3Don,mmxext=3Don,pdpe1gb=3Don,=
3dnowext=3Don,3dnow=3Don,npt=3Don,misalignsse=3Doff \
 -m size=3D219136k \
 -object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \
 -overcommit mem-lock=3Doff \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-6.0.0=
.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-6.0.0.args
index 611bf05482..c929861cfa 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-6.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-6.0.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va=
r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-i440fx-6.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc=
.ram \
 -accel tcg \
--cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s=
se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso=
r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,pks=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=3Don,3dnowe=
xt=3Don,3dnow=3Don,cr8legacy=3Don,npt=3Don,misalignsse=3Doff \
+-cpu Opteron_G3,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,sse4.1=3Don,sse4.2=
=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hypervisor=3Don,acpi=3Don,=
ss=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,pks=3Don,xsaveopt=3Don,xgetbv1=3Don,cr8legacy=3Don,mmxext=3Don,pdpe=
1gb=3Don,3dnowext=3Don,3dnow=3Don,npt=3Don,misalignsse=3Doff \
 -m size=3D219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'=
 \
 -overcommit mem-lock=3Doff \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-6.1.0=
.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-6.1.0.args
index 79ae00e993..c19affe3c6 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-6.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-6.1.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va=
r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-i440fx-6.1,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc=
.ram \
 -accel tcg \
--cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s=
se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso=
r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,pks=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=3Don,3dnowe=
xt=3Don,3dnow=3Don,cr8legacy=3Don,npt=3Don,misalignsse=3Doff \
+-cpu Opteron_G3,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,sse4.1=3Don,sse4.2=
=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hypervisor=3Don,acpi=3Don,=
ss=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,pks=3Don,xsaveopt=3Don,xgetbv1=3Don,cr8legacy=3Don,mmxext=3Don,pdpe=
1gb=3Don,3dnowext=3Don,3dnow=3Don,npt=3Don,misalignsse=3Doff \
 -m size=3D219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'=
 \
 -overcommit mem-lock=3Doff \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-6.2.0=
.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-6.2.0.args
index 9c8331629a..09d287f68a 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-6.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-6.2.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va=
r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-i440fx-6.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc=
.ram \
 -accel tcg \
--cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s=
se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso=
r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,pks=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=3Don,3dnowe=
xt=3Don,3dnow=3Don,cr8legacy=3Don,npt=3Don,vgif=3Don,svme-addr-chk=3Don,mis=
alignsse=3Doff \
+-cpu Opteron_G3,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,sse4.1=3Don,sse4.2=
=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hypervisor=3Don,acpi=3Don,=
ss=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,pks=3Don,xsaveopt=3Don,xgetbv1=3Don,cr8legacy=3Don,mmxext=3Don,pdpe=
1gb=3Don,3dnowext=3Don,3dnow=3Don,npt=3Don,vgif=3Don,svme-addr-chk=3Don,mis=
alignsse=3Doff \
 -m size=3D219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'=
 \
 -overcommit mem-lock=3Doff \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.0.0=
.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.0.0.args
index 5929c9a87b..771ef9e453 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.0.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va=
r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-i440fx-7.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc=
.ram \
 -accel tcg \
--cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s=
se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso=
r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,umip=3Don,p=
ku=3Don,la57=3Don,pks=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=
=3Don,3dnowext=3Don,3dnow=3Don,cr8legacy=3Don,npt=3Don,vgif=3Don,svme-addr-=
chk=3Don,misalignsse=3Doff \
+-cpu Opteron_G3,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,sse4.1=3Don,sse4.2=
=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hypervisor=3Don,acpi=3Don,=
ss=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,umip=3Don,p=
ku=3Don,la57=3Don,pks=3Don,xsaveopt=3Don,xgetbv1=3Don,cr8legacy=3Don,mmxext=
=3Don,pdpe1gb=3Don,3dnowext=3Don,3dnow=3Don,npt=3Don,vgif=3Don,svme-addr-ch=
k=3Don,misalignsse=3Doff \
 -m size=3D219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'=
 \
 -overcommit mem-lock=3Doff \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.1.0=
.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.1.0.args
index 141c2e36eb..40cc53482e 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.1.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va=
r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-i440fx-7.1,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc=
.ram \
 -accel tcg \
--cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s=
se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso=
r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,umip=3Don,p=
ku=3Don,la57=3Don,pks=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=
=3Don,3dnowext=3Don,3dnow=3Don,cr8legacy=3Don,npt=3Don,vgif=3Don,svme-addr-=
chk=3Don,misalignsse=3Doff \
+-cpu Opteron_G3,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,sse4.1=3Don,sse4.2=
=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hypervisor=3Don,acpi=3Don,=
ss=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,umip=3Don,p=
ku=3Don,la57=3Don,pks=3Don,xsaveopt=3Don,xgetbv1=3Don,cr8legacy=3Don,mmxext=
=3Don,pdpe1gb=3Don,3dnowext=3Don,3dnow=3Don,npt=3Don,vgif=3Don,svme-addr-ch=
k=3Don,misalignsse=3Doff \
 -m size=3D219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'=
 \
 -overcommit mem-lock=3Doff \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.2.0=
.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.2.0.args
index 1e7f444d73..20b3865d00 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-7.2.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va=
r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-i440fx-7.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc=
.ram \
 -accel tcg \
--cpu EPYC,acpi=3Don,ss=3Don,monitor=3Don,hypervisor=3Don,erms=3Don,mpx=3Do=
n,pcommit=3Don,clwb=3Don,umip=3Don,pku=3Don,vaes=3Don,la57=3Don,pks=3Don,3d=
nowext=3Don,3dnow=3Don,npt=3Don,vgif=3Don,svme-addr-chk=3Don,vme=3Doff,rdse=
ed=3Doff,sha-ni=3Doff,xsavec=3Doff,fxsr-opt=3Doff,misalignsse=3Doff,3dnowpr=
efetch=3Doff,osvw=3Doff,topoext=3Doff,nrip-save=3Doff \
+-cpu EPYC,monitor=3Don,hypervisor=3Don,acpi=3Don,ss=3Don,erms=3Don,mpx=3Do=
n,pcommit=3Don,clwb=3Don,umip=3Don,pku=3Don,vaes=3Don,la57=3Don,pks=3Don,3d=
nowext=3Don,3dnow=3Don,npt=3Don,vgif=3Don,svme-addr-chk=3Don,vme=3Doff,rdse=
ed=3Doff,sha-ni=3Doff,xsavec=3Doff,misalignsse=3Doff,3dnowprefetch=3Doff,os=
vw=3Doff,topoext=3Doff,fxsr-opt=3Doff,nrip-save=3Doff \
 -m size=3D219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'=
 \
 -overcommit mem-lock=3Doff \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.0.0=
.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.0.0.args
index 943b0d477b..7e1a3a8be8 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.0.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va=
r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-i440fx-8.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc=
.ram,acpi=3Doff \
 -accel tcg \
--cpu EPYC,acpi=3Don,ss=3Don,monitor=3Don,hypervisor=3Don,erms=3Don,mpx=3Do=
n,pcommit=3Don,clwb=3Don,umip=3Don,pku=3Don,vaes=3Don,la57=3Don,pks=3Don,fs=
rm=3Don,fzrm=3Don,fsrs=3Don,fsrc=3Don,3dnowext=3Don,3dnow=3Don,npt=3Don,vgi=
f=3Don,svme-addr-chk=3Don,vme=3Doff,rdseed=3Doff,sha-ni=3Doff,xsavec=3Doff,=
fxsr-opt=3Doff,misalignsse=3Doff,3dnowprefetch=3Doff,osvw=3Doff,topoext=3Do=
ff,nrip-save=3Doff \
+-cpu EPYC,monitor=3Don,hypervisor=3Don,acpi=3Don,ss=3Don,erms=3Don,mpx=3Do=
n,pcommit=3Don,clwb=3Don,umip=3Don,pku=3Don,vaes=3Don,la57=3Don,pks=3Don,fs=
rm=3Don,fzrm=3Don,fsrs=3Don,fsrc=3Don,3dnowext=3Don,3dnow=3Don,npt=3Don,vgi=
f=3Don,svme-addr-chk=3Don,vme=3Doff,rdseed=3Doff,sha-ni=3Doff,xsavec=3Doff,=
misalignsse=3Doff,3dnowprefetch=3Doff,osvw=3Doff,topoext=3Doff,fxsr-opt=3Do=
ff,nrip-save=3Doff \
 -m size=3D219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'=
 \
 -overcommit mem-lock=3Doff \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.1.0=
.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.1.0.args
index 177f7da2b5..2c81adbb23 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-8.1.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va=
r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-i440fx-8.1,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc=
.ram,acpi=3Doff \
 -accel tcg \
--cpu EPYC,acpi=3Don,ss=3Don,monitor=3Don,hypervisor=3Don,erms=3Don,mpx=3Do=
n,pcommit=3Don,clwb=3Don,umip=3Don,pku=3Don,vaes=3Don,la57=3Don,rdpid=3Don,=
pks=3Don,fsrm=3Don,fzrm=3Don,fsrs=3Don,fsrc=3Don,3dnowext=3Don,3dnow=3Don,x=
saveerptr=3Don,wbnoinvd=3Don,npt=3Don,vgif=3Don,svme-addr-chk=3Don,vme=3Dof=
f,sha-ni=3Doff,xsavec=3Doff,fxsr-opt=3Doff,misalignsse=3Doff,osvw=3Doff,top=
oext=3Doff,nrip-save=3Doff \
+-cpu EPYC,monitor=3Don,hypervisor=3Don,acpi=3Don,ss=3Don,erms=3Don,mpx=3Do=
n,pcommit=3Don,clwb=3Don,umip=3Don,pku=3Don,vaes=3Don,la57=3Don,rdpid=3Don,=
pks=3Don,fsrm=3Don,fzrm=3Don,fsrs=3Don,fsrc=3Don,3dnowext=3Don,3dnow=3Don,x=
saveerptr=3Don,wbnoinvd=3Don,npt=3Don,vgif=3Don,svme-addr-chk=3Don,vme=3Dof=
f,sha-ni=3Doff,xsavec=3Doff,misalignsse=3Doff,osvw=3Doff,topoext=3Doff,fxsr=
-opt=3Doff,nrip-save=3Doff \
 -m size=3D219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'=
 \
 -overcommit mem-lock=3Doff \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-lates=
t.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-latest.ar=
gs
index e0b49dc318..85117194f4 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_64-latest.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va=
r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi=
=3Doff \
 -accel tcg \
--cpu EPYC,acpi=3Don,ss=3Don,monitor=3Don,hypervisor=3Don,erms=3Don,mpx=3Do=
n,pcommit=3Don,clwb=3Don,umip=3Don,pku=3Don,vaes=3Don,la57=3Don,rdpid=3Don,=
pks=3Don,fsrm=3Don,cmpccxadd=3Don,fzrm=3Don,fsrs=3Don,fsrc=3Don,3dnowext=3D=
on,3dnow=3Don,xsaveerptr=3Don,wbnoinvd=3Don,npt=3Don,vgif=3Don,svme-addr-ch=
k=3Don,vme=3Doff,xsavec=3Doff,fxsr-opt=3Doff,misalignsse=3Doff,osvw=3Doff,t=
opoext=3Doff,nrip-save=3Doff \
+-cpu EPYC,monitor=3Don,hypervisor=3Don,acpi=3Don,ss=3Don,erms=3Don,mpx=3Do=
n,pcommit=3Don,clwb=3Don,umip=3Don,pku=3Don,vaes=3Don,la57=3Don,rdpid=3Don,=
pks=3Don,fsrm=3Don,cmpccxadd=3Don,fzrm=3Don,fsrs=3Don,fsrc=3Don,3dnowext=3D=
on,3dnow=3Don,xsaveerptr=3Don,wbnoinvd=3Don,npt=3Don,vgif=3Don,svme-addr-ch=
k=3Don,vme=3Doff,xsavec=3Doff,misalignsse=3Doff,osvw=3Doff,topoext=3Doff,fx=
sr-opt=3Doff,nrip-save=3Doff \
 -m size=3D219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'=
 \
 -overcommit mem-lock=3Doff \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-4.2.0.args b/t=
ests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-4.2.0.args
index aacba803e8..42619fdff3 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-4.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-4.2.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
 -machine pc-q35-4.2,usb=3Doff,dump-guest-core=3Doff \
 -accel kvm \
--cpu Skylake-Client-IBRS,ss=3Don,vmx=3Don,hypervisor=3Don,tsc-adjust=3Don,=
clflushopt=3Don,umip=3Don,md-clear=3Don,stibp=3Don,arch-capabilities=3Don,s=
sbd=3Don,xsaves=3Don,pdpe1gb=3Don,skip-l1dfl-vmentry=3Don,pschange-mc-no=3D=
on,vmx-ins-outs=3Don,vmx-true-ctls=3Don,vmx-store-lma=3Don,vmx-activity-hlt=
=3Don,vmx-vmwrite-vmexit-fields=3Don,vmx-apicv-xapic=3Don,vmx-ept=3Don,vmx-=
desc-exit=3Don,vmx-rdtscp-exit=3Don,vmx-apicv-x2apic=3Don,vmx-vpid=3Don,vmx=
-wbinvd-exit=3Don,vmx-unrestricted-guest=3Don,vmx-rdrand-exit=3Don,vmx-invp=
cid-exit=3Don,vmx-vmfunc=3Don,vmx-shadow-vmcs=3Don,vmx-rdseed-exit=3Don,vmx=
-pml=3Don,vmx-xsaves=3Don,vmx-invvpid=3Don,vmx-invvpid-single-addr=3Don,vmx=
-invvpid-all-context=3Don,vmx-ept-execonly=3Don,vmx-page-walk-4=3Don,vmx-ep=
t-2mb=3Don,vmx-ept-1gb=3Don,vmx-invept=3Don,vmx-eptad=3Don,vmx-invept-singl=
e-context=3Don,vmx-invept-all-context=3Don,vmx-intr-exit=3Don,vmx-nmi-exit=
=3Don,vmx-vnmi=3Don,vmx-preemption-timer=3Don,vmx-vintr-pending=3Don,vmx-ts=
c-offset=3Don,vmx-hlt-exit=3Don,vmx-invlpg-exit=3Don,vmx-mwait-exit=3Don,vm=
x-rdpmc-exit=3Don,vmx-rdtsc-exit=3Don,vmx-cr3-load-noexit=3Don,vmx-cr3-stor=
e-noexit=3Don,vmx-cr8-load-exit=3Don,vmx-cr8-store-exit=3Don,vmx-flexpriori=
ty=3Don,vmx-vnmi-pending=3Don,vmx-movdr-exit=3Don,vmx-io-exit=3Don,vmx-io-b=
itmap=3Don,vmx-mtf=3Don,vmx-msr-bitmap=3Don,vmx-monitor-exit=3Don,vmx-pause=
-exit=3Don,vmx-secondary-ctls=3Don,vmx-exit-nosave-debugctl=3Don,vmx-exit-a=
ck-intr=3Don,vmx-exit-save-pat=3Don,vmx-exit-load-pat=3Don,vmx-exit-save-ef=
er=3Don,vmx-exit-load-efer=3Don,vmx-exit-save-preemption-timer=3Don,vmx-ent=
ry-noload-debugctl=3Don,vmx-entry-ia32e-mode=3Don,vmx-entry-load-pat=3Don,v=
mx-entry-load-efer=3Don,vmx-eptp-switching=3Don \
+-cpu Skylake-Client-IBRS,vmx=3Don,hypervisor=3Don,ss=3Don,tsc-adjust=3Don,=
clflushopt=3Don,umip=3Don,md-clear=3Don,stibp=3Don,arch-capabilities=3Don,s=
sbd=3Don,xsaves=3Don,pdpe1gb=3Don,skip-l1dfl-vmentry=3Don,pschange-mc-no=3D=
on,vmx-ins-outs=3Don,vmx-true-ctls=3Don,vmx-store-lma=3Don,vmx-activity-hlt=
=3Don,vmx-vmwrite-vmexit-fields=3Don,vmx-apicv-xapic=3Don,vmx-ept=3Don,vmx-=
desc-exit=3Don,vmx-rdtscp-exit=3Don,vmx-apicv-x2apic=3Don,vmx-vpid=3Don,vmx=
-wbinvd-exit=3Don,vmx-unrestricted-guest=3Don,vmx-rdrand-exit=3Don,vmx-invp=
cid-exit=3Don,vmx-vmfunc=3Don,vmx-shadow-vmcs=3Don,vmx-rdseed-exit=3Don,vmx=
-pml=3Don,vmx-xsaves=3Don,vmx-ept-execonly=3Don,vmx-page-walk-4=3Don,vmx-ep=
t-2mb=3Don,vmx-ept-1gb=3Don,vmx-invept=3Don,vmx-eptad=3Don,vmx-invept-singl=
e-context=3Don,vmx-invept-all-context=3Don,vmx-invvpid=3Don,vmx-invvpid-sin=
gle-addr=3Don,vmx-invvpid-all-context=3Don,vmx-intr-exit=3Don,vmx-nmi-exit=
=3Don,vmx-vnmi=3Don,vmx-preemption-timer=3Don,vmx-vintr-pending=3Don,vmx-ts=
c-offset=3Don,vmx-hlt-exit=3Don,vmx-invlpg-exit=3Don,vmx-mwait-exit=3Don,vm=
x-rdpmc-exit=3Don,vmx-rdtsc-exit=3Don,vmx-cr3-load-noexit=3Don,vmx-cr3-stor=
e-noexit=3Don,vmx-cr8-load-exit=3Don,vmx-cr8-store-exit=3Don,vmx-flexpriori=
ty=3Don,vmx-vnmi-pending=3Don,vmx-movdr-exit=3Don,vmx-io-exit=3Don,vmx-io-b=
itmap=3Don,vmx-mtf=3Don,vmx-msr-bitmap=3Don,vmx-monitor-exit=3Don,vmx-pause=
-exit=3Don,vmx-secondary-ctls=3Don,vmx-exit-nosave-debugctl=3Don,vmx-exit-a=
ck-intr=3Don,vmx-exit-save-pat=3Don,vmx-exit-load-pat=3Don,vmx-exit-save-ef=
er=3Don,vmx-exit-load-efer=3Don,vmx-exit-save-preemption-timer=3Don,vmx-ent=
ry-noload-debugctl=3Don,vmx-entry-ia32e-mode=3Don,vmx-entry-load-pat=3Don,v=
mx-entry-load-efer=3Don,vmx-eptp-switching=3Don \
 -m size=3D219136k \
 -overcommit mem-lock=3Doff \
 -smp 1,sockets=3D1,cores=3D1,threads=3D1 \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-5.0.0.args b/t=
ests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-5.0.0.args
index a2415bb667..baceda1d3d 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-5.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-5.0.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
 -machine pc-q35-5.0,usb=3Doff,dump-guest-core=3Doff \
 -accel kvm \
--cpu Skylake-Client-IBRS,ss=3Don,vmx=3Don,hypervisor=3Don,tsc-adjust=3Don,=
clflushopt=3Don,umip=3Don,md-clear=3Don,stibp=3Don,arch-capabilities=3Don,s=
sbd=3Don,xsaves=3Don,pdpe1gb=3Don,skip-l1dfl-vmentry=3Don,pschange-mc-no=3D=
on,vmx-ins-outs=3Don,vmx-true-ctls=3Don,vmx-store-lma=3Don,vmx-activity-hlt=
=3Don,vmx-vmwrite-vmexit-fields=3Don,vmx-apicv-xapic=3Don,vmx-ept=3Don,vmx-=
desc-exit=3Don,vmx-rdtscp-exit=3Don,vmx-apicv-x2apic=3Don,vmx-vpid=3Don,vmx=
-wbinvd-exit=3Don,vmx-unrestricted-guest=3Don,vmx-rdrand-exit=3Don,vmx-invp=
cid-exit=3Don,vmx-vmfunc=3Don,vmx-shadow-vmcs=3Don,vmx-rdseed-exit=3Don,vmx=
-pml=3Don,vmx-xsaves=3Don,vmx-invvpid=3Don,vmx-invvpid-single-addr=3Don,vmx=
-invvpid-all-context=3Don,vmx-ept-execonly=3Don,vmx-page-walk-4=3Don,vmx-ep=
t-2mb=3Don,vmx-ept-1gb=3Don,vmx-invept=3Don,vmx-eptad=3Don,vmx-invept-singl=
e-context=3Don,vmx-invept-all-context=3Don,vmx-intr-exit=3Don,vmx-nmi-exit=
=3Don,vmx-vnmi=3Don,vmx-preemption-timer=3Don,vmx-vintr-pending=3Don,vmx-ts=
c-offset=3Don,vmx-hlt-exit=3Don,vmx-invlpg-exit=3Don,vmx-mwait-exit=3Don,vm=
x-rdpmc-exit=3Don,vmx-rdtsc-exit=3Don,vmx-cr3-load-noexit=3Don,vmx-cr3-stor=
e-noexit=3Don,vmx-cr8-load-exit=3Don,vmx-cr8-store-exit=3Don,vmx-flexpriori=
ty=3Don,vmx-vnmi-pending=3Don,vmx-movdr-exit=3Don,vmx-io-exit=3Don,vmx-io-b=
itmap=3Don,vmx-mtf=3Don,vmx-msr-bitmap=3Don,vmx-monitor-exit=3Don,vmx-pause=
-exit=3Don,vmx-secondary-ctls=3Don,vmx-exit-nosave-debugctl=3Don,vmx-exit-a=
ck-intr=3Don,vmx-exit-save-pat=3Don,vmx-exit-load-pat=3Don,vmx-exit-save-ef=
er=3Don,vmx-exit-load-efer=3Don,vmx-exit-save-preemption-timer=3Don,vmx-ent=
ry-noload-debugctl=3Don,vmx-entry-ia32e-mode=3Don,vmx-entry-load-pat=3Don,v=
mx-entry-load-efer=3Don,vmx-eptp-switching=3Don \
+-cpu Skylake-Client-IBRS,vmx=3Don,hypervisor=3Don,ss=3Don,tsc-adjust=3Don,=
clflushopt=3Don,umip=3Don,md-clear=3Don,stibp=3Don,arch-capabilities=3Don,s=
sbd=3Don,xsaves=3Don,pdpe1gb=3Don,skip-l1dfl-vmentry=3Don,pschange-mc-no=3D=
on,vmx-ins-outs=3Don,vmx-true-ctls=3Don,vmx-store-lma=3Don,vmx-activity-hlt=
=3Don,vmx-vmwrite-vmexit-fields=3Don,vmx-apicv-xapic=3Don,vmx-ept=3Don,vmx-=
desc-exit=3Don,vmx-rdtscp-exit=3Don,vmx-apicv-x2apic=3Don,vmx-vpid=3Don,vmx=
-wbinvd-exit=3Don,vmx-unrestricted-guest=3Don,vmx-rdrand-exit=3Don,vmx-invp=
cid-exit=3Don,vmx-vmfunc=3Don,vmx-shadow-vmcs=3Don,vmx-rdseed-exit=3Don,vmx=
-pml=3Don,vmx-xsaves=3Don,vmx-ept-execonly=3Don,vmx-page-walk-4=3Don,vmx-ep=
t-2mb=3Don,vmx-ept-1gb=3Don,vmx-invept=3Don,vmx-eptad=3Don,vmx-invept-singl=
e-context=3Don,vmx-invept-all-context=3Don,vmx-invvpid=3Don,vmx-invvpid-sin=
gle-addr=3Don,vmx-invvpid-all-context=3Don,vmx-intr-exit=3Don,vmx-nmi-exit=
=3Don,vmx-vnmi=3Don,vmx-preemption-timer=3Don,vmx-vintr-pending=3Don,vmx-ts=
c-offset=3Don,vmx-hlt-exit=3Don,vmx-invlpg-exit=3Don,vmx-mwait-exit=3Don,vm=
x-rdpmc-exit=3Don,vmx-rdtsc-exit=3Don,vmx-cr3-load-noexit=3Don,vmx-cr3-stor=
e-noexit=3Don,vmx-cr8-load-exit=3Don,vmx-cr8-store-exit=3Don,vmx-flexpriori=
ty=3Don,vmx-vnmi-pending=3Don,vmx-movdr-exit=3Don,vmx-io-exit=3Don,vmx-io-b=
itmap=3Don,vmx-mtf=3Don,vmx-msr-bitmap=3Don,vmx-monitor-exit=3Don,vmx-pause=
-exit=3Don,vmx-secondary-ctls=3Don,vmx-exit-nosave-debugctl=3Don,vmx-exit-a=
ck-intr=3Don,vmx-exit-save-pat=3Don,vmx-exit-load-pat=3Don,vmx-exit-save-ef=
er=3Don,vmx-exit-load-efer=3Don,vmx-exit-save-preemption-timer=3Don,vmx-ent=
ry-noload-debugctl=3Don,vmx-entry-ia32e-mode=3Don,vmx-entry-load-pat=3Don,v=
mx-entry-load-efer=3Don,vmx-eptp-switching=3Don \
 -m size=3D219136k \
 -overcommit mem-lock=3Doff \
 -smp 1,sockets=3D1,cores=3D1,threads=3D1 \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-4.2=
.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-4.2.0.=
args
index f5f0e818af..52d2ac7b33 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-4.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-4.2.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
 -machine pc-i440fx-4.2,usb=3Doff,dump-guest-core=3Doff \
 -accel kvm \
--cpu Skylake-Client-IBRS,ss=3Don,vmx=3Don,hypervisor=3Don,tsc-adjust=3Don,=
clflushopt=3Don,umip=3Don,md-clear=3Don,stibp=3Don,arch-capabilities=3Don,s=
sbd=3Don,xsaves=3Don,pdpe1gb=3Don,skip-l1dfl-vmentry=3Don,pschange-mc-no=3D=
on,vmx-ins-outs=3Don,vmx-true-ctls=3Don,vmx-store-lma=3Don,vmx-activity-hlt=
=3Don,vmx-vmwrite-vmexit-fields=3Don,vmx-apicv-xapic=3Don,vmx-ept=3Don,vmx-=
desc-exit=3Don,vmx-rdtscp-exit=3Don,vmx-apicv-x2apic=3Don,vmx-vpid=3Don,vmx=
-wbinvd-exit=3Don,vmx-unrestricted-guest=3Don,vmx-rdrand-exit=3Don,vmx-invp=
cid-exit=3Don,vmx-vmfunc=3Don,vmx-shadow-vmcs=3Don,vmx-rdseed-exit=3Don,vmx=
-pml=3Don,vmx-xsaves=3Don,vmx-invvpid=3Don,vmx-invvpid-single-addr=3Don,vmx=
-invvpid-all-context=3Don,vmx-ept-execonly=3Don,vmx-page-walk-4=3Don,vmx-ep=
t-2mb=3Don,vmx-ept-1gb=3Don,vmx-invept=3Don,vmx-eptad=3Don,vmx-invept-singl=
e-context=3Don,vmx-invept-all-context=3Don,vmx-intr-exit=3Don,vmx-nmi-exit=
=3Don,vmx-vnmi=3Don,vmx-preemption-timer=3Don,vmx-vintr-pending=3Don,vmx-ts=
c-offset=3Don,vmx-hlt-exit=3Don,vmx-invlpg-exit=3Don,vmx-mwait-exit=3Don,vm=
x-rdpmc-exit=3Don,vmx-rdtsc-exit=3Don,vmx-cr3-load-noexit=3Don,vmx-cr3-stor=
e-noexit=3Don,vmx-cr8-load-exit=3Don,vmx-cr8-store-exit=3Don,vmx-flexpriori=
ty=3Don,vmx-vnmi-pending=3Don,vmx-movdr-exit=3Don,vmx-io-exit=3Don,vmx-io-b=
itmap=3Don,vmx-mtf=3Don,vmx-msr-bitmap=3Don,vmx-monitor-exit=3Don,vmx-pause=
-exit=3Don,vmx-secondary-ctls=3Don,vmx-exit-nosave-debugctl=3Don,vmx-exit-a=
ck-intr=3Don,vmx-exit-save-pat=3Don,vmx-exit-load-pat=3Don,vmx-exit-save-ef=
er=3Don,vmx-exit-load-efer=3Don,vmx-exit-save-preemption-timer=3Don,vmx-ent=
ry-noload-debugctl=3Don,vmx-entry-ia32e-mode=3Don,vmx-entry-load-pat=3Don,v=
mx-entry-load-efer=3Don,vmx-eptp-switching=3Don \
+-cpu Skylake-Client-IBRS,vmx=3Don,hypervisor=3Don,ss=3Don,tsc-adjust=3Don,=
clflushopt=3Don,umip=3Don,md-clear=3Don,stibp=3Don,arch-capabilities=3Don,s=
sbd=3Don,xsaves=3Don,pdpe1gb=3Don,skip-l1dfl-vmentry=3Don,pschange-mc-no=3D=
on,vmx-ins-outs=3Don,vmx-true-ctls=3Don,vmx-store-lma=3Don,vmx-activity-hlt=
=3Don,vmx-vmwrite-vmexit-fields=3Don,vmx-apicv-xapic=3Don,vmx-ept=3Don,vmx-=
desc-exit=3Don,vmx-rdtscp-exit=3Don,vmx-apicv-x2apic=3Don,vmx-vpid=3Don,vmx=
-wbinvd-exit=3Don,vmx-unrestricted-guest=3Don,vmx-rdrand-exit=3Don,vmx-invp=
cid-exit=3Don,vmx-vmfunc=3Don,vmx-shadow-vmcs=3Don,vmx-rdseed-exit=3Don,vmx=
-pml=3Don,vmx-xsaves=3Don,vmx-ept-execonly=3Don,vmx-page-walk-4=3Don,vmx-ep=
t-2mb=3Don,vmx-ept-1gb=3Don,vmx-invept=3Don,vmx-eptad=3Don,vmx-invept-singl=
e-context=3Don,vmx-invept-all-context=3Don,vmx-invvpid=3Don,vmx-invvpid-sin=
gle-addr=3Don,vmx-invvpid-all-context=3Don,vmx-intr-exit=3Don,vmx-nmi-exit=
=3Don,vmx-vnmi=3Don,vmx-preemption-timer=3Don,vmx-vintr-pending=3Don,vmx-ts=
c-offset=3Don,vmx-hlt-exit=3Don,vmx-invlpg-exit=3Don,vmx-mwait-exit=3Don,vm=
x-rdpmc-exit=3Don,vmx-rdtsc-exit=3Don,vmx-cr3-load-noexit=3Don,vmx-cr3-stor=
e-noexit=3Don,vmx-cr8-load-exit=3Don,vmx-cr8-store-exit=3Don,vmx-flexpriori=
ty=3Don,vmx-vnmi-pending=3Don,vmx-movdr-exit=3Don,vmx-io-exit=3Don,vmx-io-b=
itmap=3Don,vmx-mtf=3Don,vmx-msr-bitmap=3Don,vmx-monitor-exit=3Don,vmx-pause=
-exit=3Don,vmx-secondary-ctls=3Don,vmx-exit-nosave-debugctl=3Don,vmx-exit-a=
ck-intr=3Don,vmx-exit-save-pat=3Don,vmx-exit-load-pat=3Don,vmx-exit-save-ef=
er=3Don,vmx-exit-load-efer=3Don,vmx-exit-save-preemption-timer=3Don,vmx-ent=
ry-noload-debugctl=3Don,vmx-entry-ia32e-mode=3Don,vmx-entry-load-pat=3Don,v=
mx-entry-load-efer=3Don,vmx-eptp-switching=3Don \
 -m size=3D219136k \
 -overcommit mem-lock=3Doff \
 -smp 6,sockets=3D6,cores=3D1,threads=3D1 \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-5.0=
.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-5.0.0.=
args
index 699f48fbaa..ca8bff1080 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-5.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86_64-5.0.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
 -machine pc-i440fx-5.0,usb=3Doff,dump-guest-core=3Doff \
 -accel kvm \
--cpu Skylake-Client-IBRS,ss=3Don,vmx=3Don,hypervisor=3Don,tsc-adjust=3Don,=
clflushopt=3Don,umip=3Don,md-clear=3Don,stibp=3Don,arch-capabilities=3Don,s=
sbd=3Don,xsaves=3Don,pdpe1gb=3Don,skip-l1dfl-vmentry=3Don,pschange-mc-no=3D=
on,vmx-ins-outs=3Don,vmx-true-ctls=3Don,vmx-store-lma=3Don,vmx-activity-hlt=
=3Don,vmx-vmwrite-vmexit-fields=3Don,vmx-apicv-xapic=3Don,vmx-ept=3Don,vmx-=
desc-exit=3Don,vmx-rdtscp-exit=3Don,vmx-apicv-x2apic=3Don,vmx-vpid=3Don,vmx=
-wbinvd-exit=3Don,vmx-unrestricted-guest=3Don,vmx-rdrand-exit=3Don,vmx-invp=
cid-exit=3Don,vmx-vmfunc=3Don,vmx-shadow-vmcs=3Don,vmx-rdseed-exit=3Don,vmx=
-pml=3Don,vmx-xsaves=3Don,vmx-invvpid=3Don,vmx-invvpid-single-addr=3Don,vmx=
-invvpid-all-context=3Don,vmx-ept-execonly=3Don,vmx-page-walk-4=3Don,vmx-ep=
t-2mb=3Don,vmx-ept-1gb=3Don,vmx-invept=3Don,vmx-eptad=3Don,vmx-invept-singl=
e-context=3Don,vmx-invept-all-context=3Don,vmx-intr-exit=3Don,vmx-nmi-exit=
=3Don,vmx-vnmi=3Don,vmx-preemption-timer=3Don,vmx-vintr-pending=3Don,vmx-ts=
c-offset=3Don,vmx-hlt-exit=3Don,vmx-invlpg-exit=3Don,vmx-mwait-exit=3Don,vm=
x-rdpmc-exit=3Don,vmx-rdtsc-exit=3Don,vmx-cr3-load-noexit=3Don,vmx-cr3-stor=
e-noexit=3Don,vmx-cr8-load-exit=3Don,vmx-cr8-store-exit=3Don,vmx-flexpriori=
ty=3Don,vmx-vnmi-pending=3Don,vmx-movdr-exit=3Don,vmx-io-exit=3Don,vmx-io-b=
itmap=3Don,vmx-mtf=3Don,vmx-msr-bitmap=3Don,vmx-monitor-exit=3Don,vmx-pause=
-exit=3Don,vmx-secondary-ctls=3Don,vmx-exit-nosave-debugctl=3Don,vmx-exit-a=
ck-intr=3Don,vmx-exit-save-pat=3Don,vmx-exit-load-pat=3Don,vmx-exit-save-ef=
er=3Don,vmx-exit-load-efer=3Don,vmx-exit-save-preemption-timer=3Don,vmx-ent=
ry-noload-debugctl=3Don,vmx-entry-ia32e-mode=3Don,vmx-entry-load-pat=3Don,v=
mx-entry-load-efer=3Don,vmx-eptp-switching=3Don \
+-cpu Skylake-Client-IBRS,vmx=3Don,hypervisor=3Don,ss=3Don,tsc-adjust=3Don,=
clflushopt=3Don,umip=3Don,md-clear=3Don,stibp=3Don,arch-capabilities=3Don,s=
sbd=3Don,xsaves=3Don,pdpe1gb=3Don,skip-l1dfl-vmentry=3Don,pschange-mc-no=3D=
on,vmx-ins-outs=3Don,vmx-true-ctls=3Don,vmx-store-lma=3Don,vmx-activity-hlt=
=3Don,vmx-vmwrite-vmexit-fields=3Don,vmx-apicv-xapic=3Don,vmx-ept=3Don,vmx-=
desc-exit=3Don,vmx-rdtscp-exit=3Don,vmx-apicv-x2apic=3Don,vmx-vpid=3Don,vmx=
-wbinvd-exit=3Don,vmx-unrestricted-guest=3Don,vmx-rdrand-exit=3Don,vmx-invp=
cid-exit=3Don,vmx-vmfunc=3Don,vmx-shadow-vmcs=3Don,vmx-rdseed-exit=3Don,vmx=
-pml=3Don,vmx-xsaves=3Don,vmx-ept-execonly=3Don,vmx-page-walk-4=3Don,vmx-ep=
t-2mb=3Don,vmx-ept-1gb=3Don,vmx-invept=3Don,vmx-eptad=3Don,vmx-invept-singl=
e-context=3Don,vmx-invept-all-context=3Don,vmx-invvpid=3Don,vmx-invvpid-sin=
gle-addr=3Don,vmx-invvpid-all-context=3Don,vmx-intr-exit=3Don,vmx-nmi-exit=
=3Don,vmx-vnmi=3Don,vmx-preemption-timer=3Don,vmx-vintr-pending=3Don,vmx-ts=
c-offset=3Don,vmx-hlt-exit=3Don,vmx-invlpg-exit=3Don,vmx-mwait-exit=3Don,vm=
x-rdpmc-exit=3Don,vmx-rdtsc-exit=3Don,vmx-cr3-load-noexit=3Don,vmx-cr3-stor=
e-noexit=3Don,vmx-cr8-load-exit=3Don,vmx-cr8-store-exit=3Don,vmx-flexpriori=
ty=3Don,vmx-vnmi-pending=3Don,vmx-movdr-exit=3Don,vmx-io-exit=3Don,vmx-io-b=
itmap=3Don,vmx-mtf=3Don,vmx-msr-bitmap=3Don,vmx-monitor-exit=3Don,vmx-pause=
-exit=3Don,vmx-secondary-ctls=3Don,vmx-exit-nosave-debugctl=3Don,vmx-exit-a=
ck-intr=3Don,vmx-exit-save-pat=3Don,vmx-exit-load-pat=3Don,vmx-exit-save-ef=
er=3Don,vmx-exit-load-efer=3Don,vmx-exit-save-preemption-timer=3Don,vmx-ent=
ry-noload-debugctl=3Don,vmx-entry-ia32e-mode=3Don,vmx-entry-load-pat=3Don,v=
mx-entry-load-efer=3Don,vmx-eptp-switching=3Don \
 -m size=3D219136k \
 -overcommit mem-lock=3Doff \
 -smp 6,sockets=3D6,cores=3D1,threads=3D1 \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-4.2=
.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-4.2.0.=
args
index cf7ad7b5f4..e4c805bf4e 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-4.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-4.2.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
 -machine pc-i440fx-4.2,usb=3Doff,dump-guest-core=3Doff \
 -accel tcg \
--cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s=
se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso=
r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=3Don,3dnowext=3Don,3=
dnow=3Don,cr8legacy=3Don,npt=3Don,misalignsse=3Doff \
+-cpu Opteron_G3,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,sse4.1=3Don,sse4.2=
=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hypervisor=3Don,acpi=3Don,=
ss=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,xsaveopt=3Don,xgetbv1=3Don,cr8legacy=3Don,mmxext=3Don,pdpe1gb=3Don,=
3dnowext=3Don,3dnow=3Don,npt=3Don,misalignsse=3Doff \
 -m size=3D219136k \
 -overcommit mem-lock=3Doff \
 -smp 6,sockets=3D6,cores=3D1,threads=3D1 \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.0=
.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.0.0.=
args
index 257b271386..b90e177dce 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.0.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
 -machine pc-i440fx-5.0,usb=3Doff,dump-guest-core=3Doff \
 -accel tcg \
--cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s=
se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso=
r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=3Don,3dnowext=3Don,3=
dnow=3Don,cr8legacy=3Don,npt=3Don,misalignsse=3Doff \
+-cpu Opteron_G3,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,sse4.1=3Don,sse4.2=
=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hypervisor=3Don,acpi=3Don,=
ss=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,xsaveopt=3Don,xgetbv1=3Don,cr8legacy=3Don,mmxext=3Don,pdpe1gb=3Don,=
3dnowext=3Don,3dnow=3Don,npt=3Don,misalignsse=3Doff \
 -m size=3D219136k \
 -overcommit mem-lock=3Doff \
 -smp 6,sockets=3D6,cores=3D1,threads=3D1 \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.1=
.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.1.0.=
args
index 71551b51a3..837fb78129 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.1.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
 -machine pc-i440fx-5.1,usb=3Doff,dump-guest-core=3Doff \
 -accel tcg \
--cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s=
se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso=
r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=3Don,3dnowext=3Don,3=
dnow=3Don,cr8legacy=3Don,npt=3Don,misalignsse=3Doff \
+-cpu Opteron_G3,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,sse4.1=3Don,sse4.2=
=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hypervisor=3Don,acpi=3Don,=
ss=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,xsaveopt=3Don,xgetbv1=3Don,cr8legacy=3Don,mmxext=3Don,pdpe1gb=3Don,=
3dnowext=3Don,3dnow=3Don,npt=3Don,misalignsse=3Doff \
 -m size=3D219136k \
 -overcommit mem-lock=3Doff \
 -smp 6,sockets=3D6,cores=3D1,threads=3D1 \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.2=
.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.2.0.=
args
index 834d92c35a..5f356d87d4 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-5.2.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
 -machine pc-i440fx-5.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc=
.ram \
 -accel tcg \
--cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s=
se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso=
r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=3Don,3dnowext=3Don,3=
dnow=3Don,cr8legacy=3Don,npt=3Don,misalignsse=3Doff \
+-cpu Opteron_G3,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,sse4.1=3Don,sse4.2=
=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hypervisor=3Don,acpi=3Don,=
ss=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,xsaveopt=3Don,xgetbv1=3Don,cr8legacy=3Don,mmxext=3Don,pdpe1gb=3Don,=
3dnowext=3Don,3dnow=3Don,npt=3Don,misalignsse=3Doff \
 -m size=3D219136k \
 -object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \
 -overcommit mem-lock=3Doff \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-6.0=
.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-6.0.0.=
args
index 611bf05482..c929861cfa 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-6.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-6.0.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va=
r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-i440fx-6.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc=
.ram \
 -accel tcg \
--cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s=
se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso=
r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,pks=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=3Don,3dnowe=
xt=3Don,3dnow=3Don,cr8legacy=3Don,npt=3Don,misalignsse=3Doff \
+-cpu Opteron_G3,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,sse4.1=3Don,sse4.2=
=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hypervisor=3Don,acpi=3Don,=
ss=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,pks=3Don,xsaveopt=3Don,xgetbv1=3Don,cr8legacy=3Don,mmxext=3Don,pdpe=
1gb=3Don,3dnowext=3Don,3dnow=3Don,npt=3Don,misalignsse=3Doff \
 -m size=3D219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'=
 \
 -overcommit mem-lock=3Doff \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-6.1=
.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-6.1.0.=
args
index 79ae00e993..c19affe3c6 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-6.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-6.1.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va=
r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-i440fx-6.1,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc=
.ram \
 -accel tcg \
--cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s=
se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso=
r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,pks=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=3Don,3dnowe=
xt=3Don,3dnow=3Don,cr8legacy=3Don,npt=3Don,misalignsse=3Doff \
+-cpu Opteron_G3,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,sse4.1=3Don,sse4.2=
=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hypervisor=3Don,acpi=3Don,=
ss=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,pks=3Don,xsaveopt=3Don,xgetbv1=3Don,cr8legacy=3Don,mmxext=3Don,pdpe=
1gb=3Don,3dnowext=3Don,3dnow=3Don,npt=3Don,misalignsse=3Doff \
 -m size=3D219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'=
 \
 -overcommit mem-lock=3Doff \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-6.2=
.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-6.2.0.=
args
index 9c8331629a..09d287f68a 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-6.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-6.2.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va=
r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-i440fx-6.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc=
.ram \
 -accel tcg \
--cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s=
se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso=
r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,pks=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=3Don,3dnowe=
xt=3Don,3dnow=3Don,cr8legacy=3Don,npt=3Don,vgif=3Don,svme-addr-chk=3Don,mis=
alignsse=3Doff \
+-cpu Opteron_G3,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,sse4.1=3Don,sse4.2=
=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hypervisor=3Don,acpi=3Don,=
ss=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,pks=3Don,xsaveopt=3Don,xgetbv1=3Don,cr8legacy=3Don,mmxext=3Don,pdpe=
1gb=3Don,3dnowext=3Don,3dnow=3Don,npt=3Don,vgif=3Don,svme-addr-chk=3Don,mis=
alignsse=3Doff \
 -m size=3D219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'=
 \
 -overcommit mem-lock=3Doff \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.0=
.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.0.0.=
args
index 5929c9a87b..771ef9e453 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.0.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va=
r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-i440fx-7.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc=
.ram \
 -accel tcg \
--cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s=
se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso=
r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,umip=3Don,p=
ku=3Don,la57=3Don,pks=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=
=3Don,3dnowext=3Don,3dnow=3Don,cr8legacy=3Don,npt=3Don,vgif=3Don,svme-addr-=
chk=3Don,misalignsse=3Doff \
+-cpu Opteron_G3,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,sse4.1=3Don,sse4.2=
=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hypervisor=3Don,acpi=3Don,=
ss=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,umip=3Don,p=
ku=3Don,la57=3Don,pks=3Don,xsaveopt=3Don,xgetbv1=3Don,cr8legacy=3Don,mmxext=
=3Don,pdpe1gb=3Don,3dnowext=3Don,3dnow=3Don,npt=3Don,vgif=3Don,svme-addr-ch=
k=3Don,misalignsse=3Doff \
 -m size=3D219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'=
 \
 -overcommit mem-lock=3Doff \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.1=
.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.1.0.=
args
index 141c2e36eb..40cc53482e 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.1.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va=
r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-i440fx-7.1,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc=
.ram \
 -accel tcg \
--cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s=
se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso=
r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,umip=3Don,p=
ku=3Don,la57=3Don,pks=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=
=3Don,3dnowext=3Don,3dnow=3Don,cr8legacy=3Don,npt=3Don,vgif=3Don,svme-addr-=
chk=3Don,misalignsse=3Doff \
+-cpu Opteron_G3,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,sse4.1=3Don,sse4.2=
=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hypervisor=3Don,acpi=3Don,=
ss=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,umip=3Don,p=
ku=3Don,la57=3Don,pks=3Don,xsaveopt=3Don,xgetbv1=3Don,cr8legacy=3Don,mmxext=
=3Don,pdpe1gb=3Don,3dnowext=3Don,3dnow=3Don,npt=3Don,vgif=3Don,svme-addr-ch=
k=3Don,misalignsse=3Doff \
 -m size=3D219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'=
 \
 -overcommit mem-lock=3Doff \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.2=
.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.2.0.=
args
index 1e7f444d73..20b3865d00 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-7.2.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va=
r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-i440fx-7.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc=
.ram \
 -accel tcg \
--cpu EPYC,acpi=3Don,ss=3Don,monitor=3Don,hypervisor=3Don,erms=3Don,mpx=3Do=
n,pcommit=3Don,clwb=3Don,umip=3Don,pku=3Don,vaes=3Don,la57=3Don,pks=3Don,3d=
nowext=3Don,3dnow=3Don,npt=3Don,vgif=3Don,svme-addr-chk=3Don,vme=3Doff,rdse=
ed=3Doff,sha-ni=3Doff,xsavec=3Doff,fxsr-opt=3Doff,misalignsse=3Doff,3dnowpr=
efetch=3Doff,osvw=3Doff,topoext=3Doff,nrip-save=3Doff \
+-cpu EPYC,monitor=3Don,hypervisor=3Don,acpi=3Don,ss=3Don,erms=3Don,mpx=3Do=
n,pcommit=3Don,clwb=3Don,umip=3Don,pku=3Don,vaes=3Don,la57=3Don,pks=3Don,3d=
nowext=3Don,3dnow=3Don,npt=3Don,vgif=3Don,svme-addr-chk=3Don,vme=3Doff,rdse=
ed=3Doff,sha-ni=3Doff,xsavec=3Doff,misalignsse=3Doff,3dnowprefetch=3Doff,os=
vw=3Doff,topoext=3Doff,fxsr-opt=3Doff,nrip-save=3Doff \
 -m size=3D219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'=
 \
 -overcommit mem-lock=3Doff \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.0=
.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.0.0.=
args
index 943b0d477b..7e1a3a8be8 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.0.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va=
r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-i440fx-8.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc=
.ram,acpi=3Doff \
 -accel tcg \
--cpu EPYC,acpi=3Don,ss=3Don,monitor=3Don,hypervisor=3Don,erms=3Don,mpx=3Do=
n,pcommit=3Don,clwb=3Don,umip=3Don,pku=3Don,vaes=3Don,la57=3Don,pks=3Don,fs=
rm=3Don,fzrm=3Don,fsrs=3Don,fsrc=3Don,3dnowext=3Don,3dnow=3Don,npt=3Don,vgi=
f=3Don,svme-addr-chk=3Don,vme=3Doff,rdseed=3Doff,sha-ni=3Doff,xsavec=3Doff,=
fxsr-opt=3Doff,misalignsse=3Doff,3dnowprefetch=3Doff,osvw=3Doff,topoext=3Do=
ff,nrip-save=3Doff \
+-cpu EPYC,monitor=3Don,hypervisor=3Don,acpi=3Don,ss=3Don,erms=3Don,mpx=3Do=
n,pcommit=3Don,clwb=3Don,umip=3Don,pku=3Don,vaes=3Don,la57=3Don,pks=3Don,fs=
rm=3Don,fzrm=3Don,fsrs=3Don,fsrc=3Don,3dnowext=3Don,3dnow=3Don,npt=3Don,vgi=
f=3Don,svme-addr-chk=3Don,vme=3Doff,rdseed=3Doff,sha-ni=3Doff,xsavec=3Doff,=
misalignsse=3Doff,3dnowprefetch=3Doff,osvw=3Doff,topoext=3Doff,fxsr-opt=3Do=
ff,nrip-save=3Doff \
 -m size=3D219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'=
 \
 -overcommit mem-lock=3Doff \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.1=
.0.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.1.0.=
args
index 177f7da2b5..2c81adbb23 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-8.1.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va=
r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-i440fx-8.1,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc=
.ram,acpi=3Doff \
 -accel tcg \
--cpu EPYC,acpi=3Don,ss=3Don,monitor=3Don,hypervisor=3Don,erms=3Don,mpx=3Do=
n,pcommit=3Don,clwb=3Don,umip=3Don,pku=3Don,vaes=3Don,la57=3Don,rdpid=3Don,=
pks=3Don,fsrm=3Don,fzrm=3Don,fsrs=3Don,fsrc=3Don,3dnowext=3Don,3dnow=3Don,x=
saveerptr=3Don,wbnoinvd=3Don,npt=3Don,vgif=3Don,svme-addr-chk=3Don,vme=3Dof=
f,sha-ni=3Doff,xsavec=3Doff,fxsr-opt=3Doff,misalignsse=3Doff,osvw=3Doff,top=
oext=3Doff,nrip-save=3Doff \
+-cpu EPYC,monitor=3Don,hypervisor=3Don,acpi=3Don,ss=3Don,erms=3Don,mpx=3Do=
n,pcommit=3Don,clwb=3Don,umip=3Don,pku=3Don,vaes=3Don,la57=3Don,rdpid=3Don,=
pks=3Don,fsrm=3Don,fzrm=3Don,fsrs=3Don,fsrc=3Don,3dnowext=3Don,3dnow=3Don,x=
saveerptr=3Don,wbnoinvd=3Don,npt=3Don,vgif=3Don,svme-addr-chk=3Don,vme=3Dof=
f,sha-ni=3Doff,xsavec=3Doff,misalignsse=3Doff,osvw=3Doff,topoext=3Doff,fxsr=
-opt=3Doff,nrip-save=3Doff \
 -m size=3D219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'=
 \
 -overcommit mem-lock=3Doff \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-lat=
est.args b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-lates=
t.args
index e0b49dc318..85117194f4 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86_64-latest.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va=
r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi=
=3Doff \
 -accel tcg \
--cpu EPYC,acpi=3Don,ss=3Don,monitor=3Don,hypervisor=3Don,erms=3Don,mpx=3Do=
n,pcommit=3Don,clwb=3Don,umip=3Don,pku=3Don,vaes=3Don,la57=3Don,rdpid=3Don,=
pks=3Don,fsrm=3Don,cmpccxadd=3Don,fzrm=3Don,fsrs=3Don,fsrc=3Don,3dnowext=3D=
on,3dnow=3Don,xsaveerptr=3Don,wbnoinvd=3Don,npt=3Don,vgif=3Don,svme-addr-ch=
k=3Don,vme=3Doff,xsavec=3Doff,fxsr-opt=3Doff,misalignsse=3Doff,osvw=3Doff,t=
opoext=3Doff,nrip-save=3Doff \
+-cpu EPYC,monitor=3Don,hypervisor=3Don,acpi=3Don,ss=3Don,erms=3Don,mpx=3Do=
n,pcommit=3Don,clwb=3Don,umip=3Don,pku=3Don,vaes=3Don,la57=3Don,rdpid=3Don,=
pks=3Don,fsrm=3Don,cmpccxadd=3Don,fzrm=3Don,fsrs=3Don,fsrc=3Don,3dnowext=3D=
on,3dnow=3Don,xsaveerptr=3Don,wbnoinvd=3Don,npt=3Don,vgif=3Don,svme-addr-ch=
k=3Don,vme=3Doff,xsavec=3Doff,misalignsse=3Doff,osvw=3Doff,topoext=3Doff,fx=
sr-opt=3Doff,nrip-save=3Doff \
 -m size=3D219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'=
 \
 -overcommit mem-lock=3Doff \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-4.2.0.args b/t=
ests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-4.2.0.args
index e419c1734d..425a0d3a7c 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-4.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-4.2.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
 -machine pc-q35-4.2,usb=3Doff,dump-guest-core=3Doff \
 -accel tcg \
--cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s=
se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso=
r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=3Don,3dnowext=3Don,3=
dnow=3Don,cr8legacy=3Don,npt=3Don,misalignsse=3Doff \
+-cpu Opteron_G3,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,sse4.1=3Don,sse4.2=
=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hypervisor=3Don,acpi=3Don,=
ss=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,xsaveopt=3Don,xgetbv1=3Don,cr8legacy=3Don,mmxext=3Don,pdpe1gb=3Don,=
3dnowext=3Don,3dnow=3Don,npt=3Don,misalignsse=3Doff \
 -m size=3D219136k \
 -overcommit mem-lock=3Doff \
 -smp 1,sockets=3D1,cores=3D1,threads=3D1 \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.0.0.args b/t=
ests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.0.0.args
index a7fd187f12..4e1912f76e 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.0.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
 -machine pc-q35-5.0,usb=3Doff,dump-guest-core=3Doff \
 -accel tcg \
--cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s=
se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso=
r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=3Don,3dnowext=3Don,3=
dnow=3Don,cr8legacy=3Don,npt=3Don,misalignsse=3Doff \
+-cpu Opteron_G3,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,sse4.1=3Don,sse4.2=
=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hypervisor=3Don,acpi=3Don,=
ss=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,xsaveopt=3Don,xgetbv1=3Don,cr8legacy=3Don,mmxext=3Don,pdpe1gb=3Don,=
3dnowext=3Don,3dnow=3Don,npt=3Don,misalignsse=3Doff \
 -m size=3D219136k \
 -overcommit mem-lock=3Doff \
 -smp 1,sockets=3D1,cores=3D1,threads=3D1 \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.1.0.args b/t=
ests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.1.0.args
index 71b61fbbc5..35c764045e 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.1.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
 -machine pc-q35-5.1,usb=3Doff,dump-guest-core=3Doff \
 -accel tcg \
--cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s=
se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso=
r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=3Don,3dnowext=3Don,3=
dnow=3Don,cr8legacy=3Don,npt=3Don,misalignsse=3Doff \
+-cpu Opteron_G3,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,sse4.1=3Don,sse4.2=
=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hypervisor=3Don,acpi=3Don,=
ss=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,xsaveopt=3Don,xgetbv1=3Don,cr8legacy=3Don,mmxext=3Don,pdpe1gb=3Don,=
3dnowext=3Don,3dnow=3Don,npt=3Don,misalignsse=3Doff \
 -m size=3D219136k \
 -overcommit mem-lock=3Doff \
 -smp 1,sockets=3D1,cores=3D1,threads=3D1 \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.2.0.args b/t=
ests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.2.0.args
index e48bcd61e3..1f976ddeda 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-5.2.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
 -machine pc-q35-5.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra=
m \
 -accel tcg \
--cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s=
se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso=
r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=3Don,3dnowext=3Don,3=
dnow=3Don,cr8legacy=3Don,npt=3Don,misalignsse=3Doff \
+-cpu Opteron_G3,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,sse4.1=3Don,sse4.2=
=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hypervisor=3Don,acpi=3Don,=
ss=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,xsaveopt=3Don,xgetbv1=3Don,cr8legacy=3Don,mmxext=3Don,pdpe1gb=3Don,=
3dnowext=3Don,3dnow=3Don,npt=3Don,misalignsse=3Doff \
 -m size=3D219136k \
 -object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \
 -overcommit mem-lock=3Doff \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-6.0.0.args b/t=
ests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-6.0.0.args
index b3deb63cf0..bdc3d5f20d 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-6.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-6.0.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va=
r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-q35-6.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra=
m \
 -accel tcg \
--cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s=
se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso=
r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,pks=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=3Don,3dnowe=
xt=3Don,3dnow=3Don,cr8legacy=3Don,npt=3Don,misalignsse=3Doff \
+-cpu Opteron_G3,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,sse4.1=3Don,sse4.2=
=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hypervisor=3Don,acpi=3Don,=
ss=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,pks=3Don,xsaveopt=3Don,xgetbv1=3Don,cr8legacy=3Don,mmxext=3Don,pdpe=
1gb=3Don,3dnowext=3Don,3dnow=3Don,npt=3Don,misalignsse=3Doff \
 -m size=3D219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'=
 \
 -overcommit mem-lock=3Doff \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-6.1.0.args b/t=
ests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-6.1.0.args
index 5835958a55..057a8aabe6 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-6.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-6.1.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va=
r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-q35-6.1,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra=
m \
 -accel tcg \
--cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s=
se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso=
r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,pks=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=3Don,3dnowe=
xt=3Don,3dnow=3Don,cr8legacy=3Don,npt=3Don,misalignsse=3Doff \
+-cpu Opteron_G3,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,sse4.1=3Don,sse4.2=
=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hypervisor=3Don,acpi=3Don,=
ss=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,pks=3Don,xsaveopt=3Don,xgetbv1=3Don,cr8legacy=3Don,mmxext=3Don,pdpe=
1gb=3Don,3dnowext=3Don,3dnow=3Don,npt=3Don,misalignsse=3Doff \
 -m size=3D219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'=
 \
 -overcommit mem-lock=3Doff \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-6.2.0.args b/t=
ests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-6.2.0.args
index 6b1a1a6055..262aa05e46 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-6.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-6.2.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va=
r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-q35-6.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra=
m \
 -accel tcg \
--cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s=
se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso=
r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,pks=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=3Don,3dnowe=
xt=3Don,3dnow=3Don,cr8legacy=3Don,npt=3Don,vgif=3Don,svme-addr-chk=3Don,mis=
alignsse=3Doff \
+-cpu Opteron_G3,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,sse4.1=3Don,sse4.2=
=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hypervisor=3Don,acpi=3Don,=
ss=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,pku=3Don,la=
57=3Don,pks=3Don,xsaveopt=3Don,xgetbv1=3Don,cr8legacy=3Don,mmxext=3Don,pdpe=
1gb=3Don,3dnowext=3Don,3dnow=3Don,npt=3Don,vgif=3Don,svme-addr-chk=3Don,mis=
alignsse=3Doff \
 -m size=3D219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'=
 \
 -overcommit mem-lock=3Doff \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.0.0.args b/t=
ests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.0.0.args
index b023c9e280..abba7d38ba 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.0.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va=
r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-q35-7.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra=
m \
 -accel tcg \
--cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s=
se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso=
r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,umip=3Don,p=
ku=3Don,la57=3Don,pks=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=
=3Don,3dnowext=3Don,3dnow=3Don,cr8legacy=3Don,npt=3Don,vgif=3Don,svme-addr-=
chk=3Don,misalignsse=3Doff \
+-cpu Opteron_G3,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,sse4.1=3Don,sse4.2=
=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hypervisor=3Don,acpi=3Don,=
ss=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,umip=3Don,p=
ku=3Don,la57=3Don,pks=3Don,xsaveopt=3Don,xgetbv1=3Don,cr8legacy=3Don,mmxext=
=3Don,pdpe1gb=3Don,3dnowext=3Don,3dnow=3Don,npt=3Don,vgif=3Don,svme-addr-ch=
k=3Don,misalignsse=3Doff \
 -m size=3D219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'=
 \
 -overcommit mem-lock=3Doff \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.1.0.args b/t=
ests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.1.0.args
index 4c2255868d..f698ad8f3c 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.1.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va=
r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-q35-7.1,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra=
m \
 -accel tcg \
--cpu Opteron_G3,acpi=3Don,ss=3Don,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,s=
se4.1=3Don,sse4.2=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hyperviso=
r=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,umip=3Don,p=
ku=3Don,la57=3Don,pks=3Don,xsaveopt=3Don,xgetbv1=3Don,mmxext=3Don,pdpe1gb=
=3Don,3dnowext=3Don,3dnow=3Don,cr8legacy=3Don,npt=3Don,vgif=3Don,svme-addr-=
chk=3Don,misalignsse=3Doff \
+-cpu Opteron_G3,pclmulqdq=3Don,monitor=3Don,ssse3=3Don,sse4.1=3Don,sse4.2=
=3Don,movbe=3Don,aes=3Don,xsave=3Don,rdrand=3Don,hypervisor=3Don,acpi=3Don,=
ss=3Don,arat=3Don,fsgsbase=3Don,bmi1=3Don,smep=3Don,bmi2=3Don,erms=3Don,mpx=
=3Don,adx=3Don,smap=3Don,pcommit=3Don,clflushopt=3Don,clwb=3Don,umip=3Don,p=
ku=3Don,la57=3Don,pks=3Don,xsaveopt=3Don,xgetbv1=3Don,cr8legacy=3Don,mmxext=
=3Don,pdpe1gb=3Don,3dnowext=3Don,3dnow=3Don,npt=3Don,vgif=3Don,svme-addr-ch=
k=3Don,misalignsse=3Doff \
 -m size=3D219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'=
 \
 -overcommit mem-lock=3Doff \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.2.0.args b/t=
ests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.2.0.args
index 4f411a718a..87eab5218e 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.2.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-7.2.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va=
r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-q35-7.2,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra=
m \
 -accel tcg \
--cpu EPYC,acpi=3Don,ss=3Don,monitor=3Don,hypervisor=3Don,erms=3Don,mpx=3Do=
n,pcommit=3Don,clwb=3Don,umip=3Don,pku=3Don,vaes=3Don,la57=3Don,pks=3Don,3d=
nowext=3Don,3dnow=3Don,npt=3Don,vgif=3Don,svme-addr-chk=3Don,vme=3Doff,rdse=
ed=3Doff,sha-ni=3Doff,xsavec=3Doff,fxsr-opt=3Doff,misalignsse=3Doff,3dnowpr=
efetch=3Doff,osvw=3Doff,topoext=3Doff,nrip-save=3Doff \
+-cpu EPYC,monitor=3Don,hypervisor=3Don,acpi=3Don,ss=3Don,erms=3Don,mpx=3Do=
n,pcommit=3Don,clwb=3Don,umip=3Don,pku=3Don,vaes=3Don,la57=3Don,pks=3Don,3d=
nowext=3Don,3dnow=3Don,npt=3Don,vgif=3Don,svme-addr-chk=3Don,vme=3Doff,rdse=
ed=3Doff,sha-ni=3Doff,xsavec=3Doff,misalignsse=3Doff,3dnowprefetch=3Doff,os=
vw=3Doff,topoext=3Doff,fxsr-opt=3Doff,nrip-save=3Doff \
 -m size=3D219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'=
 \
 -overcommit mem-lock=3Doff \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.0.0.args b/t=
ests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.0.0.args
index ae10640e4d..7ca5d33b42 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.0.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.0.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va=
r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-q35-8.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra=
m,acpi=3Doff \
 -accel tcg \
--cpu EPYC,acpi=3Don,ss=3Don,monitor=3Don,hypervisor=3Don,erms=3Don,mpx=3Do=
n,pcommit=3Don,clwb=3Don,umip=3Don,pku=3Don,vaes=3Don,la57=3Don,pks=3Don,fs=
rm=3Don,fzrm=3Don,fsrs=3Don,fsrc=3Don,3dnowext=3Don,3dnow=3Don,npt=3Don,vgi=
f=3Don,svme-addr-chk=3Don,vme=3Doff,rdseed=3Doff,sha-ni=3Doff,xsavec=3Doff,=
fxsr-opt=3Doff,misalignsse=3Doff,3dnowprefetch=3Doff,osvw=3Doff,topoext=3Do=
ff,nrip-save=3Doff \
+-cpu EPYC,monitor=3Don,hypervisor=3Don,acpi=3Don,ss=3Don,erms=3Don,mpx=3Do=
n,pcommit=3Don,clwb=3Don,umip=3Don,pku=3Don,vaes=3Don,la57=3Don,pks=3Don,fs=
rm=3Don,fzrm=3Don,fsrs=3Don,fsrc=3Don,3dnowext=3Don,3dnow=3Don,npt=3Don,vgi=
f=3Don,svme-addr-chk=3Don,vme=3Doff,rdseed=3Doff,sha-ni=3Doff,xsavec=3Doff,=
misalignsse=3Doff,3dnowprefetch=3Doff,osvw=3Doff,topoext=3Doff,fxsr-opt=3Do=
ff,nrip-save=3Doff \
 -m size=3D219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'=
 \
 -overcommit mem-lock=3Doff \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.1.0.args b/t=
ests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.1.0.args
index 4d132a9da0..9763f7370b 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.1.0.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.1.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va=
r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc-q35-8.1,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ra=
m,acpi=3Doff \
 -accel tcg \
--cpu EPYC,acpi=3Don,ss=3Don,monitor=3Don,hypervisor=3Don,erms=3Don,mpx=3Do=
n,pcommit=3Don,clwb=3Don,umip=3Don,pku=3Don,vaes=3Don,la57=3Don,rdpid=3Don,=
pks=3Don,fsrm=3Don,fzrm=3Don,fsrs=3Don,fsrc=3Don,3dnowext=3Don,3dnow=3Don,x=
saveerptr=3Don,wbnoinvd=3Don,npt=3Don,vgif=3Don,svme-addr-chk=3Don,vme=3Dof=
f,sha-ni=3Doff,xsavec=3Doff,fxsr-opt=3Doff,misalignsse=3Doff,osvw=3Doff,top=
oext=3Doff,nrip-save=3Doff \
+-cpu EPYC,monitor=3Don,hypervisor=3Don,acpi=3Don,ss=3Don,erms=3Don,mpx=3Do=
n,pcommit=3Don,clwb=3Don,umip=3Don,pku=3Don,vaes=3Don,la57=3Don,rdpid=3Don,=
pks=3Don,fsrm=3Don,fzrm=3Don,fsrs=3Don,fsrc=3Don,3dnowext=3Don,3dnow=3Don,x=
saveerptr=3Don,wbnoinvd=3Don,npt=3Don,vgif=3Don,svme-addr-chk=3Don,vme=3Dof=
f,sha-ni=3Doff,xsavec=3Doff,misalignsse=3Doff,osvw=3Doff,topoext=3Doff,fxsr=
-opt=3Doff,nrip-save=3Doff \
 -m size=3D219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'=
 \
 -overcommit mem-lock=3Doff \
diff --git a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-latest.args b/=
tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-latest.args
index edd492b222..69d278c72c 100644
--- a/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-latest.args
+++ b/tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-latest.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va=
r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine q35,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi=
=3Doff \
 -accel tcg \
--cpu EPYC,acpi=3Don,ss=3Don,monitor=3Don,hypervisor=3Don,erms=3Don,mpx=3Do=
n,pcommit=3Don,clwb=3Don,umip=3Don,pku=3Don,vaes=3Don,la57=3Don,rdpid=3Don,=
pks=3Don,fsrm=3Don,cmpccxadd=3Don,fzrm=3Don,fsrs=3Don,fsrc=3Don,3dnowext=3D=
on,3dnow=3Don,xsaveerptr=3Don,wbnoinvd=3Don,npt=3Don,vgif=3Don,svme-addr-ch=
k=3Don,vme=3Doff,xsavec=3Doff,fxsr-opt=3Doff,misalignsse=3Doff,osvw=3Doff,t=
opoext=3Doff,nrip-save=3Doff \
+-cpu EPYC,monitor=3Don,hypervisor=3Don,acpi=3Don,ss=3Don,erms=3Don,mpx=3Do=
n,pcommit=3Don,clwb=3Don,umip=3Don,pku=3Don,vaes=3Don,la57=3Don,rdpid=3Don,=
pks=3Don,fsrm=3Don,cmpccxadd=3Don,fzrm=3Don,fsrs=3Don,fsrc=3Don,3dnowext=3D=
on,3dnow=3Don,xsaveerptr=3Don,wbnoinvd=3Don,npt=3Don,vgif=3Don,svme-addr-ch=
k=3Don,vme=3Doff,xsavec=3Doff,misalignsse=3Doff,osvw=3Doff,topoext=3Doff,fx=
sr-opt=3Doff,nrip-save=3Doff \
 -m size=3D219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'=
 \
 -overcommit mem-lock=3Doff \
--=20
2.43.0
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org
From nobody Thu May  9 14:36:01 2024
Delivered-To: importer@patchew.org
Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied
 by domain of lists.libvirt.org) client-ip=8.43.85.245;
 envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org;
Authentication-Results: mx.zohomail.com;
	spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain
 of lists.libvirt.org)  smtp.mailfrom=devel-bounces@lists.libvirt.org;
	dmarc=fail(p=none dis=none)  header.from=redhat.com
Return-Path: <devel-bounces@lists.libvirt.org>
Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by
 mx.zohomail.com
	with SMTPS id 170713095187388.70072147338692;
 Mon, 5 Feb 2024 03:02:31 -0800 (PST)
Received: by lists.libvirt.org (Postfix, from userid 996)
	id 7A5171887; Mon,  5 Feb 2024 06:02:30 -0500 (EST)
Received: from lists.libvirt.org.85.43.8.in-addr.arpa (localhost [IPv6:::1])
	by lists.libvirt.org (Postfix) with ESMTP id D2FDA1D8B;
	Mon,  5 Feb 2024 05:45:26 -0500 (EST)
Received: by lists.libvirt.org (Postfix, from userid 996)
	id 7697D1B84; Mon,  5 Feb 2024 05:44:34 -0500 (EST)
Received: from us-smtp-delivery-124.mimecast.com
 (us-smtp-delivery-124.mimecast.com [170.10.133.124])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by lists.libvirt.org (Postfix) with ESMTPS id 855AB18C1
	for <devel@lists.libvirt.org>; Mon,  5 Feb 2024 05:44:29 -0500 (EST)
Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73])
 by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,
 cipher=TLS_AES_256_GCM_SHA384) id us-mta-146-qlksbn77NJisVxCbx9LBng-1; Mon,
 05 Feb 2024 05:44:27 -0500
Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com
 [10.11.54.4])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest
 SHA256)
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 386AA3C00098
	for <devel@lists.libvirt.org>; Mon,  5 Feb 2024 10:44:27 +0000 (UTC)
Received: from work.redhat.com (unknown [10.39.194.112])
	by smtp.corp.redhat.com (Postfix) with ESMTP id C1FE82026F95;
	Mon,  5 Feb 2024 10:44:26 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org
X-Spam-Level: 
X-Spam-Status: No,
 score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5,
	RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE
	autolearn=unavailable autolearn_force=no version=3.4.4
X-MC-Unique: qlksbn77NJisVxCbx9LBng-1
From: Tim Wiederhake <twiederh@redhat.com>
To: devel@lists.libvirt.org
Subject: [PATCH v2 2/4] cpu_map: Format register values
Date: Mon,  5 Feb 2024 11:44:22 +0100
Message-ID: <20240205104424.80104-3-twiederh@redhat.com>
In-Reply-To: <20240205104424.80104-1-twiederh@redhat.com>
References: <20240205104424.80104-1-twiederh@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Message-ID-Hash: HHZ6LRND542E42D42DLY5B4GA2QR7DWS
X-Message-ID-Hash: HHZ6LRND542E42D42DLY5B4GA2QR7DWS
X-MailFrom: twiederh@redhat.com
X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency;
 loop; banned-address; member-moderation; header-match-config-1;
 header-match-config-2; header-match-config-3;
 header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia;
 implicit-dest; max-recipients; max-size; news-moderation; no-subject;
 suspicious-header
CC: Tim Wiederhake <twiederh@redhat.com>
X-Mailman-Version: 3.2.2
Precedence: list
List-Id: Development discussions about the libvirt library & tools
 <devel.lists.libvirt.org>
Archived-At: 
 <https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/message/HHZ6LRND542E42D42DLY5B4GA2QR7DWS/>
List-Archive: 
 <https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/>
List-Help: <mailto:devel-request@lists.libvirt.org?subject=help>
List-Post: <mailto:devel@lists.libvirt.org>
List-Subscribe: <mailto:devel-join@lists.libvirt.org>
List-Unsubscribe: <mailto:devel-leave@lists.libvirt.org>
Content-Type: text/plain; charset="utf-8"; x-default="true"
Content-Transfer-Encoding: quoted-printable
X-ZM-MESSAGEID: 1707130952742100001

Use "0x%08x" as format for all values:

    sed \
        -e "s/'0x\(..\)'/'0x000000\\1'/g" \
        -e "s/'0x\(...\)'/'0x00000\\1'/g"

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
---
 src/cpu_map/x86_features.xml | 538 +++++++++++++++++------------------
 1 file changed, 269 insertions(+), 269 deletions(-)

diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
index ded81c3667..b89bd5a2fa 100644
--- a/src/cpu_map/x86_features.xml
+++ b/src/cpu_map/x86_features.xml
@@ -8,516 +8,516 @@
   <!-- standard features, ECX -->
   <feature name=3D'pni'>
     <alias name=3D'sse3' source=3D'qemu'/>
-    <cpuid eax_in=3D'0x01' ecx=3D'0x00000001'/>
+    <cpuid eax_in=3D'0x00000001' ecx=3D'0x00000001'/>
   </feature>
   <feature name=3D'pclmuldq'>
     <alias name=3D'pclmulqdq' source=3D'qemu'/>
-    <cpuid eax_in=3D'0x01' ecx=3D'0x00000002'/>
+    <cpuid eax_in=3D'0x00000001' ecx=3D'0x00000002'/>
   </feature>
   <feature name=3D'dtes64'>
-    <cpuid eax_in=3D'0x01' ecx=3D'0x00000004'/>
+    <cpuid eax_in=3D'0x00000001' ecx=3D'0x00000004'/>
   </feature>
   <feature name=3D'monitor'>
-    <cpuid eax_in=3D'0x01' ecx=3D'0x00000008'/>
+    <cpuid eax_in=3D'0x00000001' ecx=3D'0x00000008'/>
   </feature>
   <feature name=3D'ds_cpl'>
     <alias name=3D'ds-cpl' source=3D'qemu'/>
-    <cpuid eax_in=3D'0x01' ecx=3D'0x00000010'/>
+    <cpuid eax_in=3D'0x00000001' ecx=3D'0x00000010'/>
   </feature>
   <feature name=3D'vmx'>
-    <cpuid eax_in=3D'0x01' ecx=3D'0x00000020'/>
+    <cpuid eax_in=3D'0x00000001' ecx=3D'0x00000020'/>
   </feature>
   <feature name=3D'smx'>
-    <cpuid eax_in=3D'0x01' ecx=3D'0x00000040'/>
+    <cpuid eax_in=3D'0x00000001' ecx=3D'0x00000040'/>
   </feature>
   <feature name=3D'est'>
-    <cpuid eax_in=3D'0x01' ecx=3D'0x00000080'/>
+    <cpuid eax_in=3D'0x00000001' ecx=3D'0x00000080'/>
   </feature>
   <feature name=3D'tm2'>
-    <cpuid eax_in=3D'0x01' ecx=3D'0x00000100'/>
+    <cpuid eax_in=3D'0x00000001' ecx=3D'0x00000100'/>
   </feature>
   <feature name=3D'ssse3'>
-    <cpuid eax_in=3D'0x01' ecx=3D'0x00000200'/>
+    <cpuid eax_in=3D'0x00000001' ecx=3D'0x00000200'/>
   </feature>
   <feature name=3D'cid'>
-    <cpuid eax_in=3D'0x01' ecx=3D'0x00000400'/>
+    <cpuid eax_in=3D'0x00000001' ecx=3D'0x00000400'/>
   </feature>
   <feature name=3D'fma'>
-    <cpuid eax_in=3D'0x01' ecx=3D'0x00001000'/>
+    <cpuid eax_in=3D'0x00000001' ecx=3D'0x00001000'/>
   </feature>
   <feature name=3D'cx16'>
-    <cpuid eax_in=3D'0x01' ecx=3D'0x00002000'/>
+    <cpuid eax_in=3D'0x00000001' ecx=3D'0x00002000'/>
   </feature>
   <feature name=3D'xtpr'>
-    <cpuid eax_in=3D'0x01' ecx=3D'0x00004000'/>
+    <cpuid eax_in=3D'0x00000001' ecx=3D'0x00004000'/>
   </feature>
   <feature name=3D'pdcm'>
-    <cpuid eax_in=3D'0x01' ecx=3D'0x00008000'/>
+    <cpuid eax_in=3D'0x00000001' ecx=3D'0x00008000'/>
   </feature>
   <feature name=3D'pcid'>
-    <cpuid eax_in=3D'0x01' ecx=3D'0x00020000'/>
+    <cpuid eax_in=3D'0x00000001' ecx=3D'0x00020000'/>
   </feature>
   <feature name=3D'dca'>
-    <cpuid eax_in=3D'0x01' ecx=3D'0x00040000'/>
+    <cpuid eax_in=3D'0x00000001' ecx=3D'0x00040000'/>
   </feature>
   <feature name=3D'sse4.1'>
     <alias name=3D'sse4-1' source=3D'qemu'/>
     <alias name=3D'sse4_1' source=3D'qemu'/>
-    <cpuid eax_in=3D'0x01' ecx=3D'0x00080000'/>
+    <cpuid eax_in=3D'0x00000001' ecx=3D'0x00080000'/>
   </feature>
   <feature name=3D'sse4.2'>
     <alias name=3D'sse4-2' source=3D'qemu'/>
     <alias name=3D'sse4_2' source=3D'qemu'/>
-    <cpuid eax_in=3D'0x01' ecx=3D'0x00100000'/>
+    <cpuid eax_in=3D'0x00000001' ecx=3D'0x00100000'/>
   </feature>
   <feature name=3D'x2apic'>
-    <cpuid eax_in=3D'0x01' ecx=3D'0x00200000'/>
+    <cpuid eax_in=3D'0x00000001' ecx=3D'0x00200000'/>
   </feature>
   <feature name=3D'movbe'>
-    <cpuid eax_in=3D'0x01' ecx=3D'0x00400000'/>
+    <cpuid eax_in=3D'0x00000001' ecx=3D'0x00400000'/>
   </feature>
   <feature name=3D'popcnt'>
-    <cpuid eax_in=3D'0x01' ecx=3D'0x00800000'/>
+    <cpuid eax_in=3D'0x00000001' ecx=3D'0x00800000'/>
   </feature>
   <feature name=3D'tsc-deadline'>
-    <cpuid eax_in=3D'0x01' ecx=3D'0x01000000'/>
+    <cpuid eax_in=3D'0x00000001' ecx=3D'0x01000000'/>
   </feature>
   <feature name=3D'aes'>
-    <cpuid eax_in=3D'0x01' ecx=3D'0x02000000'/>
+    <cpuid eax_in=3D'0x00000001' ecx=3D'0x02000000'/>
   </feature>
   <feature name=3D'xsave'>
-    <cpuid eax_in=3D'0x01' ecx=3D'0x04000000'/>
+    <cpuid eax_in=3D'0x00000001' ecx=3D'0x04000000'/>
   </feature>
   <feature name=3D'osxsave'>
-    <cpuid eax_in=3D'0x01' ecx=3D'0x08000000'/>
+    <cpuid eax_in=3D'0x00000001' ecx=3D'0x08000000'/>
   </feature>
   <feature name=3D'avx'>
-    <cpuid eax_in=3D'0x01' ecx=3D'0x10000000'/>
+    <cpuid eax_in=3D'0x00000001' ecx=3D'0x10000000'/>
   </feature>
   <feature name=3D'f16c'>
-    <cpuid eax_in=3D'0x01' ecx=3D'0x20000000'/>
+    <cpuid eax_in=3D'0x00000001' ecx=3D'0x20000000'/>
   </feature>
   <feature name=3D'rdrand'>
-    <cpuid eax_in=3D'0x01' ecx=3D'0x40000000'/>
+    <cpuid eax_in=3D'0x00000001' ecx=3D'0x40000000'/>
   </feature>
   <feature name=3D'hypervisor'>
-    <cpuid eax_in=3D'0x01' ecx=3D'0x80000000'/>
+    <cpuid eax_in=3D'0x00000001' ecx=3D'0x80000000'/>
   </feature>
=20
   <!-- standard features, EDX -->
   <feature name=3D'fpu'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x00000001'/>
+    <cpuid eax_in=3D'0x00000001' edx=3D'0x00000001'/>
   </feature>
   <feature name=3D'vme'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x00000002'/>
+    <cpuid eax_in=3D'0x00000001' edx=3D'0x00000002'/>
   </feature>
   <feature name=3D'de'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x00000004'/>
+    <cpuid eax_in=3D'0x00000001' edx=3D'0x00000004'/>
   </feature>
   <feature name=3D'pse'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x00000008'/>
+    <cpuid eax_in=3D'0x00000001' edx=3D'0x00000008'/>
   </feature>
   <feature name=3D'tsc'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x00000010'/>
+    <cpuid eax_in=3D'0x00000001' edx=3D'0x00000010'/>
   </feature>
   <feature name=3D'msr'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x00000020'/>
+    <cpuid eax_in=3D'0x00000001' edx=3D'0x00000020'/>
   </feature>
   <feature name=3D'pae'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x00000040'/>
+    <cpuid eax_in=3D'0x00000001' edx=3D'0x00000040'/>
   </feature>
   <feature name=3D'mce'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x00000080'/>
+    <cpuid eax_in=3D'0x00000001' edx=3D'0x00000080'/>
   </feature>
   <feature name=3D'cx8'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x00000100'/>
+    <cpuid eax_in=3D'0x00000001' edx=3D'0x00000100'/>
   </feature>
   <feature name=3D'apic'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x00000200'/>
+    <cpuid eax_in=3D'0x00000001' edx=3D'0x00000200'/>
   </feature>
   <feature name=3D'sep'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x00000800'/>
+    <cpuid eax_in=3D'0x00000001' edx=3D'0x00000800'/>
   </feature>
   <feature name=3D'mtrr'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x00001000'/>
+    <cpuid eax_in=3D'0x00000001' edx=3D'0x00001000'/>
   </feature>
   <feature name=3D'pge'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x00002000'/>
+    <cpuid eax_in=3D'0x00000001' edx=3D'0x00002000'/>
   </feature>
   <feature name=3D'mca'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x00004000'/>
+    <cpuid eax_in=3D'0x00000001' edx=3D'0x00004000'/>
   </feature>
   <feature name=3D'cmov'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x00008000'/>
+    <cpuid eax_in=3D'0x00000001' edx=3D'0x00008000'/>
   </feature>
   <feature name=3D'pat'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x00010000'/>
+    <cpuid eax_in=3D'0x00000001' edx=3D'0x00010000'/>
   </feature>
   <feature name=3D'pse36'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x00020000'/>
+    <cpuid eax_in=3D'0x00000001' edx=3D'0x00020000'/>
   </feature>
   <feature name=3D'pn'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x00040000'/>
+    <cpuid eax_in=3D'0x00000001' edx=3D'0x00040000'/>
   </feature>
   <feature name=3D'clflush'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x00080000'/>
+    <cpuid eax_in=3D'0x00000001' edx=3D'0x00080000'/>
   </feature>
   <feature name=3D'ds'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x00200000'/>
+    <cpuid eax_in=3D'0x00000001' edx=3D'0x00200000'/>
   </feature>
   <feature name=3D'acpi'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x00400000'/>
+    <cpuid eax_in=3D'0x00000001' edx=3D'0x00400000'/>
   </feature>
   <feature name=3D'mmx'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x00800000'/>
+    <cpuid eax_in=3D'0x00000001' edx=3D'0x00800000'/>
   </feature>
   <feature name=3D'fxsr'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x01000000'/>
+    <cpuid eax_in=3D'0x00000001' edx=3D'0x01000000'/>
   </feature>
   <feature name=3D'sse'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x02000000'/>
+    <cpuid eax_in=3D'0x00000001' edx=3D'0x02000000'/>
   </feature>
   <feature name=3D'sse2'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x04000000'/>
+    <cpuid eax_in=3D'0x00000001' edx=3D'0x04000000'/>
   </feature>
   <feature name=3D'ss'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x08000000'/>
+    <cpuid eax_in=3D'0x00000001' edx=3D'0x08000000'/>
   </feature>
   <feature name=3D'ht'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x10000000'/>
+    <cpuid eax_in=3D'0x00000001' edx=3D'0x10000000'/>
   </feature>
   <feature name=3D'tm'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x20000000'/>
+    <cpuid eax_in=3D'0x00000001' edx=3D'0x20000000'/>
   </feature>
   <feature name=3D'ia64'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x40000000'/>
+    <cpuid eax_in=3D'0x00000001' edx=3D'0x40000000'/>
   </feature>
   <feature name=3D'pbe'>
-    <cpuid eax_in=3D'0x01' edx=3D'0x80000000'/>
+    <cpuid eax_in=3D'0x00000001' edx=3D'0x80000000'/>
   </feature>
=20
   <!-- Termal Power and Management -->
   <feature name=3D'arat'>
-    <cpuid eax_in=3D'0x06' eax=3D'0x00000004'/>
+    <cpuid eax_in=3D'0x00000006' eax=3D'0x00000004'/>
   </feature>
=20
   <!-- cpuid function 0x7 ecx 0x0 features -->
   <feature name=3D'fsgsbase'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00000001'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ebx=3D'0x00000001'/>
   </feature>
   <feature name=3D'tsc_adjust'>
     <alias name=3D'tsc-adjust' source=3D'qemu'/>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00000002'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ebx=3D'0x00000002'/>
   </feature>
   <feature name=3D'sgx'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00000004'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ebx=3D'0x00000004'/>
   </feature>
   <feature name=3D'bmi1'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00000008'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ebx=3D'0x00000008'/>
   </feature>
   <feature name=3D'hle'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00000010'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ebx=3D'0x00000010'/>
   </feature>
   <feature name=3D'avx2'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00000020'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ebx=3D'0x00000020'/>
   </feature>
   <feature name=3D'smep'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00000080'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ebx=3D'0x00000080'/>
   </feature>
   <feature name=3D'bmi2'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00000100'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ebx=3D'0x00000100'/>
   </feature>
   <feature name=3D'erms'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00000200'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ebx=3D'0x00000200'/>
   </feature>
   <feature name=3D'invpcid'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00000400'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ebx=3D'0x00000400'/>
   </feature>
   <feature name=3D'rtm'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00000800'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ebx=3D'0x00000800'/>
   </feature>
   <feature name=3D'cmt'>
     <alias name=3D'cqm' source=3D'linux'/>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00001000'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ebx=3D'0x00001000'/>
   </feature>
   <feature name=3D'mpx'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00004000'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ebx=3D'0x00004000'/>
   </feature>
   <feature name=3D'avx512f'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00010000'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ebx=3D'0x00010000'/>
   </feature>
   <feature name=3D'avx512dq'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00020000'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ebx=3D'0x00020000'/>
   </feature>
   <feature name=3D'rdseed'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00040000'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ebx=3D'0x00040000'/>
   </feature>
   <feature name=3D'adx'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00080000'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ebx=3D'0x00080000'/>
   </feature>
   <feature name=3D'smap'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00100000'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ebx=3D'0x00100000'/>
   </feature>
   <feature name=3D'avx512ifma'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00200000'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ebx=3D'0x00200000'/>
   </feature>
   <feature name=3D'pcommit'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00400000'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ebx=3D'0x00400000'/>
   </feature>
   <feature name=3D'clflushopt'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x00800000'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ebx=3D'0x00800000'/>
   </feature>
   <feature name=3D'clwb'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x01000000'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ebx=3D'0x01000000'/>
   </feature>
   <feature name=3D'intel-pt'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x02000000'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ebx=3D'0x02000000'/>
   </feature>
   <feature name=3D'avx512pf'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x04000000'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ebx=3D'0x04000000'/>
   </feature>
   <feature name=3D'avx512er'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x08000000'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ebx=3D'0x08000000'/>
   </feature>
   <feature name=3D'avx512cd'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x10000000'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ebx=3D'0x10000000'/>
   </feature>
   <feature name=3D'sha-ni'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x20000000'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ebx=3D'0x20000000'/>
   </feature>
   <feature name=3D'avx512bw'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x40000000'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ebx=3D'0x40000000'/>
   </feature>
   <feature name=3D'avx512vl'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ebx=3D'0x80000000'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ebx=3D'0x80000000'/>
   </feature>
=20
   <feature name=3D'avx512vbmi'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ecx=3D'0x00000002'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ecx=3D'0x00000002'/>
   </feature>
   <feature name=3D'umip'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ecx=3D'0x00000004'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ecx=3D'0x00000004'/>
   </feature>
   <feature name=3D'pku'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ecx=3D'0x00000008'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ecx=3D'0x00000008'/>
   </feature>
   <feature name=3D'ospke'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ecx=3D'0x00000010'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ecx=3D'0x00000010'/>
   </feature>
   <feature name=3D'waitpkg'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ecx=3D'0x00000020'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ecx=3D'0x00000020'/>
   </feature>
   <feature name=3D'avx512vbmi2'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ecx=3D'0x00000040'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ecx=3D'0x00000040'/>
   </feature>
   <feature name=3D'gfni'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ecx=3D'0x00000100'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ecx=3D'0x00000100'/>
   </feature>
   <feature name=3D'vaes'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ecx=3D'0x00000200'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ecx=3D'0x00000200'/>
   </feature>
   <feature name=3D'vpclmulqdq'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ecx=3D'0x00000400'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ecx=3D'0x00000400'/>
   </feature>
   <feature name=3D'avx512vnni'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ecx=3D'0x00000800'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ecx=3D'0x00000800'/>
   </feature>
   <feature name=3D'avx512bitalg'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ecx=3D'0x00001000'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ecx=3D'0x00001000'/>
   </feature>
   <feature name=3D'avx512-vpopcntdq'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ecx=3D'0x00004000'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ecx=3D'0x00004000'/>
   </feature>
   <feature name=3D'la57'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ecx=3D'0x00010000'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ecx=3D'0x00010000'/>
   </feature>
   <feature name=3D'rdpid'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ecx=3D'0x00400000'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ecx=3D'0x00400000'/>
   </feature>
   <feature name=3D'bus-lock-detect'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ecx=3D'0x01000000'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ecx=3D'0x01000000'/>
   </feature>
   <feature name=3D'cldemote'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ecx=3D'0x02000000'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ecx=3D'0x02000000'/>
   </feature>
   <feature name=3D'movdiri'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ecx=3D'0x08000000'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ecx=3D'0x08000000'/>
   </feature>
   <feature name=3D'movdir64b'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ecx=3D'0x10000000'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ecx=3D'0x10000000'/>
   </feature>
   <feature name=3D'sgxlc'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ecx=3D'0x40000000'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ecx=3D'0x40000000'/>
   </feature>
   <feature name=3D'pks'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ecx=3D'0x80000000'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ecx=3D'0x80000000'/>
   </feature>
=20
   <feature name=3D'avx512-4vnniw'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' edx=3D'0x00000004'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' edx=3D'0x00000004'/>
   </feature>
   <feature name=3D'avx512-4fmaps'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' edx=3D'0x00000008'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' edx=3D'0x00000008'/>
   </feature>
   <feature name=3D'fsrm'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' edx=3D'0x00000010'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' edx=3D'0x00000010'/>
   </feature>
   <feature name=3D'avx512-vp2intersect'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' edx=3D'0x00000100'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' edx=3D'0x00000100'/>
   </feature>
   <feature name=3D'md-clear'>
     <alias name=3D'md_clear' source=3D'linux'/>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' edx=3D'0x00000400'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' edx=3D'0x00000400'/>
   </feature>
   <feature name=3D'serialize'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' edx=3D'0x00004000'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' edx=3D'0x00004000'/>
   </feature>
   <feature name=3D'tsx-ldtrk'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' edx=3D'0x00010000'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' edx=3D'0x00010000'/>
   </feature>
   <feature name=3D'pconfig'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' edx=3D'0x00040000'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' edx=3D'0x00040000'/>
   </feature>
   <feature name=3D'arch-lbr'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' edx=3D'0x00080000'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' edx=3D'0x00080000'/>
   </feature>
   <feature name=3D'amx-bf16'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' edx=3D'0x00400000'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' edx=3D'0x00400000'/>
   </feature>
   <feature name=3D'avx512-fp16'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' edx=3D'0x00800000'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' edx=3D'0x00800000'/>
   </feature>
   <feature name=3D'amx-tile'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' edx=3D'0x01000000'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' edx=3D'0x01000000'/>
   </feature>
   <feature name=3D'amx-int8'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' edx=3D'0x02000000'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' edx=3D'0x02000000'/>
   </feature>
   <feature name=3D'spec-ctrl'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' edx=3D'0x04000000'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' edx=3D'0x04000000'/>
   </feature>
   <feature name=3D'stibp'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' edx=3D'0x08000000'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' edx=3D'0x08000000'/>
   </feature>
   <feature name=3D'flush-l1d'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' edx=3D'0x10000000'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' edx=3D'0x10000000'/>
   </feature>
   <feature name=3D'arch-capabilities'>
     <alias name=3D'arch_capabilities' source=3D'linux'/>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' edx=3D'0x20000000'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' edx=3D'0x20000000'/>
   </feature>
   <feature name=3D'core-capability'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' edx=3D'0x40000000'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' edx=3D'0x40000000'/>
   </feature>
   <feature name=3D'ssbd'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' edx=3D'0x80000000'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' edx=3D'0x80000000'/>
   </feature>
=20
   <feature name=3D'avx-vnni'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x01' eax=3D'0x00000010'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000001' eax=3D'0x00000010'/>
   </feature>
   <feature name=3D'avx512-bf16'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x01' eax=3D'0x00000020'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000001' eax=3D'0x00000020'/>
   </feature>
   <feature name=3D'cmpccxadd'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x01' eax=3D'0x00000080'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000001' eax=3D'0x00000080'/>
   </feature>
   <feature name=3D'fzrm'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x01' eax=3D'0x00000400'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000001' eax=3D'0x00000400'/>
   </feature>
   <feature name=3D'fsrs'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x01' eax=3D'0x00000800'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000001' eax=3D'0x00000800'/>
   </feature>
   <feature name=3D'fsrc'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x01' eax=3D'0x00001000'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000001' eax=3D'0x00001000'/>
   </feature>
   <feature name=3D'amx-fp16'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x01' eax=3D'0x00200000'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000001' eax=3D'0x00200000'/>
   </feature>
   <feature name=3D'avx-ifma'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x01' eax=3D'0x00800000'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000001' eax=3D'0x00800000'/>
   </feature>
=20
   <feature name=3D'avx-vnni-int8'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x01' edx=3D'0x00000010'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000001' edx=3D'0x00000010'/>
   </feature>
   <feature name=3D'avx-ne-convert'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x01' edx=3D'0x00000020'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000001' edx=3D'0x00000020'/>
   </feature>
   <feature name=3D'amx-complex'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x01' edx=3D'0x00000100'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000001' edx=3D'0x00000100'/>
   </feature>
   <feature name=3D'prefetchiti'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x01' edx=3D'0x00004000'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000001' edx=3D'0x00004000'/>
   </feature>
=20
   <feature name=3D'mcdt-no'>
-    <cpuid eax_in=3D'0x07' ecx_in=3D'0x02' edx=3D'0x00000020'/>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000002' edx=3D'0x00000020'/>
   </feature>
=20
   <!-- Processor Extended State Enumeration sub leaf 1 -->
   <feature name=3D'xsaveopt'>
-    <cpuid eax_in=3D'0x0d' ecx_in=3D'0x01' eax=3D'0x00000001'/>
+    <cpuid eax_in=3D'0x0000000d' ecx_in=3D'0x00000001' eax=3D'0x00000001'/>
   </feature>
   <feature name=3D'xsavec'>
-    <cpuid eax_in=3D'0x0d' ecx_in=3D'0x01' eax=3D'0x00000002'/>
+    <cpuid eax_in=3D'0x0000000d' ecx_in=3D'0x00000001' eax=3D'0x00000002'/>
   </feature>
   <feature name=3D'xgetbv1'>
-    <cpuid eax_in=3D'0x0d' ecx_in=3D'0x01' eax=3D'0x00000004'/>
+    <cpuid eax_in=3D'0x0000000d' ecx_in=3D'0x00000001' eax=3D'0x00000004'/>
   </feature>
   <feature name=3D'xsaves' migratable=3D'no'>
-    <cpuid eax_in=3D'0x0d' ecx_in=3D'0x01' eax=3D'0x00000008'/>
+    <cpuid eax_in=3D'0x0000000d' ecx_in=3D'0x00000001' eax=3D'0x00000008'/>
   </feature>
   <feature name=3D'xfd'>
-    <cpuid eax_in=3D'0x0d' ecx_in=3D'0x01' eax=3D'0x00000010'/>
+    <cpuid eax_in=3D'0x0000000d' ecx_in=3D'0x00000001' eax=3D'0x00000010'/>
   </feature>
=20
   <!-- cpuid level 0x0000000f:1 (edx) -->
   <feature name=3D'mbm_total'>
-    <cpuid eax_in=3D'0x0f' ecx_in=3D'0x01' edx=3D'0x00000002'/>
+    <cpuid eax_in=3D'0x0000000f' ecx_in=3D'0x00000001' edx=3D'0x00000002'/>
   </feature>
   <feature name=3D'mbm_local'>
-    <cpuid eax_in=3D'0x0f' ecx_in=3D'0x01' edx=3D'0x00000004'/>
+    <cpuid eax_in=3D'0x0000000f' ecx_in=3D'0x00000001' edx=3D'0x00000004'/>
   </feature>
=20
   <!-- cpuid level 0x00000012 ecx 0x0 features -->
   <feature name=3D'sgx1'>
-    <cpuid eax_in=3D'0x12' ecx_in=3D'0x00' eax=3D'0x00000001'/>
+    <cpuid eax_in=3D'0x00000012' ecx_in=3D'0x00000000' eax=3D'0x00000001'/>
   </feature>
   <feature name=3D'sgx2'>
-    <cpuid eax_in=3D'0x12' ecx_in=3D'0x00' eax=3D'0x00000002'/>
+    <cpuid eax_in=3D'0x00000012' ecx_in=3D'0x00000000' eax=3D'0x00000002'/>
   </feature>
   <feature name=3D'sgx-edeccssa'>
-    <cpuid eax_in=3D'0x12' ecx_in=3D'0x00' eax=3D'0x00000800'/>
+    <cpuid eax_in=3D'0x00000012' ecx_in=3D'0x00000000' eax=3D'0x00000800'/>
   </feature>
=20
   <feature name=3D'sgx-exinfo'>
-    <cpuid eax_in=3D'0x12' ecx_in=3D'0x00' ebx=3D'0x00000001'/>
+    <cpuid eax_in=3D'0x00000012' ecx_in=3D'0x00000000' ebx=3D'0x00000001'/>
   </feature>
=20
   <!-- cpuid level 0x00000012 ecx 0x1 features -->
   <feature name=3D'sgx-debug'>
-    <cpuid eax_in=3D'0x12' ecx_in=3D'0x01' eax=3D'0x00000002'/>
+    <cpuid eax_in=3D'0x00000012' ecx_in=3D'0x00000001' eax=3D'0x00000002'/>
   </feature>
   <feature name=3D'sgx-mode64'>
-    <cpuid eax_in=3D'0x12' ecx_in=3D'0x01' eax=3D'0x00000004'/>
+    <cpuid eax_in=3D'0x00000012' ecx_in=3D'0x00000001' eax=3D'0x00000004'/>
   </feature>
   <feature name=3D'sgx-provisionkey'>
-    <cpuid eax_in=3D'0x12' ecx_in=3D'0x01' eax=3D'0x00000010'/>
+    <cpuid eax_in=3D'0x00000012' ecx_in=3D'0x00000001' eax=3D'0x00000010'/>
   </feature>
   <feature name=3D'sgx-tokenkey'>
-    <cpuid eax_in=3D'0x12' ecx_in=3D'0x01' eax=3D'0x00000020'/>
+    <cpuid eax_in=3D'0x00000012' ecx_in=3D'0x00000001' eax=3D'0x00000020'/>
   </feature>
   <feature name=3D'sgx-kss'>
-    <cpuid eax_in=3D'0x12' ecx_in=3D'0x01' eax=3D'0x00000080'/>
+    <cpuid eax_in=3D'0x00000012' ecx_in=3D'0x00000001' eax=3D'0x00000080'/>
   </feature>
   <feature name=3D'sgx-aex-notify'>
-    <cpuid eax_in=3D'0x12' ecx_in=3D'0x01' eax=3D'0x00000400'/>
+    <cpuid eax_in=3D'0x00000012' ecx_in=3D'0x00000001' eax=3D'0x00000400'/>
   </feature>
=20
   <!-- cpuid level 0x00000014 ecx 0x0 features -->
   <feature name=3D'intel-pt-lip'>
-    <cpuid eax_in=3D'0x14' ecx_in=3D'0x00' ecx=3D'0x80000000'/>
+    <cpuid eax_in=3D'0x00000014' ecx_in=3D'0x00000000' ecx=3D'0x80000000'/>
   </feature>
=20
   <!-- extended features, ECX -->
@@ -737,342 +737,342 @@
=20
   <!-- IA32_CORE_CAPABILITIES features -->
   <feature name=3D'split-lock-detect'>
-    <msr index=3D'0xcf' edx=3D'0x00000000' eax=3D'0x00000020'/>
+    <msr index=3D'0x000000cf' edx=3D'0x00000000' eax=3D'0x00000020'/>
   </feature>
=20
   <!-- IA32_ARCH_CAPABILITIES features -->
   <feature name=3D'rdctl-no'>
-    <msr index=3D'0x10a' edx=3D'0x00000000' eax=3D'0x00000001'/>
+    <msr index=3D'0x0000010a' edx=3D'0x00000000' eax=3D'0x00000001'/>
   </feature>
   <feature name=3D'ibrs-all'>
-    <msr index=3D'0x10a' edx=3D'0x00000000' eax=3D'0x00000002'/>
+    <msr index=3D'0x0000010a' edx=3D'0x00000000' eax=3D'0x00000002'/>
   </feature>
   <feature name=3D'rsba'>
-    <msr index=3D'0x10a' edx=3D'0x00000000' eax=3D'0x00000004'/>
+    <msr index=3D'0x0000010a' edx=3D'0x00000000' eax=3D'0x00000004'/>
   </feature>
   <feature name=3D'skip-l1dfl-vmentry'>
-    <msr index=3D'0x10a' edx=3D'0x00000000' eax=3D'0x00000008'/>
+    <msr index=3D'0x0000010a' edx=3D'0x00000000' eax=3D'0x00000008'/>
   </feature>
   <feature name=3D'ssb-no'>
-    <msr index=3D'0x10a' edx=3D'0x00000000' eax=3D'0x00000010'/>
+    <msr index=3D'0x0000010a' edx=3D'0x00000000' eax=3D'0x00000010'/>
   </feature>
   <feature name=3D'mds-no'>
-    <msr index=3D'0x10a' edx=3D'0x00000000' eax=3D'0x00000020'/>
+    <msr index=3D'0x0000010a' edx=3D'0x00000000' eax=3D'0x00000020'/>
   </feature>
   <feature name=3D'pschange-mc-no'>
-    <msr index=3D'0x10a' edx=3D'0x00000000' eax=3D'0x00000040'/>
+    <msr index=3D'0x0000010a' edx=3D'0x00000000' eax=3D'0x00000040'/>
   </feature>
   <feature name=3D'tsx-ctrl'>
-    <msr index=3D'0x10a' edx=3D'0x00000000' eax=3D'0x00000080'/>
+    <msr index=3D'0x0000010a' edx=3D'0x00000000' eax=3D'0x00000080'/>
   </feature>
   <feature name=3D'taa-no'>
-    <msr index=3D'0x10a' edx=3D'0x00000000' eax=3D'0x00000100'/>
+    <msr index=3D'0x0000010a' edx=3D'0x00000000' eax=3D'0x00000100'/>
   </feature>
   <feature name=3D'sbdr-ssdp-no'>
-    <msr index=3D'0x10a' edx=3D'0x00000000' eax=3D'0x00002000'/>
+    <msr index=3D'0x0000010a' edx=3D'0x00000000' eax=3D'0x00002000'/>
   </feature>
   <feature name=3D'fbsdp-no'>
-    <msr index=3D'0x10a' edx=3D'0x00000000' eax=3D'0x00004000'/>
+    <msr index=3D'0x0000010a' edx=3D'0x00000000' eax=3D'0x00004000'/>
   </feature>
   <feature name=3D'psdp-no'>
-    <msr index=3D'0x10a' edx=3D'0x00000000' eax=3D'0x00008000'/>
+    <msr index=3D'0x0000010a' edx=3D'0x00000000' eax=3D'0x00008000'/>
   </feature>
   <feature name=3D'fb-clear'>
-    <msr index=3D'0x10a' edx=3D'0x00000000' eax=3D'0x00020000'/>
+    <msr index=3D'0x0000010a' edx=3D'0x00000000' eax=3D'0x00020000'/>
   </feature>
   <feature name=3D'pbrsb-no'>
-    <msr index=3D'0x10a' edx=3D'0x00000000' eax=3D'0x01000000'/>
+    <msr index=3D'0x0000010a' edx=3D'0x00000000' eax=3D'0x01000000'/>
   </feature>
   <feature name=3D'gds-no'>
-    <msr index=3D'0x10a' edx=3D'0x00000000' eax=3D'0x04000000'/>
+    <msr index=3D'0x0000010a' edx=3D'0x00000000' eax=3D'0x04000000'/>
   </feature>
=20
   <feature name=3D'vmx-ins-outs'>
-    <msr index=3D'0x480' edx=3D'0x00400000' eax=3D'0x00000000'/>
+    <msr index=3D'0x00000480' edx=3D'0x00400000' eax=3D'0x00000000'/>
   </feature>
   <feature name=3D'vmx-true-ctls'>
-    <msr index=3D'0x480' edx=3D'0x00800000' eax=3D'0x00000000'/>
+    <msr index=3D'0x00000480' edx=3D'0x00800000' eax=3D'0x00000000'/>
   </feature>
   <feature name=3D'vmx-any-errcode'>
-    <msr index=3D'0x480' edx=3D'0x01000000' eax=3D'0x00000000'/>
+    <msr index=3D'0x00000480' edx=3D'0x01000000' eax=3D'0x00000000'/>
   </feature>
=20
   <feature name=3D'vmx-store-lma'>
-    <msr index=3D'0x485' edx=3D'0x00000000' eax=3D'0x00000020'/>
+    <msr index=3D'0x00000485' edx=3D'0x00000000' eax=3D'0x00000020'/>
   </feature>
   <feature name=3D'vmx-activity-hlt'>
-    <msr index=3D'0x485' edx=3D'0x00000000' eax=3D'0x00000040'/>
+    <msr index=3D'0x00000485' edx=3D'0x00000000' eax=3D'0x00000040'/>
   </feature>
   <feature name=3D'vmx-activity-shutdown'>
-    <msr index=3D'0x485' edx=3D'0x00000000' eax=3D'0x00000080'/>
+    <msr index=3D'0x00000485' edx=3D'0x00000000' eax=3D'0x00000080'/>
   </feature>
   <feature name=3D'vmx-activity-wait-sipi'>
-    <msr index=3D'0x485' edx=3D'0x00000000' eax=3D'0x00000100'/>
+    <msr index=3D'0x00000485' edx=3D'0x00000000' eax=3D'0x00000100'/>
   </feature>
   <feature name=3D'vmx-vmwrite-vmexit-fields'>
-    <msr index=3D'0x485' edx=3D'0x00000000' eax=3D'0x20000000'/>
+    <msr index=3D'0x00000485' edx=3D'0x00000000' eax=3D'0x20000000'/>
   </feature>
   <feature name=3D'vmx-zero-len-inject'>
-    <msr index=3D'0x485' edx=3D'0x00000000' eax=3D'0x40000000'/>
+    <msr index=3D'0x00000485' edx=3D'0x00000000' eax=3D'0x40000000'/>
   </feature>
=20
   <feature name=3D'vmx-apicv-xapic'>
-    <msr index=3D'0x48b' edx=3D'0x00000000' eax=3D'0x00000001'/>
+    <msr index=3D'0x0000048b' edx=3D'0x00000000' eax=3D'0x00000001'/>
   </feature>
   <feature name=3D'vmx-ept'>
-    <msr index=3D'0x48b' edx=3D'0x00000000' eax=3D'0x00000002'/>
+    <msr index=3D'0x0000048b' edx=3D'0x00000000' eax=3D'0x00000002'/>
   </feature>
   <feature name=3D'vmx-desc-exit'>
-    <msr index=3D'0x48b' edx=3D'0x00000000' eax=3D'0x00000004'/>
+    <msr index=3D'0x0000048b' edx=3D'0x00000000' eax=3D'0x00000004'/>
   </feature>
   <feature name=3D'vmx-rdtscp-exit'>
-    <msr index=3D'0x48b' edx=3D'0x00000000' eax=3D'0x00000008'/>
+    <msr index=3D'0x0000048b' edx=3D'0x00000000' eax=3D'0x00000008'/>
   </feature>
   <feature name=3D'vmx-apicv-x2apic'>
-    <msr index=3D'0x48b' edx=3D'0x00000000' eax=3D'0x00000010'/>
+    <msr index=3D'0x0000048b' edx=3D'0x00000000' eax=3D'0x00000010'/>
   </feature>
   <feature name=3D'vmx-vpid'>
-    <msr index=3D'0x48b' edx=3D'0x00000000' eax=3D'0x00000020'/>
+    <msr index=3D'0x0000048b' edx=3D'0x00000000' eax=3D'0x00000020'/>
   </feature>
   <feature name=3D'vmx-wbinvd-exit'>
-    <msr index=3D'0x48b' edx=3D'0x00000000' eax=3D'0x00000040'/>
+    <msr index=3D'0x0000048b' edx=3D'0x00000000' eax=3D'0x00000040'/>
   </feature>
   <feature name=3D'vmx-unrestricted-guest'>
-    <msr index=3D'0x48b' edx=3D'0x00000000' eax=3D'0x00000080'/>
+    <msr index=3D'0x0000048b' edx=3D'0x00000000' eax=3D'0x00000080'/>
   </feature>
   <feature name=3D'vmx-apicv-register'>
-    <msr index=3D'0x48b' edx=3D'0x00000000' eax=3D'0x00000100'/>
+    <msr index=3D'0x0000048b' edx=3D'0x00000000' eax=3D'0x00000100'/>
   </feature>
   <feature name=3D'vmx-apicv-vid'>
-    <msr index=3D'0x48b' edx=3D'0x00000000' eax=3D'0x00000200'/>
+    <msr index=3D'0x0000048b' edx=3D'0x00000000' eax=3D'0x00000200'/>
   </feature>
   <feature name=3D'vmx-ple'>
-    <msr index=3D'0x48b' edx=3D'0x00000000' eax=3D'0x00000400'/>
+    <msr index=3D'0x0000048b' edx=3D'0x00000000' eax=3D'0x00000400'/>
   </feature>
   <feature name=3D'vmx-rdrand-exit'>
-    <msr index=3D'0x48b' edx=3D'0x00000000' eax=3D'0x00000800'/>
+    <msr index=3D'0x0000048b' edx=3D'0x00000000' eax=3D'0x00000800'/>
   </feature>
   <feature name=3D'vmx-invpcid-exit'>
-    <msr index=3D'0x48b' edx=3D'0x00000000' eax=3D'0x00001000'/>
+    <msr index=3D'0x0000048b' edx=3D'0x00000000' eax=3D'0x00001000'/>
   </feature>
   <feature name=3D'vmx-vmfunc'>
-    <msr index=3D'0x48b' edx=3D'0x00000000' eax=3D'0x00002000'/>
+    <msr index=3D'0x0000048b' edx=3D'0x00000000' eax=3D'0x00002000'/>
   </feature>
   <feature name=3D'vmx-shadow-vmcs'>
-    <msr index=3D'0x48b' edx=3D'0x00000000' eax=3D'0x00004000'/>
+    <msr index=3D'0x0000048b' edx=3D'0x00000000' eax=3D'0x00004000'/>
   </feature>
   <feature name=3D'vmx-encls-exit'>
-    <msr index=3D'0x48b' edx=3D'0x00000000' eax=3D'0x00008000'/>
+    <msr index=3D'0x0000048b' edx=3D'0x00000000' eax=3D'0x00008000'/>
   </feature>
   <feature name=3D'vmx-rdseed-exit'>
-    <msr index=3D'0x48b' edx=3D'0x00000000' eax=3D'0x00010000'/>
+    <msr index=3D'0x0000048b' edx=3D'0x00000000' eax=3D'0x00010000'/>
   </feature>
   <feature name=3D'vmx-pml'>
-    <msr index=3D'0x48b' edx=3D'0x00000000' eax=3D'0x00020000'/>
+    <msr index=3D'0x0000048b' edx=3D'0x00000000' eax=3D'0x00020000'/>
   </feature>
   <feature name=3D'vmx-xsaves'>
-    <msr index=3D'0x48b' edx=3D'0x00000000' eax=3D'0x00100000'/>
+    <msr index=3D'0x0000048b' edx=3D'0x00000000' eax=3D'0x00100000'/>
   </feature>
   <feature name=3D'vmx-tsc-scaling'>
-    <msr index=3D'0x48b' edx=3D'0x00000000' eax=3D'0x02000000'/>
+    <msr index=3D'0x0000048b' edx=3D'0x00000000' eax=3D'0x02000000'/>
   </feature>
   <feature name=3D'vmx-enable-user-wait-pause'>
-    <msr index=3D'0x48b' edx=3D'0x00000000' eax=3D'0x04000000'/>
+    <msr index=3D'0x0000048b' edx=3D'0x00000000' eax=3D'0x04000000'/>
   </feature>
=20
   <feature name=3D'vmx-ept-execonly'>
-    <msr index=3D'0x48c' edx=3D'0x00000000' eax=3D'0x00000001'/>
+    <msr index=3D'0x0000048c' edx=3D'0x00000000' eax=3D'0x00000001'/>
   </feature>
   <feature name=3D'vmx-page-walk-4'>
-    <msr index=3D'0x48c' edx=3D'0x00000000' eax=3D'0x00000040'/>
+    <msr index=3D'0x0000048c' edx=3D'0x00000000' eax=3D'0x00000040'/>
   </feature>
   <feature name=3D'vmx-page-walk-5'>
-    <msr index=3D'0x48c' edx=3D'0x00000000' eax=3D'0x00000080'/>
+    <msr index=3D'0x0000048c' edx=3D'0x00000000' eax=3D'0x00000080'/>
   </feature>
   <feature name=3D'vmx-ept-uc'>
-    <msr index=3D'0x48c' edx=3D'0x00000000' eax=3D'0x00000100'/>
+    <msr index=3D'0x0000048c' edx=3D'0x00000000' eax=3D'0x00000100'/>
   </feature>
   <feature name=3D'vmx-ept-wb'>
-    <msr index=3D'0x48c' edx=3D'0x00000000' eax=3D'0x00004000'/>
+    <msr index=3D'0x0000048c' edx=3D'0x00000000' eax=3D'0x00004000'/>
   </feature>
   <feature name=3D'vmx-ept-2mb'>
-    <msr index=3D'0x48c' edx=3D'0x00000000' eax=3D'0x00010000'/>
+    <msr index=3D'0x0000048c' edx=3D'0x00000000' eax=3D'0x00010000'/>
   </feature>
   <feature name=3D'vmx-ept-1gb'>
-    <msr index=3D'0x48c' edx=3D'0x00000000' eax=3D'0x00020000'/>
+    <msr index=3D'0x0000048c' edx=3D'0x00000000' eax=3D'0x00020000'/>
   </feature>
   <feature name=3D'vmx-invept'>
-    <msr index=3D'0x48c' edx=3D'0x00000000' eax=3D'0x00100000'/>
+    <msr index=3D'0x0000048c' edx=3D'0x00000000' eax=3D'0x00100000'/>
   </feature>
   <feature name=3D'vmx-eptad'>
-    <msr index=3D'0x48c' edx=3D'0x00000000' eax=3D'0x00200000'/>
+    <msr index=3D'0x0000048c' edx=3D'0x00000000' eax=3D'0x00200000'/>
   </feature>
   <feature name=3D'vmx-ept-advanced-exitinfo'>
-    <msr index=3D'0x48c' edx=3D'0x00000000' eax=3D'0x00400000'/>
+    <msr index=3D'0x0000048c' edx=3D'0x00000000' eax=3D'0x00400000'/>
   </feature>
   <feature name=3D'vmx-invept-single-context'>
-    <msr index=3D'0x48c' edx=3D'0x00000000' eax=3D'0x02000000'/>
+    <msr index=3D'0x0000048c' edx=3D'0x00000000' eax=3D'0x02000000'/>
   </feature>
   <feature name=3D'vmx-invept-all-context'>
-    <msr index=3D'0x48c' edx=3D'0x00000000' eax=3D'0x04000000'/>
+    <msr index=3D'0x0000048c' edx=3D'0x00000000' eax=3D'0x04000000'/>
   </feature>
   <feature name=3D'vmx-invvpid'>
-    <msr index=3D'0x48c' edx=3D'0x00000001' eax=3D'0x00000000'/>
+    <msr index=3D'0x0000048c' edx=3D'0x00000001' eax=3D'0x00000000'/>
   </feature>
   <feature name=3D'vmx-invvpid-single-addr'>
-    <msr index=3D'0x48c' edx=3D'0x00000100' eax=3D'0x00000000'/>
+    <msr index=3D'0x0000048c' edx=3D'0x00000100' eax=3D'0x00000000'/>
   </feature>
   <feature name=3D'vmx-invvpid-single-context'>
-    <msr index=3D'0x48c' edx=3D'0x00000200' eax=3D'0x00000000'/>
+    <msr index=3D'0x0000048c' edx=3D'0x00000200' eax=3D'0x00000000'/>
   </feature>
   <feature name=3D'vmx-invvpid-all-context'>
-    <msr index=3D'0x48c' edx=3D'0x00000400' eax=3D'0x00000000'/>
+    <msr index=3D'0x0000048c' edx=3D'0x00000400' eax=3D'0x00000000'/>
   </feature>
   <feature name=3D'vmx-invvpid-single-context-noglobals'>
     <alias name=3D'vmx-invept-single-context-noglobals' source=3D'qemu'/>
-    <msr index=3D'0x48c' edx=3D'0x00000800' eax=3D'0x00000000'/>
+    <msr index=3D'0x0000048c' edx=3D'0x00000800' eax=3D'0x00000000'/>
   </feature>
=20
   <feature name=3D'vmx-intr-exit'>
-    <msr index=3D'0x48d' edx=3D'0x00000000' eax=3D'0x00000001'/>
+    <msr index=3D'0x0000048d' edx=3D'0x00000000' eax=3D'0x00000001'/>
   </feature>
   <feature name=3D'vmx-nmi-exit'>
-    <msr index=3D'0x48d' edx=3D'0x00000000' eax=3D'0x00000008'/>
+    <msr index=3D'0x0000048d' edx=3D'0x00000000' eax=3D'0x00000008'/>
   </feature>
   <feature name=3D'vmx-vnmi'>
-    <msr index=3D'0x48d' edx=3D'0x00000000' eax=3D'0x00000020'/>
+    <msr index=3D'0x0000048d' edx=3D'0x00000000' eax=3D'0x00000020'/>
   </feature>
   <feature name=3D'vmx-preemption-timer'>
-    <msr index=3D'0x48d' edx=3D'0x00000000' eax=3D'0x00000040'/>
+    <msr index=3D'0x0000048d' edx=3D'0x00000000' eax=3D'0x00000040'/>
   </feature>
   <feature name=3D'vmx-posted-intr'>
-    <msr index=3D'0x48d' edx=3D'0x00000000' eax=3D'0x00000080'/>
+    <msr index=3D'0x0000048d' edx=3D'0x00000000' eax=3D'0x00000080'/>
   </feature>
=20
   <feature name=3D'vmx-vintr-pending'>
-    <msr index=3D'0x48e' edx=3D'0x00000000' eax=3D'0x00000004'/>
+    <msr index=3D'0x0000048e' edx=3D'0x00000000' eax=3D'0x00000004'/>
   </feature>
   <feature name=3D'vmx-tsc-offset'>
-    <msr index=3D'0x48e' edx=3D'0x00000000' eax=3D'0x00000008'/>
+    <msr index=3D'0x0000048e' edx=3D'0x00000000' eax=3D'0x00000008'/>
   </feature>
   <feature name=3D'vmx-hlt-exit'>
-    <msr index=3D'0x48e' edx=3D'0x00000000' eax=3D'0x00000080'/>
+    <msr index=3D'0x0000048e' edx=3D'0x00000000' eax=3D'0x00000080'/>
   </feature>
   <feature name=3D'vmx-invlpg-exit'>
-    <msr index=3D'0x48e' edx=3D'0x00000000' eax=3D'0x00000200'/>
+    <msr index=3D'0x0000048e' edx=3D'0x00000000' eax=3D'0x00000200'/>
   </feature>
   <feature name=3D'vmx-mwait-exit'>
-    <msr index=3D'0x48e' edx=3D'0x00000000' eax=3D'0x00000400'/>
+    <msr index=3D'0x0000048e' edx=3D'0x00000000' eax=3D'0x00000400'/>
   </feature>
   <feature name=3D'vmx-rdpmc-exit'>
-    <msr index=3D'0x48e' edx=3D'0x00000000' eax=3D'0x00000800'/>
+    <msr index=3D'0x0000048e' edx=3D'0x00000000' eax=3D'0x00000800'/>
   </feature>
   <feature name=3D'vmx-rdtsc-exit'>
-    <msr index=3D'0x48e' edx=3D'0x00000000' eax=3D'0x00001000'/>
+    <msr index=3D'0x0000048e' edx=3D'0x00000000' eax=3D'0x00001000'/>
   </feature>
   <feature name=3D'vmx-cr3-load-noexit'>
-    <msr index=3D'0x48e' edx=3D'0x00000000' eax=3D'0x00008000'/>
+    <msr index=3D'0x0000048e' edx=3D'0x00000000' eax=3D'0x00008000'/>
   </feature>
   <feature name=3D'vmx-cr3-store-noexit'>
-    <msr index=3D'0x48e' edx=3D'0x00000000' eax=3D'0x00010000'/>
+    <msr index=3D'0x0000048e' edx=3D'0x00000000' eax=3D'0x00010000'/>
   </feature>
   <feature name=3D'vmx-cr8-load-exit'>
-    <msr index=3D'0x48e' edx=3D'0x00000000' eax=3D'0x00080000'/>
+    <msr index=3D'0x0000048e' edx=3D'0x00000000' eax=3D'0x00080000'/>
   </feature>
   <feature name=3D'vmx-cr8-store-exit'>
-    <msr index=3D'0x48e' edx=3D'0x00000000' eax=3D'0x00100000'/>
+    <msr index=3D'0x0000048e' edx=3D'0x00000000' eax=3D'0x00100000'/>
   </feature>
   <feature name=3D'vmx-flexpriority'>
-    <msr index=3D'0x48e' edx=3D'0x00000000' eax=3D'0x00200000'/>
+    <msr index=3D'0x0000048e' edx=3D'0x00000000' eax=3D'0x00200000'/>
   </feature>
   <feature name=3D'vmx-vnmi-pending'>
-    <msr index=3D'0x48e' edx=3D'0x00000000' eax=3D'0x00400000'/>
+    <msr index=3D'0x0000048e' edx=3D'0x00000000' eax=3D'0x00400000'/>
   </feature>
   <feature name=3D'vmx-movdr-exit'>
-    <msr index=3D'0x48e' edx=3D'0x00000000' eax=3D'0x00800000'/>
+    <msr index=3D'0x0000048e' edx=3D'0x00000000' eax=3D'0x00800000'/>
   </feature>
   <feature name=3D'vmx-io-exit'>
-    <msr index=3D'0x48e' edx=3D'0x00000000' eax=3D'0x01000000'/>
+    <msr index=3D'0x0000048e' edx=3D'0x00000000' eax=3D'0x01000000'/>
   </feature>
   <feature name=3D'vmx-io-bitmap'>
-    <msr index=3D'0x48e' edx=3D'0x00000000' eax=3D'0x02000000'/>
+    <msr index=3D'0x0000048e' edx=3D'0x00000000' eax=3D'0x02000000'/>
   </feature>
   <feature name=3D'vmx-mtf'>
-    <msr index=3D'0x48e' edx=3D'0x00000000' eax=3D'0x08000000'/>
+    <msr index=3D'0x0000048e' edx=3D'0x00000000' eax=3D'0x08000000'/>
   </feature>
   <feature name=3D'vmx-msr-bitmap'>
-    <msr index=3D'0x48e' edx=3D'0x00000000' eax=3D'0x10000000'/>
+    <msr index=3D'0x0000048e' edx=3D'0x00000000' eax=3D'0x10000000'/>
   </feature>
   <feature name=3D'vmx-monitor-exit'>
-    <msr index=3D'0x48e' edx=3D'0x00000000' eax=3D'0x20000000'/>
+    <msr index=3D'0x0000048e' edx=3D'0x00000000' eax=3D'0x20000000'/>
   </feature>
   <feature name=3D'vmx-pause-exit'>
-    <msr index=3D'0x48e' edx=3D'0x00000000' eax=3D'0x40000000'/>
+    <msr index=3D'0x0000048e' edx=3D'0x00000000' eax=3D'0x40000000'/>
   </feature>
   <feature name=3D'vmx-secondary-ctls'>
-    <msr index=3D'0x48e' edx=3D'0x00000000' eax=3D'0x80000000'/>
+    <msr index=3D'0x0000048e' edx=3D'0x00000000' eax=3D'0x80000000'/>
   </feature>
=20
   <feature name=3D'vmx-exit-nosave-debugctl'>
-    <msr index=3D'0x48f' edx=3D'0x00000000' eax=3D'0x00000004'/>
+    <msr index=3D'0x0000048f' edx=3D'0x00000000' eax=3D'0x00000004'/>
   </feature>
   <feature name=3D'vmx-exit-load-perf-global-ctrl'>
-    <msr index=3D'0x48f' edx=3D'0x00000000' eax=3D'0x00001000'/>
+    <msr index=3D'0x0000048f' edx=3D'0x00000000' eax=3D'0x00001000'/>
   </feature>
   <feature name=3D'vmx-exit-ack-intr'>
-    <msr index=3D'0x48f' edx=3D'0x00000000' eax=3D'0x00008000'/>
+    <msr index=3D'0x0000048f' edx=3D'0x00000000' eax=3D'0x00008000'/>
   </feature>
   <feature name=3D'vmx-exit-save-pat'>
-    <msr index=3D'0x48f' edx=3D'0x00000000' eax=3D'0x00040000'/>
+    <msr index=3D'0x0000048f' edx=3D'0x00000000' eax=3D'0x00040000'/>
   </feature>
   <feature name=3D'vmx-exit-load-pat'>
-    <msr index=3D'0x48f' edx=3D'0x00000000' eax=3D'0x00080000'/>
+    <msr index=3D'0x0000048f' edx=3D'0x00000000' eax=3D'0x00080000'/>
   </feature>
   <feature name=3D'vmx-exit-save-efer'>
-    <msr index=3D'0x48f' edx=3D'0x00000000' eax=3D'0x00100000'/>
+    <msr index=3D'0x0000048f' edx=3D'0x00000000' eax=3D'0x00100000'/>
   </feature>
   <feature name=3D'vmx-exit-load-efer'>
-    <msr index=3D'0x48f' edx=3D'0x00000000' eax=3D'0x00200000'/>
+    <msr index=3D'0x0000048f' edx=3D'0x00000000' eax=3D'0x00200000'/>
   </feature>
   <feature name=3D'vmx-exit-save-preemption-timer'>
-    <msr index=3D'0x48f' edx=3D'0x00000000' eax=3D'0x00400000'/>
+    <msr index=3D'0x0000048f' edx=3D'0x00000000' eax=3D'0x00400000'/>
   </feature>
   <feature name=3D'vmx-exit-clear-bndcfgs'>
-    <msr index=3D'0x48f' edx=3D'0x00000000' eax=3D'0x00800000'/>
+    <msr index=3D'0x0000048f' edx=3D'0x00000000' eax=3D'0x00800000'/>
   </feature>
   <feature name=3D'vmx-exit-clear-rtit-ctl'>
-    <msr index=3D'0x48f' edx=3D'0x00000000' eax=3D'0x02000000'/>
+    <msr index=3D'0x0000048f' edx=3D'0x00000000' eax=3D'0x02000000'/>
   </feature>
   <feature name=3D'vmx-exit-load-pkrs'>
-    <msr index=3D'0x48f' edx=3D'0x00000000' eax=3D'0x20000000'/>
+    <msr index=3D'0x0000048f' edx=3D'0x00000000' eax=3D'0x20000000'/>
   </feature>
=20
   <feature name=3D'vmx-entry-noload-debugctl'>
-    <msr index=3D'0x490' edx=3D'0x00000000' eax=3D'0x00000004'/>
+    <msr index=3D'0x00000490' edx=3D'0x00000000' eax=3D'0x00000004'/>
   </feature>
   <feature name=3D'vmx-entry-ia32e-mode'>
-    <msr index=3D'0x490' edx=3D'0x00000000' eax=3D'0x00000200'/>
+    <msr index=3D'0x00000490' edx=3D'0x00000000' eax=3D'0x00000200'/>
   </feature>
   <feature name=3D'vmx-entry-load-perf-global-ctrl'>
-    <msr index=3D'0x490' edx=3D'0x00000000' eax=3D'0x00002000'/>
+    <msr index=3D'0x00000490' edx=3D'0x00000000' eax=3D'0x00002000'/>
   </feature>
   <feature name=3D'vmx-entry-load-pat'>
-    <msr index=3D'0x490' edx=3D'0x00000000' eax=3D'0x00004000'/>
+    <msr index=3D'0x00000490' edx=3D'0x00000000' eax=3D'0x00004000'/>
   </feature>
   <feature name=3D'vmx-entry-load-efer'>
-    <msr index=3D'0x490' edx=3D'0x00000000' eax=3D'0x00008000'/>
+    <msr index=3D'0x00000490' edx=3D'0x00000000' eax=3D'0x00008000'/>
   </feature>
   <feature name=3D'vmx-entry-load-bndcfgs'>
-    <msr index=3D'0x490' edx=3D'0x00000000' eax=3D'0x00010000'/>
+    <msr index=3D'0x00000490' edx=3D'0x00000000' eax=3D'0x00010000'/>
   </feature>
   <feature name=3D'vmx-entry-load-rtit-ctl'>
-    <msr index=3D'0x490' edx=3D'0x00000000' eax=3D'0x00040000'/>
+    <msr index=3D'0x00000490' edx=3D'0x00000000' eax=3D'0x00040000'/>
   </feature>
   <feature name=3D'vmx-entry-load-pkrs'>
-    <msr index=3D'0x490' edx=3D'0x00000000' eax=3D'0x00400000'/>
+    <msr index=3D'0x00000490' edx=3D'0x00000000' eax=3D'0x00400000'/>
   </feature>
=20
   <feature name=3D'vmx-eptp-switching'>
-    <msr index=3D'0x491' edx=3D'0x00000000' eax=3D'0x00000001'/>
+    <msr index=3D'0x00000491' edx=3D'0x00000000' eax=3D'0x00000001'/>
   </feature>
 </cpus>
--=20
2.43.0
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org
From nobody Thu May  9 14:36:01 2024
Delivered-To: importer@patchew.org
Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied
 by domain of lists.libvirt.org) client-ip=8.43.85.245;
 envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org;
Authentication-Results: mx.zohomail.com;
	spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain
 of lists.libvirt.org)  smtp.mailfrom=devel-bounces@lists.libvirt.org;
	dmarc=fail(p=none dis=none)  header.from=redhat.com
Return-Path: <devel-bounces@lists.libvirt.org>
Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by
 mx.zohomail.com
	with SMTPS id 1707130310733867.4962591071002;
 Mon, 5 Feb 2024 02:51:50 -0800 (PST)
Received: by lists.libvirt.org (Postfix, from userid 996)
	id A19EF1D29; Mon,  5 Feb 2024 05:51:49 -0500 (EST)
Received: from lists.libvirt.org.85.43.8.in-addr.arpa (localhost [IPv6:::1])
	by lists.libvirt.org (Postfix) with ESMTP id D40AC1D84;
	Mon,  5 Feb 2024 05:45:19 -0500 (EST)
Received: by lists.libvirt.org (Postfix, from userid 996)
	id 1AECC1B84; Mon,  5 Feb 2024 05:44:31 -0500 (EST)
Received: from us-smtp-delivery-124.mimecast.com
 (us-smtp-delivery-124.mimecast.com [170.10.133.124])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by lists.libvirt.org (Postfix) with ESMTPS id A574D1B82
	for <devel@lists.libvirt.org>; Mon,  5 Feb 2024 05:44:29 -0500 (EST)
Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com
 [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS
 (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id
 us-mta-166-tOkNWcHdOmWtWEbepaqGxw-1; Mon, 05 Feb 2024 05:44:28 -0500
Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com
 [10.11.54.4])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest
 SHA256)
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D3EF0185A782
	for <devel@lists.libvirt.org>; Mon,  5 Feb 2024 10:44:27 +0000 (UTC)
Received: from work.redhat.com (unknown [10.39.194.112])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 6A8462026D66;
	Mon,  5 Feb 2024 10:44:27 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org
X-Spam-Level: 
X-Spam-Status: No,
 score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5,
	RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE
	autolearn=unavailable autolearn_force=no version=3.4.4
X-MC-Unique: tOkNWcHdOmWtWEbepaqGxw-1
From: Tim Wiederhake <twiederh@redhat.com>
To: devel@lists.libvirt.org
Subject: [PATCH v2 3/4] cpu_map: Format comments
Date: Mon,  5 Feb 2024 11:44:23 +0100
Message-ID: <20240205104424.80104-4-twiederh@redhat.com>
In-Reply-To: <20240205104424.80104-1-twiederh@redhat.com>
References: <20240205104424.80104-1-twiederh@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Message-ID-Hash: G5GKFZS7E2ZLQENZDQUVSVT43JZOJ6FD
X-Message-ID-Hash: G5GKFZS7E2ZLQENZDQUVSVT43JZOJ6FD
X-MailFrom: twiederh@redhat.com
X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency;
 loop; banned-address; member-moderation; header-match-config-1;
 header-match-config-2; header-match-config-3;
 header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia;
 implicit-dest; max-recipients; max-size; news-moderation; no-subject;
 suspicious-header
CC: Tim Wiederhake <twiederh@redhat.com>
X-Mailman-Version: 3.2.2
Precedence: list
List-Id: Development discussions about the libvirt library & tools
 <devel.lists.libvirt.org>
Archived-At: 
 <https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/message/G5GKFZS7E2ZLQENZDQUVSVT43JZOJ6FD/>
List-Archive: 
 <https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/>
List-Help: <mailto:devel-request@lists.libvirt.org?subject=help>
List-Post: <mailto:devel@lists.libvirt.org>
List-Subscribe: <mailto:devel-join@lists.libvirt.org>
List-Unsubscribe: <mailto:devel-leave@lists.libvirt.org>
Content-Type: text/plain; charset="utf-8"; x-default="true"
Content-Transfer-Encoding: quoted-printable
X-ZM-MESSAGEID: 1707130311534100001

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
---
 src/cpu_map/x86_features.xml | 50 ++++++++++++++++++++++++------------
 1 file changed, 33 insertions(+), 17 deletions(-)

diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
index b89bd5a2fa..8d1dbe68e8 100644
--- a/src/cpu_map/x86_features.xml
+++ b/src/cpu_map/x86_features.xml
@@ -5,7 +5,8 @@
=20
 -->
 <cpus>
-  <!-- standard features, ECX -->
+
+  <!-- cpuid level 0x00000001 (ecx) -->
   <feature name=3D'pni'>
     <alias name=3D'sse3' source=3D'qemu'/>
     <cpuid eax_in=3D'0x00000001' ecx=3D'0x00000001'/>
@@ -104,7 +105,7 @@
     <cpuid eax_in=3D'0x00000001' ecx=3D'0x80000000'/>
   </feature>
=20
-  <!-- standard features, EDX -->
+  <!-- cpuid level 0x00000001 (edx) -->
   <feature name=3D'fpu'>
     <cpuid eax_in=3D'0x00000001' edx=3D'0x00000001'/>
   </feature>
@@ -196,12 +197,12 @@
     <cpuid eax_in=3D'0x00000001' edx=3D'0x80000000'/>
   </feature>
=20
-  <!-- Termal Power and Management -->
+  <!-- cpuid level 0x00000006 (eax) -->
   <feature name=3D'arat'>
     <cpuid eax_in=3D'0x00000006' eax=3D'0x00000004'/>
   </feature>
=20
-  <!-- cpuid function 0x7 ecx 0x0 features -->
+  <!-- cpuid level 0x00000007, 0x0000 (ebx) -->
   <feature name=3D'fsgsbase'>
     <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ebx=3D'0x00000001'/>
   </feature>
@@ -292,6 +293,7 @@
     <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ebx=3D'0x80000000'/>
   </feature>
=20
+  <!-- cpuid level 0x00000007, 0x0000 (ecx) -->
   <feature name=3D'avx512vbmi'>
     <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ecx=3D'0x00000002'/>
   </feature>
@@ -353,6 +355,7 @@
     <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ecx=3D'0x80000000'/>
   </feature>
=20
+  <!-- cpuid level 0x00000007, 0x0000 (edx) -->
   <feature name=3D'avx512-4vnniw'>
     <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' edx=3D'0x00000004'/>
   </feature>
@@ -413,6 +416,7 @@
     <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' edx=3D'0x80000000'/>
   </feature>
=20
+  <!-- cpuid level 0x00000007, 0x0001 (eax) -->
   <feature name=3D'avx-vnni'>
     <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000001' eax=3D'0x00000010'/>
   </feature>
@@ -438,6 +442,7 @@
     <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000001' eax=3D'0x00800000'/>
   </feature>
=20
+  <!-- cpuid level 0x00000007, 0x0001 (edx) -->
   <feature name=3D'avx-vnni-int8'>
     <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000001' edx=3D'0x00000010'/>
   </feature>
@@ -451,11 +456,12 @@
     <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000001' edx=3D'0x00004000'/>
   </feature>
=20
+  <!-- cpuid level 0x00000007, 0x0002 (edx) -->
   <feature name=3D'mcdt-no'>
     <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000002' edx=3D'0x00000020'/>
   </feature>
=20
-  <!-- Processor Extended State Enumeration sub leaf 1 -->
+  <!-- cpuid level 0x0000000d, 0x0001 (eax) -->
   <feature name=3D'xsaveopt'>
     <cpuid eax_in=3D'0x0000000d' ecx_in=3D'0x00000001' eax=3D'0x00000001'/>
   </feature>
@@ -472,7 +478,7 @@
     <cpuid eax_in=3D'0x0000000d' ecx_in=3D'0x00000001' eax=3D'0x00000010'/>
   </feature>
=20
-  <!-- cpuid level 0x0000000f:1 (edx) -->
+  <!-- cpuid level 0x0000000f, 0x0001 (edx) -->
   <feature name=3D'mbm_total'>
     <cpuid eax_in=3D'0x0000000f' ecx_in=3D'0x00000001' edx=3D'0x00000002'/>
   </feature>
@@ -480,7 +486,7 @@
     <cpuid eax_in=3D'0x0000000f' ecx_in=3D'0x00000001' edx=3D'0x00000004'/>
   </feature>
=20
-  <!-- cpuid level 0x00000012 ecx 0x0 features -->
+  <!-- cpuid level 0x00000012, 0x0000 (eax) -->
   <feature name=3D'sgx1'>
     <cpuid eax_in=3D'0x00000012' ecx_in=3D'0x00000000' eax=3D'0x00000001'/>
   </feature>
@@ -491,11 +497,12 @@
     <cpuid eax_in=3D'0x00000012' ecx_in=3D'0x00000000' eax=3D'0x00000800'/>
   </feature>
=20
+  <!-- cpuid level 0x00000012, 0x0000 (ebx) -->
   <feature name=3D'sgx-exinfo'>
     <cpuid eax_in=3D'0x00000012' ecx_in=3D'0x00000000' ebx=3D'0x00000001'/>
   </feature>
=20
-  <!-- cpuid level 0x00000012 ecx 0x1 features -->
+  <!-- cpuid level 0x00000012, 0x0001 (eax) -->
   <feature name=3D'sgx-debug'>
     <cpuid eax_in=3D'0x00000012' ecx_in=3D'0x00000001' eax=3D'0x00000002'/>
   </feature>
@@ -515,12 +522,12 @@
     <cpuid eax_in=3D'0x00000012' ecx_in=3D'0x00000001' eax=3D'0x00000400'/>
   </feature>
=20
-  <!-- cpuid level 0x00000014 ecx 0x0 features -->
+  <!-- cpuid level 0x00000014, 0x0000 (ecx) -->
   <feature name=3D'intel-pt-lip'>
     <cpuid eax_in=3D'0x00000014' ecx_in=3D'0x00000000' ecx=3D'0x80000000'/>
   </feature>
=20
-  <!-- extended features, ECX -->
+  <!-- cpuid level 0x80000001 (ecx) -->
   <feature name=3D'lahf_lm'>
     <alias name=3D'lahf-lm' source=3D'qemu'/>
     <cpuid eax_in=3D'0x80000001' ecx=3D'0x00000001'/>
@@ -596,7 +603,7 @@
     <cpuid eax_in=3D'0x80000001' ecx=3D'0x01000000'/>
   </feature>
=20
-  <!-- extended features, EDX -->
+  <!-- cpuid level 0x80000001 (edx) -->
   <feature name=3D'syscall'>
     <cpuid eax_in=3D'0x80000001' edx=3D'0x00000800'/>
   </feature>
@@ -629,12 +636,12 @@
     <cpuid eax_in=3D'0x80000001' edx=3D'0x80000000'/>
   </feature>
=20
-  <!-- Advanced Power Management edx features -->
+  <!-- cpuid level 0x80000007 (edx) -->
   <feature name=3D'invtsc' migratable=3D'no'>
     <cpuid eax_in=3D'0x80000007' edx=3D'0x00000100'/>
   </feature>
=20
-  <!-- More AMD-specific features -->
+  <!-- cpuid level 0x80000008 (ebx) -->
   <feature name=3D'clzero'>
     <cpuid eax_in=3D'0x80000008' ebx=3D'0x00000001'/>
   </feature>
@@ -669,7 +676,7 @@
     <cpuid eax_in=3D'0x80000008' ebx=3D'0x10000000'/>
   </feature>
=20
-  <!-- SVM features -->
+  <!-- cpuid level 0x8000000a (edx) -->
   <feature name=3D'npt'>
     <cpuid eax_in=3D'0x8000000a' edx=3D'0x00000001'/>
   </feature>
@@ -721,7 +728,7 @@
     <cpuid eax_in=3D'0x8000000a' edx=3D'0x10000000'/>
   </feature>
=20
-  <!-- cpuid level 0x80000021 ecx 0x0 features -->
+  <!-- cpuid level 0x80000021 (eax) -->
   <feature name=3D'no-nested-data-bp'>
     <cpuid eax_in=3D'0x80000021' eax=3D'0x00000001'/>
   </feature>
@@ -735,12 +742,12 @@
     <cpuid eax_in=3D'0x80000021' eax=3D'0x00000100'/>
   </feature>
=20
-  <!-- IA32_CORE_CAPABILITIES features -->
+  <!-- msr 0x000000cf -->
   <feature name=3D'split-lock-detect'>
     <msr index=3D'0x000000cf' edx=3D'0x00000000' eax=3D'0x00000020'/>
   </feature>
=20
-  <!-- IA32_ARCH_CAPABILITIES features -->
+  <!-- msr 0x0000010a -->
   <feature name=3D'rdctl-no'>
     <msr index=3D'0x0000010a' edx=3D'0x00000000' eax=3D'0x00000001'/>
   </feature>
@@ -787,6 +794,7 @@
     <msr index=3D'0x0000010a' edx=3D'0x00000000' eax=3D'0x04000000'/>
   </feature>
=20
+  <!-- msr 0x00000480 -->
   <feature name=3D'vmx-ins-outs'>
     <msr index=3D'0x00000480' edx=3D'0x00400000' eax=3D'0x00000000'/>
   </feature>
@@ -797,6 +805,7 @@
     <msr index=3D'0x00000480' edx=3D'0x01000000' eax=3D'0x00000000'/>
   </feature>
=20
+  <!-- msr 0x00000485 -->
   <feature name=3D'vmx-store-lma'>
     <msr index=3D'0x00000485' edx=3D'0x00000000' eax=3D'0x00000020'/>
   </feature>
@@ -816,6 +825,7 @@
     <msr index=3D'0x00000485' edx=3D'0x00000000' eax=3D'0x40000000'/>
   </feature>
=20
+  <!-- msr 0x0000048b -->
   <feature name=3D'vmx-apicv-xapic'>
     <msr index=3D'0x0000048b' edx=3D'0x00000000' eax=3D'0x00000001'/>
   </feature>
@@ -880,6 +890,7 @@
     <msr index=3D'0x0000048b' edx=3D'0x00000000' eax=3D'0x04000000'/>
   </feature>
=20
+  <!-- msr 0x0000048c -->
   <feature name=3D'vmx-ept-execonly'>
     <msr index=3D'0x0000048c' edx=3D'0x00000000' eax=3D'0x00000001'/>
   </feature>
@@ -933,6 +944,7 @@
     <msr index=3D'0x0000048c' edx=3D'0x00000800' eax=3D'0x00000000'/>
   </feature>
=20
+  <!-- msr 0x0000048d -->
   <feature name=3D'vmx-intr-exit'>
     <msr index=3D'0x0000048d' edx=3D'0x00000000' eax=3D'0x00000001'/>
   </feature>
@@ -949,6 +961,7 @@
     <msr index=3D'0x0000048d' edx=3D'0x00000000' eax=3D'0x00000080'/>
   </feature>
=20
+  <!-- msr 0x0000048e -->
   <feature name=3D'vmx-vintr-pending'>
     <msr index=3D'0x0000048e' edx=3D'0x00000000' eax=3D'0x00000004'/>
   </feature>
@@ -1013,6 +1026,7 @@
     <msr index=3D'0x0000048e' edx=3D'0x00000000' eax=3D'0x80000000'/>
   </feature>
=20
+  <!-- msr 0x0000048f -->
   <feature name=3D'vmx-exit-nosave-debugctl'>
     <msr index=3D'0x0000048f' edx=3D'0x00000000' eax=3D'0x00000004'/>
   </feature>
@@ -1047,6 +1061,7 @@
     <msr index=3D'0x0000048f' edx=3D'0x00000000' eax=3D'0x20000000'/>
   </feature>
=20
+  <!-- msr 0x00000490 -->
   <feature name=3D'vmx-entry-noload-debugctl'>
     <msr index=3D'0x00000490' edx=3D'0x00000000' eax=3D'0x00000004'/>
   </feature>
@@ -1072,6 +1087,7 @@
     <msr index=3D'0x00000490' edx=3D'0x00000000' eax=3D'0x00400000'/>
   </feature>
=20
+  <!-- msr 0x00000491 -->
   <feature name=3D'vmx-eptp-switching'>
     <msr index=3D'0x00000491' edx=3D'0x00000000' eax=3D'0x00000001'/>
   </feature>
--=20
2.43.0
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org
From nobody Thu May  9 14:36:01 2024
Delivered-To: importer@patchew.org
Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied
 by domain of lists.libvirt.org) client-ip=8.43.85.245;
 envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org;
Authentication-Results: mx.zohomail.com;
	spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain
 of lists.libvirt.org)  smtp.mailfrom=devel-bounces@lists.libvirt.org;
	dmarc=fail(p=none dis=none)  header.from=redhat.com
Return-Path: <devel-bounces@lists.libvirt.org>
Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by
 mx.zohomail.com
	with SMTPS id 1707130546253545.2014074103687;
 Mon, 5 Feb 2024 02:55:46 -0800 (PST)
Received: by lists.libvirt.org (Postfix, from userid 996)
	id 2CCF91C5A; Mon,  5 Feb 2024 05:55:45 -0500 (EST)
Received: from lists.libvirt.org.85.43.8.in-addr.arpa (localhost [IPv6:::1])
	by lists.libvirt.org (Postfix) with ESMTP id C438E1D89;
	Mon,  5 Feb 2024 05:45:21 -0500 (EST)
Received: by lists.libvirt.org (Postfix, from userid 996)
	id 3D1641BF1; Mon,  5 Feb 2024 05:44:34 -0500 (EST)
Received: from us-smtp-delivery-124.mimecast.com
 (us-smtp-delivery-124.mimecast.com [170.10.129.124])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by lists.libvirt.org (Postfix) with ESMTPS id 2488B1B80
	for <devel@lists.libvirt.org>; Mon,  5 Feb 2024 05:44:31 -0500 (EST)
Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73])
 by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,
 cipher=TLS_AES_256_GCM_SHA384) id us-mta-231-ga2Ytp5UMFCMMoDH5gkLdA-1; Mon,
 05 Feb 2024 05:44:28 -0500
Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com
 [10.11.54.4])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest
 SHA256)
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7CBC61C06908
	for <devel@lists.libvirt.org>; Mon,  5 Feb 2024 10:44:28 +0000 (UTC)
Received: from work.redhat.com (unknown [10.39.194.112])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 124A02026D66;
	Mon,  5 Feb 2024 10:44:27 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org
X-Spam-Level: 
X-Spam-Status: No,
 score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,
	T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no
	version=3.4.4
X-MC-Unique: ga2Ytp5UMFCMMoDH5gkLdA-1
From: Tim Wiederhake <twiederh@redhat.com>
To: devel@lists.libvirt.org
Subject: [PATCH v2 4/4] cpu_map: Rewrite feature sync script
Date: Mon,  5 Feb 2024 11:44:24 +0100
Message-ID: <20240205104424.80104-5-twiederh@redhat.com>
In-Reply-To: <20240205104424.80104-1-twiederh@redhat.com>
References: <20240205104424.80104-1-twiederh@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Message-ID-Hash: NQDVUIMJAPQVCYNADSNGD77CDDU65A75
X-Message-ID-Hash: NQDVUIMJAPQVCYNADSNGD77CDDU65A75
X-MailFrom: twiederh@redhat.com
X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency;
 loop; banned-address; member-moderation; header-match-config-1;
 header-match-config-2; header-match-config-3;
 header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia;
 implicit-dest; max-recipients; max-size; news-moderation; no-subject;
 suspicious-header
CC: Tim Wiederhake <twiederh@redhat.com>
X-Mailman-Version: 3.2.2
Precedence: list
List-Id: Development discussions about the libvirt library & tools
 <devel.lists.libvirt.org>
Archived-At: 
 <https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/message/NQDVUIMJAPQVCYNADSNGD77CDDU65A75/>
List-Archive: 
 <https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/>
List-Help: <mailto:devel-request@lists.libvirt.org?subject=help>
List-Post: <mailto:devel@lists.libvirt.org>
List-Subscribe: <mailto:devel-join@lists.libvirt.org>
List-Unsubscribe: <mailto:devel-leave@lists.libvirt.org>
Content-Type: text/plain; charset="utf-8"; x-default="true"
Content-Transfer-Encoding: quoted-printable
X-ZM-MESSAGEID: 1707130546769100001

Previously, the script would only detect differences between
libvirt's and qemu's list of x86 features, adding those features
to libvirt was a manual and error prone procedure.

Replace with a script that can generate libvirt's feature list
directly from qemu source code.
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
---
 src/cpu_map/sync_qemu_features_i386.py | 627 ++++++++++++++++++-------
 src/cpu_map/x86_features.xml           |   7 +-
 2 files changed, 461 insertions(+), 173 deletions(-)

diff --git a/src/cpu_map/sync_qemu_features_i386.py b/src/cpu_map/sync_qemu=
_features_i386.py
index dcd58cd590..e4b1f7275a 100755
--- a/src/cpu_map/sync_qemu_features_i386.py
+++ b/src/cpu_map/sync_qemu_features_i386.py
@@ -1,190 +1,479 @@
 #!/usr/bin/env python3
=20
 import argparse
-import json
-import subprocess
-import xml.etree.ElementTree
-
-
-def ignore_feature(feature):
-    ignored_features =3D [
-        # VIA/Cyrix/Centaur-defined CPU features
-        # CPUID level 0xC0000001, word 5
-        "ace2",
-        "ace2-en",
-        "phe",
-        "phe-en",
-        "pmm",
-        "pmm-en",
-        "xcrypt",
-        "xcrypt-en",
-        "xstore",
-        "xstore-en",
-
-        # non-features
-        "check",
-        "cpuid-0xb",
-        "enforce",
-        "fill-mtrr-mask",
-        "full-cpuid-auto-level",
-        "full-width-write",
-        "host-cache-info",
-        "host-phys-bits",
-        "hotpluggable",
-        "hotplugged",
-        "hv-apicv",
-        "hv-avic",
-        "hv-crash",
-        "hv-emsr-bitmap",
-        "hv-enforce-cpuid",
-        "hv-evmcs",
-        "hv-frequencies",
-        "hv-ipi",
-        "hv-passthrough",
-        "hv-reenlightenment",
-        "hv-relaxed",
-        "hv-reset",
-        "hv-runtime",
-        "hv-stimer",
-        "hv-stimer-direct",
-        "hv-syndbg",
-        "hv-synic",
-        "hv-time",
-        "hv-tlbflush",
-        "hv-tlbflush-direct",
-        "hv-tlbflush-ext",
-        "hv-vapic",
-        "hv-vpindex",
-        "hv-xmm-input",
-        "kvm",
-        "kvm-asyncpf",
-        "kvm-asyncpf-int",
-        "kvm-hint-dedicated",
-        "kvm-mmu",
-        "kvm-msi-ext-dest-id",
-        "kvm-no-smi-migration",
-        "kvm-nopiodelay",
-        "kvm-poll-control",
-        "kvm-pv-enforce-cpuid",
-        "kvm-pv-eoi",
-        "kvm-pv-ipi",
-        "kvm-pv-sched-yield",
-        "kvm-pv-tlb-flush",
-        "kvm-pv-unhalt",
-        "kvm-steal-time",
-        "kvm_asyncpf",
-        "kvm_asyncpf_int",
-        "kvm_mmu",
-        "kvm_nopiodelay",
-        "kvm_poll_control",
-        "kvm_pv_eoi",
-        "kvm_pv_unhalt",
-        "kvm_steal_time",
-        "kvmclock",
-        "kvmclock-stable-bit",
-        "l3-cache",
-        "legacy-cache",
-        "lmce",
-        "migratable",
-        "pmu",
-        "realized",
-        "start-powered-off",
-        "tcg-cpuid",
-        "vmware-cpuid-freq",
-        "xen-vapic",
-    ]
-
-    if feature["type"] !=3D "bool":
-        return True
-
-    name =3D feature["name"]
-
-    if name.startswith("x-"):
-        return True
-
-    if name in ignored_features:
-        return True
-
-    return False
-
-
-def get_qemu_feature_list(path_to_qemu):
-    cmd =3D [
-        path_to_qemu,
-        "-machine", "accel=3Dkvm",
-        "-cpu", "host",
-        "-nodefaults",
-        "-nographic",
-        "-qmp",
-        "stdio"
-    ]
-
-    request =3D """
-    {
-        "execute": "qmp_capabilities"
-    }
-    {
-        "execute": "qom-list-properties",
-        "arguments": {
-            "typename": "max-x86_64-cpu"
-        },
-        "id": "qom-list-properties"
-    }
-    {
-        "execute": "quit"
+import os
+import re
+
+
+# features in qemu that we do not want in libvirt
+FEATURES_IGNORE =3D (
+    "kvm-asyncpf",
+    "kvm-asyncpf-int",
+    "kvm-hint-dedicated",
+    "kvm-mmu",
+    "kvm-msi-ext-dest-id",
+    "kvm-nopiodelay",
+    "kvm-poll-control",
+    "kvm-pv-eoi",
+    "kvm-pv-ipi",
+    "kvm-pv-sched-yield",
+    "kvm-pv-tlb-flush",
+    "kvm-pv-unhalt",
+    "kvm-steal-time",
+    "kvmclock",
+    "kvmclock-stable-bit",
+
+    "xstore",
+    "xstore-en",
+    "xcrypt",
+    "xcrypt-en",
+    "ace2",
+    "ace2-en",
+    "phe",
+    "phe-en",
+    "pmm",
+    "pmm-en",
+
+    "full-width-write",
+)
+
+
+# features in libvirt, that qemu does not know. as python cannot use dicts
+# as keys in other dicts, use tuples. three-tuples "eax, ecx, register nam=
e"
+# for cpuid features; one-tuples "index" for msrs. The values for the dict=
 are
+# mappings from "bit index" to "feature name".
+FEATURES_EXTRA =3D {
+    (0x00000001, None, "ecx"): {
+        27: "osxsave",
+    },
+    (0x00000007, 0x0000, "ebx"): {
+        12: "cmt",
+    },
+    (0x00000007, 0x0000, "ecx"): {
+        4: "ospke",
+    },
+    (0x00000007, 0x0000, "edx"): {
+        18: "pconfig",
+    },
+    (0x0000000f, 0x0001, "edx"): {
+        1: "mbm_total",
+        2: "mbm_local",
+    },
+    (0x80000001, None, "ecx"): {
+        18: "cvt16",
+    },
+    (0x0000048c,): {
+        8: "vmx-ept-uc",
+        14: "vmx-ept-wb",
+        41: "vmx-invvpid-single-context",               # wrong name in qe=
mu
+        43: "vmx-invvpid-single-context-noglobals",     # wrong name in qe=
mu
     }
-    """
-
-    decoder =3D json.JSONDecoder()
-    output =3D subprocess.check_output(cmd, input=3Drequest, text=3DTrue)
-    while output:
-        obj, idx =3D decoder.raw_decode(output)
-        output =3D output[idx:].strip()
-        if obj.get("id") !=3D "qom-list-properties":
+}
+
+
+# alias information to add to generated file
+FEATURES_ALIASES =3D {
+    "arch-capabilities": (
+        ("arch_capabilities", "linux"),
+    ),
+    "cmp_legacy": (
+        ("cmp-legacy", "qemu"),
+    ),
+    "cmt": (
+        ("cqm", "linux"),
+    ),
+    "ds_cpl": (
+        ("ds-cpl", "qemu"),
+    ),
+    "fxsr_opt": (
+        ("ffxsr", "qemu"),
+        ("fxsr-opt", "qemu"),
+    ),
+    "lahf_lm": (
+        ("lahf-lm", "qemu"),
+    ),
+    "lm": (
+        ("i64", "qemu"),
+    ),
+    "md-clear": (
+        ("md_clear", "linux"),
+    ),
+    "nodeid_msr": (
+        ("nodeid-msr", "qemu"),
+    ),
+    "nrip-save": (
+        ("nrip_save", "qemu"),
+    ),
+    "nx": (
+        ("xd", "qemu"),
+    ),
+    "pause-filter": (
+        ("pause_filter", "qemu"),
+    ),
+    "pclmuldq": (
+        ("pclmulqdq", "qemu"),
+    ),
+    "perfctr_core": (
+        ("perfctr-core", "qemu"),
+    ),
+    "perfctr_nb": (
+        ("perfctr-nb", "qemu"),
+    ),
+    "pni": (
+        ("sse3", "qemu"),
+    ),
+    "sse4.1": (
+        ("sse4-1", "qemu"),
+        ("sse4_1", "qemu"),
+    ),
+    "sse4.2": (
+        ("sse4-2", "qemu"),
+        ("sse4_2", "qemu"),
+    ),
+    "svm-lock": (
+        ("svm_lock", "qemu"),
+    ),
+    "tsc-scale": (
+        ("tsc_scale", "qemu"),
+    ),
+    "tsc_adjust": (
+        ("tsc-adjust", "qemu"),
+    ),
+    "vmcb-clean": (
+        ("vmcb_clean", "qemu"),
+    ),
+    "vmx-invvpid-single-context-noglobals": (
+        ("vmx-invept-single-context-noglobals", "qemu"),
+    ),
+}
+
+
+# list non-migratable features here
+FEATURES_NON_MIGRATABLE =3D (
+    "xsaves",
+    "invtsc",
+)
+
+
+# mapping from "symbol name" to "value" for "#define"s in qemu source code
+_CONSTANTS =3D dict()
+
+
+# tree of known features. top level index is either "cpuid" or "msr".
+# further indices for cpuid: eax_in, ecx_in (may be `None`), register name
+# further indices for msr: index
+_FEATURES =3D dict()
+
+
+# fill _CONSTANTS with the #defines from qemu source code
+def read_headers(path):
+    pattern_define =3D re.compile("^#define\\s+(\\S+)\\s+(.*)$")
+
+    headers =3D (
+        "include/standard-headers/asm-x86/kvm_para.h",
+        "target/i386/cpu.h",
+    )
+
+    _CONSTANTS["true"] =3D "1"
+
+    for header in headers:
+        with open(os.path.join(path, header), "tr") as f:
+            for line in f.readlines():
+                match =3D pattern_define.match(line)
+                if match:
+                    key =3D match.group(1)
+                    val =3D match.group(2)
+                    _CONSTANTS[key] =3D val
+
+
+# add new cpuid feature bit
+def add_feature_cpuid(eax, ecx, reg, bit, name):
+    if not name:
+        return
+
+    if "cpuid" not in _FEATURES:
+        _FEATURES["cpuid"] =3D dict()
+
+    if eax not in _FEATURES["cpuid"]:
+        _FEATURES["cpuid"][eax] =3D dict()
+
+    if ecx not in _FEATURES["cpuid"][eax]:
+        _FEATURES["cpuid"][eax][ecx] =3D dict()
+
+    if reg not in _FEATURES["cpuid"][eax][ecx]:
+        _FEATURES["cpuid"][eax][ecx][reg] =3D dict()
+
+    _FEATURES["cpuid"][eax][ecx][reg][bit] =3D name
+
+
+# add new msr feature bit
+def add_feature_msr(msr, bit, name):
+    if not name:
+        return
+
+    if "msr" not in _FEATURES:
+        _FEATURES["msr"] =3D dict()
+
+    if msr not in _FEATURES["msr"]:
+        _FEATURES["msr"][msr] =3D dict()
+
+    _FEATURES["msr"][msr][bit] =3D name
+
+
+# add features from EXTRA_FEATURE to the list of known features
+def add_extra_features():
+    for key, val in FEATURES_EXTRA.items():
+        for bit, name in val.items():
+            if len(key) =3D=3D 3:
+                add_feature_cpuid(key[0], key[1], key[2], bit, name)
+            else:
+                add_feature_msr(key[0], bit, name)
+
+
+# add a feature from qemu to the list of known features. translates featur=
es
+# names according to FEATURE_ALIASES and applies symbolic values defined in
+# _CONSTANTS.
+def add_feature_qemu(query, data):
+    # split names into individual items
+    data =3D [n.strip() for n in "".join(data).split(",")]
+
+    names =3D dict()
+    if any([e.startswith("[") for e in data]):
+        for entry in data:
+            entry =3D entry.strip()
+            if not entry:
+                continue
+            index, name =3D entry.split("=3D", 2)
+            index =3D int(index.strip().strip("[").strip("]"), 0)
+            names[index] =3D name.strip().strip("\"")
+    else:
+        for index, name in enumerate(data):
+            if not name or name =3D=3D "NULL":
+                continue
+            name =3D name.strip("\"")
+            if name in FEATURES_IGNORE:
+                continue
+            names[index] =3D name.strip("\"")
+
+    # cut out part between "{" and "}". easiest way to get rid of unwanted
+    # extra info such as ".tcg_features" or multi line comments
+    query =3D "".join(query).split("{")[1].split("}")[0]
+
+    eax =3D None
+    ecx =3D None
+    reg =3D None
+    msr =3D None
+    for entry in [e.strip() for e in query.split(",")]:
+        if not entry:
             continue
-        for feature in obj["return"]:
-            if ignore_feature(feature):
+        left, right =3D [e.strip() for e in entry.split("=3D", 2)]
+        if left =3D=3D ".eax":
+            eax =3D int(_CONSTANTS.get(right, right), 0)
+        if left =3D=3D ".ecx":
+            ecx =3D int(_CONSTANTS.get(right, right), 0)
+        if left =3D=3D ".reg":
+            reg =3D right.lower()[2:]
+        if left =3D=3D ".index":
+            msr =3D int(_CONSTANTS.get(right, right), 0)
+
+    # qemu defines some empty feature words, filter them out
+    if not names:
+        return
+    if all([e is None for e in names.values()]):
+        return
+
+    # apply name translation and add to list of known features
+    for bit, name in sorted(names.items()):
+        for newname, data in FEATURES_ALIASES.items():
+            for oldname, source in data:
+                if name =3D=3D oldname and source =3D=3D "qemu":
+                    name =3D newname
+
+        if msr:
+            add_feature_msr(msr, bit, name)
+        else:
+            add_feature_cpuid(eax, ecx, reg, bit, name)
+
+
+# read the `feature_word_info` struct from qemu's cpu.c into a list of str=
ings
+def read_cpu_c(path):
+    pattern_comment =3D re.compile("/\\*.*?\\*/")
+    marker_begin =3D "FeatureWordInfo feature_word_info[FEATURE_WORDS] =3D=
 {\n"
+    marker_end =3D "};\n"
+
+    with open(os.path.join(path, "target/i386/cpu.c"), "tr") as f:
+        # skip until begin marker
+        while True:
+            line =3D f.readline()
+            if not line:
+                exit("begin marker not found in cpu.c")
+            if line =3D=3D marker_begin:
+                break
+
+        # read until end marker
+        while True:
+            line =3D f.readline()
+            if not line:
+                exit("end marker not found in cpu.c")
+            if line =3D=3D marker_end:
+                break
+
+            # remove comments and white space
+            line =3D re.sub(pattern_comment, "", line).strip()
+
+            yield line
+
+
+# simple state machine to extract feature names and definitions from extra=
cted
+# qemu source code
+def parse_feature_words(lines):
+    state_waiting_for_type =3D 1
+    state_waiting_for_names =3D 2
+    state_read_names =3D 3
+    state_waiting_for_query =3D 4
+    state_read_query =3D 5
+
+    pattern_type =3D re.compile("^\\.type\\s*=3D\\s*(.+)$")
+    pattern_names =3D re.compile("^\\.feat_names\\s*=3D\\s*{$")
+    pattern_data =3D re.compile("^\\.(cpuid|msr).*$")
+    pattern_end =3D re.compile("^},?$")
+
+    state =3D state_waiting_for_type
+    for line in lines:
+        if state =3D=3D state_waiting_for_type:
+            match =3D pattern_type.match(line)
+            if match:
+                data_names =3D list()
+                data_query =3D list()
+                state =3D state_waiting_for_names
+
+        elif state =3D=3D state_waiting_for_names:
+            # special case for missing ".feat_names" entry:
+            match =3D pattern_data.match(line)
+            if match:
+                data_query.append(line)
+                state =3D state_read_query
                 continue
-            yield feature["name"]
=20
+            match =3D pattern_names.match(line)
+            if match:
+                state =3D state_read_names
+
+        elif state =3D=3D state_read_names:
+            match =3D pattern_end.match(line)
+            if match:
+                state =3D state_waiting_for_query
+            else:
+                data_names.append(line)
+
+        elif state =3D=3D state_waiting_for_query:
+            match =3D pattern_data.match(line)
+            if match:
+                data_query.append(line)
+                state =3D state_read_query
+
+        elif state =3D=3D state_read_query:
+            match =3D pattern_end.match(line)
+            data_query.append(line)
+            if match:
+                state =3D state_waiting_for_type
+                add_feature_qemu(data_query, data_names)
+
+        else:
+            exit("parsing state machine in invalid state")
=20
-def get_libvirt_feature_list(path_to_featuresfile):
-    dom =3D xml.etree.ElementTree.parse(path_to_featuresfile)
-    for feature in dom.getroot().iter("feature"):
-        yield feature.get("name")
-        for alias in feature:
-            if alias.tag =3D=3D "alias" and alias.get("source") =3D=3D "qe=
mu":
-                yield alias.get("name")
+    if state !=3D state_waiting_for_type:
+        exit("parsing incomplete")
+
+
+# generate x86_features.xml from list of known features
+def write_output(path):
+    with open(path, "tw") as f:
+        f.write("<!--\n  Generated file, do not edit!\n  Use the ")
+        f.write("sync_qemu_features_i386.py script to make changes.\n-->\n=
\n")
+        f.write("<cpus>\n")
+
+        for eax in sorted(_FEATURES["cpuid"]):
+            for ecx in sorted(_FEATURES["cpuid"][eax]):
+                for reg in sorted(_FEATURES["cpuid"][eax][ecx]):
+                    f.write(f"\n  <!-- cpuid level 0x{eax:08x}")
+                    if ecx is not None:
+                        f.write(f", 0x{ecx:04x}")
+                    f.write(f" ({reg:s}) -->\n")
+
+                    names =3D sorted(_FEATURES["cpuid"][eax][ecx][reg].ite=
ms())
+                    for bit, name in names:
+                        mask =3D 1 << bit
+                        f.write(f"  <feature name=3D'{name}'")
+                        if name in FEATURES_NON_MIGRATABLE:
+                            f.write(" migratable=3D'no'")
+                        f.write(">\n")
+                        for alias in FEATURES_ALIASES.get(name, []):
+                            f.write(f"    <alias name=3D'{alias[0]}'")
+                            f.write(f" source=3D'{alias[1]}'/>\n")
+                        f.write(f"    <cpuid eax_in=3D'0x{eax:08x}' ")
+                        if ecx is not None:
+                            f.write(f"ecx_in=3D'0x{ecx:08x}' ")
+                        f.write(f"{reg:s}=3D'0x{mask:08x}'/>\n")
+                        f.write("  </feature>\n")
+
+        for msr in sorted(_FEATURES["msr"]):
+            f.write(f"\n  <!-- msr 0x{msr:08x} -->\n")
+            names =3D sorted(_FEATURES["msr"][msr].items())
+            for bit, name in names:
+                mask =3D 1 << bit
+                f.write(f"  <feature name=3D'{name}'")
+                if name in FEATURES_NON_MIGRATABLE:
+                    f.write(" migratable=3D'no'")
+                f.write(">\n")
+                for alias in FEATURES_ALIASES.get(name, []):
+                    f.write(f"    <alias name=3D'{alias[0]}'")
+                    f.write(f" source=3D'{alias[1]}'/>\n")
+                f.write(f"    <msr index=3D'0x{msr:08x}' ")
+                f.write(f"edx=3D'0x{(mask >> 32):08x}' ")
+                f.write(f"eax=3D'0x{(mask & 0xffffffff):08x}'/>\n")
+                f.write("  </feature>\n")
+
+        f.write("</cpus>\n")
=20
=20
 def main():
+    dirname =3D os.path.dirname(__file__)
+
     parser =3D argparse.ArgumentParser(
-        description=3D"Synchronize x86 cpu features from QEMU i386 target.=
")
+        description=3D"Synchronize x86 cpu features from QEMU."
+    )
     parser.add_argument(
-        "--qemu",
-        help=3D"Path to qemu executable",
-        default=3D"qemu-system-x86_64",
-        type=3Dstr)
+        "qemu",
+        help=3D"Path to qemu source code",
+        default=3Dos.path.realpath(os.path.join(dirname, "../../../qemu")),
+        nargs=3D"?",
+        type=3Dos.path.realpath,
+    )
     parser.add_argument(
-        "--features",
-        help=3D"Path to 'src/cpu_map/x86_features.xml' file in "
-             "the libvirt repository",
-        default=3D"x86_features.xml",
-        type=3Dstr)
-
+        "--output",
+        "-o",
+        help=3D"Path to output file",
+        default=3Dos.path.realpath(os.path.join(dirname, "x86_features.xml=
")),
+        type=3Dos.path.realpath
+    )
     args =3D parser.parse_args()
=20
-    qfeatures =3D get_qemu_feature_list(args.qemu)
-    lfeatures =3D list(get_libvirt_feature_list(args.features))
-    missing =3D [f for f in sorted(qfeatures) if f not in lfeatures]
+    if not os.path.isdir(args.qemu):
+        parser.print_help()
+        exit("qemu source directory not found")
=20
-    if missing:
-        print("The following features were reported by qemu but are "
-              "unknown to libvirt:")
-        for feature in missing:
-            print(" *", feature)
+    read_headers(args.qemu)
+    lines =3D read_cpu_c(args.qemu)
+    parse_feature_words(lines)
+    add_extra_features()
+    write_output(args.output)
=20
-    return len(missing) !=3D 0
+    print(
+        "After adding new features, update existing test files by running "
+        "`tests/cputestdata/cpu-data.py diff tests/cputestdata/"
+        "x86_64-cpuid-*.json`"
+    )
=20
=20
 if __name__ =3D=3D "__main__":
diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
index 8d1dbe68e8..da71a3a6a0 100644
--- a/src/cpu_map/x86_features.xml
+++ b/src/cpu_map/x86_features.xml
@@ -1,9 +1,8 @@
 <!--
-  After adding new features, update existing test files with
-
-    tests/cputestdata/cpu-data.py diff tests/cputestdata/x86_64-cpuid-*.js=
on
-
+  Generated file, do not edit!
+  Use the sync_qemu_features_i386.py script to make changes.
 -->
+
 <cpus>
=20
   <!-- cpuid level 0x00000001 (ecx) -->
--=20
2.43.0
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org