[PATCH] virMacAddrParse: Fix wrong termination character
by Eustance Wu
>From ef22e53c9360ddb4bdff61a12013a2812fb7346a Mon Sep 17 00:00:00 2001
From: longtao <longtao.wu(a)zstack.io>
Date: Thu, 16 Jun 2022 14:08:14 +0800
Subject: [PATCH] virMacAddrParse: Fix wrong termination character
The judgment of the termination character should be the '\0' character, not
a space.
Using spaces to judge, content can be injected into mac. such as:
"70:af:e7:1f:3f:89\32injected".
Before this patch, the terminating character was a space ('\32'),not '\0'.
So I can set the DHCP host mac like this "<host mac='c0:3b:04:21:15:35
injected' name='name129' ip='192.168.100.129'/>".
When running the network, no error is reported.
But, when using this mac to create a virtual machine, Will get
"virNetSocketReadWire:1805 : End of file while reading data: Input/output
error" in the libvirtd log.
---
src/util/virmacaddr.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/util/virmacaddr.c b/src/util/virmacaddr.c
index 6b22384cee..ba7c7e7076 100644
--- a/src/util/virmacaddr.c
+++ b/src/util/virmacaddr.c
@@ -163,7 +163,7 @@ virMacAddrParse(const char* str, virMacAddr *addr)
addr->addr[i] = (unsigned char) result;
- if ((i == 5) && (*end_ptr <= ' '))
+ if ((i == 5) && (*end_ptr == 0))
return 0;
if (*end_ptr != ':')
break;
--
2.32.0
3 years
- 2
- 2
[PATCH] [Doc] Update 2 items in the formatdomain.rst
by Yalan Zhang
Update the default "driver" value for hostdev interface since
the default is not "KVM" anymore(refer to "Host device
asssignment" part and by test results). And update the mac
address in one xml example.
Signed-off-by: Yalan Zhang <yalzhang(a)redhat.com>
---
docs/formatdomain.rst | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
index b6a3495093..19c4aa5e2e 100644
--- a/docs/formatdomain.rst
+++ b/docs/formatdomain.rst
@@ -4917,9 +4917,9 @@ To use VFIO device assignment rather than traditional/legacy KVM device
assignment (VFIO is a new method of device assignment that is compatible with
UEFI Secure Boot), a type='hostdev' interface can have an optional ``driver``
sub-element with a ``name`` attribute set to "vfio". To use legacy KVM device
-assignment you can set ``name`` to "kvm" (or simply omit the ``<driver>``
-element, since "kvm" is currently the default). :since:`Since 1.0.5 (QEMU and
-KVM only, requires kernel 3.6 or newer)`
+assignment you can set ``name`` to "kvm" (the default is "vfio" on systems
+where the VFIO driver is available, and "kvm" on older systems. :since:`Since
+1.1.3` (prior to that the default was always "kvm").
Note that this "intelligent passthrough" of network devices is very similar to
the functionality of a standard <hostdev> device, the difference being that this
@@ -5018,7 +5018,7 @@ directly reference an SRIOV VF device:
<source>
<address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
</source>
- <mac address='00:11:22:33:44:55:66'/>
+ <mac address='00:11:22:33:44:55'/>
<teaming type='transient' persistent='ua-backup0'/>
</interface>
...
--
2.32.0
3 years
- 2
- 1
[PATCH v3 00/26] Remove some unused includes
by Peng Liang
This series are the v3 of: https://listman.redhat.com/archives/libvir-list/2022-May/231132.html.
And this version passes the pipeline in GitLab :)
(https://gitlab.com/tcx4c70/libvirt/-/pipelines/558476177).
v2 -> v3:
1. Stop removing "internal.h"; [Ján Tomko]
2. Remove Patch 09, 15, 20, 21, and 23 of v2 since they have been merged;
3. Add Patch 26 (remove some unused includes in lxc);
v1 -> v2:
1. Fix build failure on many plantforms;
2. Fix my name in 'From';
3. Remove a few more unused includes;
Peng Liang (26):
access: Remove unused includes
admin: Remove unused includes
ch: Remove unused includes
conf: Remove unused includes
cpu: Remove unused includes
esx: Remove unused includes
hyperv: Remove unused includes
hypvervisor: Remove unused includes
libxl: Remove unused includes
locking: Remove unused includes
logging: Remove unused includes
network: Remove unused includes
node_device: Remove unused includes
openvz: Remove unused includes
qemu: Remove unused includes
remote: Remove unused includes
rpc: Remove unused includes
storage: Remove unused includes
util: Remove unused includes
vbox: Remove unused includes
vmware: Remove unused includes
vmx: Remove unused includes
test_driver: Remove unused includes
tools: Remove unused includes
tests: Remove unused includes
lxc: Remove unused includes
src/access/viraccessdriver.h | 1 -
src/access/viraccessdriverpolkit.c | 4 ----
src/access/viraccessdriverstack.c | 1 -
src/access/viraccessmanager.h | 1 -
src/admin/admin_server.c | 4 ----
src/admin/admin_server.h | 1 -
src/admin/admin_server_dispatch.c | 3 ---
src/admin/libvirt-admin.c | 2 --
src/ch/ch_conf.c | 1 -
src/ch/ch_domain.c | 1 -
src/ch/ch_driver.c | 7 -------
src/ch/ch_monitor.c | 2 --
src/ch/ch_process.c | 2 --
src/conf/backup_conf.c | 3 ---
src/conf/capabilities.c | 1 -
src/conf/capabilities.h | 2 --
src/conf/checkpoint_conf.c | 4 ----
src/conf/cpu_conf.c | 2 --
src/conf/cpu_conf.h | 1 -
src/conf/device_conf.c | 2 --
src/conf/device_conf.h | 1 -
src/conf/domain_addr.c | 1 -
src/conf/domain_audit.c | 1 -
src/conf/domain_capabilities.c | 2 --
src/conf/domain_conf.c | 4 ----
src/conf/domain_conf.h | 1 -
src/conf/domain_event.c | 2 --
src/conf/domain_nwfilter.c | 2 --
src/conf/domain_validate.c | 1 -
src/conf/interface_conf.c | 4 ----
src/conf/interface_conf.h | 1 -
src/conf/moment_conf.c | 2 --
src/conf/netdev_bandwidth_conf.c | 1 -
src/conf/netdev_vport_profile_conf.c | 1 -
src/conf/network_conf.c | 2 --
src/conf/network_conf.h | 2 --
src/conf/network_event.h | 1 -
src/conf/networkcommon_conf.c | 3 ---
src/conf/networkcommon_conf.h | 1 -
src/conf/node_device_conf.c | 1 -
src/conf/node_device_conf.h | 1 -
src/conf/node_device_event.h | 1 -
src/conf/node_device_util.c | 1 -
src/conf/nwfilter_conf.c | 2 --
src/conf/nwfilter_conf.h | 1 -
src/conf/nwfilter_ipaddrmap.c | 3 ---
src/conf/nwfilter_params.c | 2 --
src/conf/nwfilter_params.h | 1 -
src/conf/object_event.c | 4 ----
src/conf/object_event.h | 2 --
src/conf/secret_conf.c | 3 ---
src/conf/secret_event.h | 1 -
src/conf/snapshot_conf.c | 8 --------
src/conf/storage_adapter_conf.c | 1 -
src/conf/storage_capabilities.c | 1 -
src/conf/storage_conf.c | 4 ----
src/conf/storage_conf.h | 3 ---
src/conf/storage_encryption_conf.c | 3 ---
src/conf/storage_event.h | 1 -
src/conf/virchrdev.c | 1 -
src/conf/virdomaincheckpointobjlist.c | 1 -
src/conf/virdomaincheckpointobjlist.h | 1 -
src/conf/virdomainmomentobjlist.c | 5 -----
src/conf/virdomainobjlist.c | 2 --
src/conf/virdomainsnapshotobjlist.c | 2 --
src/conf/virdomainsnapshotobjlist.h | 1 -
src/conf/virinterfaceobj.c | 1 -
src/conf/virnetworkportdef.c | 2 --
src/conf/virnetworkportdef.h | 1 -
src/conf/virnodedeviceobj.c | 1 -
src/conf/virnwfilterbindingdef.c | 1 -
src/conf/virnwfilterbindingobj.c | 4 ----
src/conf/virsecretobj.h | 1 -
src/conf/virstorageobj.c | 1 -
src/conf/virstorageobj.h | 2 --
src/cpu/cpu.c | 3 ---
src/cpu/cpu.h | 1 -
src/cpu/cpu_arm.c | 1 -
src/cpu/cpu_map.c | 2 --
src/cpu/cpu_ppc64.c | 1 -
src/cpu/cpu_s390.c | 2 --
src/cpu/cpu_x86.c | 1 -
src/esx/esx_driver.c | 1 -
src/esx/esx_interface_driver.c | 6 ------
src/esx/esx_network_driver.c | 2 --
src/esx/esx_private.h | 2 --
src/esx/esx_storage_backend_iscsi.c | 2 --
src/esx/esx_storage_backend_vmfs.c | 2 --
src/esx/esx_storage_driver.c | 2 --
src/esx/esx_stream.c | 1 -
src/esx/esx_util.c | 3 ---
src/esx/esx_vi.h | 1 -
src/esx/esx_vi_methods.c | 2 --
src/esx/esx_vi_types.c | 1 -
src/hyperv/hyperv_private.h | 2 --
src/hyperv/hyperv_util.c | 3 ---
src/hypervisor/domain_driver.h | 1 -
src/hypervisor/virhostdev.c | 2 --
src/libxl/libxl_capabilities.c | 1 -
src/libxl/libxl_capabilities.h | 2 --
src/libxl/libxl_conf.c | 3 ---
src/libxl/libxl_conf.h | 2 --
src/libxl/libxl_domain.c | 1 -
src/libxl/libxl_domain.h | 2 --
src/libxl/libxl_driver.c | 3 ---
src/libxl/libxl_logger.c | 2 --
src/libxl/libxl_migration.c | 3 ---
src/libxl/xen_xl.c | 1 -
src/libxl/xen_xl.h | 1 -
src/libxl/xen_xm.c | 1 -
src/locking/domain_lock.c | 3 ---
src/locking/domain_lock.h | 1 -
src/locking/lock_daemon.c | 2 --
src/locking/lock_daemon_config.c | 4 ----
src/locking/lock_daemon_dispatch.c | 1 -
src/locking/lock_driver_lockd.c | 1 -
src/locking/lock_driver_nop.c | 2 --
src/locking/lock_manager.c | 1 -
src/locking/sanlock_helper.c | 2 --
src/logging/log_daemon.c | 5 -----
src/logging/log_daemon_config.c | 4 ----
src/logging/log_daemon_dispatch.c | 1 -
src/logging/log_handler.c | 1 -
src/logging/log_manager.c | 1 -
src/lxc/lxc_cgroup.c | 3 ---
src/lxc/lxc_cgroup.h | 1 -
src/lxc/lxc_conf.c | 1 -
src/lxc/lxc_conf.h | 4 ----
src/lxc/lxc_container.c | 2 --
src/lxc/lxc_container.h | 1 -
src/lxc/lxc_controller.c | 4 ----
src/lxc/lxc_domain.c | 2 --
src/lxc/lxc_driver.c | 4 ----
src/lxc/lxc_fuse.c | 1 -
src/lxc/lxc_monitor.c | 2 --
src/lxc/lxc_native.c | 1 -
src/lxc/lxc_process.c | 4 ----
src/network/bridge_driver.c | 5 -----
src/network/bridge_driver.h | 2 --
src/network/bridge_driver_linux.c | 1 -
src/network/leaseshelper.c | 3 ---
src/node_device/node_device_driver.c | 3 ---
src/node_device/node_device_udev.c | 3 ---
src/openvz/openvz_conf.c | 1 -
src/openvz/openvz_util.c | 1 -
src/qemu/qemu_agent.c | 2 --
src/qemu/qemu_alias.c | 1 -
src/qemu/qemu_alias.h | 2 --
src/qemu/qemu_backup.c | 5 -----
src/qemu/qemu_block.c | 1 -
src/qemu/qemu_block.h | 1 -
src/qemu/qemu_blockjob.c | 2 --
src/qemu/qemu_capabilities.c | 6 ------
src/qemu/qemu_capabilities.h | 2 --
src/qemu/qemu_cgroup.c | 7 -------
src/qemu/qemu_cgroup.h | 2 --
src/qemu/qemu_checkpoint.c | 3 ---
src/qemu/qemu_checkpoint.h | 1 -
src/qemu/qemu_command.c | 7 -------
src/qemu/qemu_command.h | 4 ----
src/qemu/qemu_conf.c | 5 -----
src/qemu/qemu_conf.h | 7 -------
src/qemu/qemu_dbus.c | 3 ---
src/qemu/qemu_domain.c | 6 ------
src/qemu/qemu_domain.h | 3 ---
src/qemu/qemu_domain_address.h | 2 --
src/qemu/qemu_driver.c | 10 ----------
src/qemu/qemu_extdevice.c | 5 -----
src/qemu/qemu_firmware.c | 1 -
src/qemu/qemu_hostdev.c | 5 -----
src/qemu/qemu_hostdev.h | 1 -
src/qemu/qemu_hotplug.c | 4 ----
src/qemu/qemu_hotplug.h | 1 -
src/qemu/qemu_interface.c | 1 -
src/qemu/qemu_interface.h | 1 -
src/qemu/qemu_interop_config.c | 3 ---
src/qemu/qemu_migration.c | 5 -----
src/qemu/qemu_migration_cookie.c | 1 -
src/qemu/qemu_migration_cookie.h | 1 -
src/qemu/qemu_migration_params.c | 2 --
src/qemu/qemu_migration_params.h | 2 --
src/qemu/qemu_monitor.c | 2 --
src/qemu/qemu_monitor.h | 2 --
src/qemu/qemu_monitor_json.c | 4 ----
src/qemu/qemu_monitor_json.h | 1 -
src/qemu/qemu_monitor_text.c | 2 --
src/qemu/qemu_namespace.c | 1 -
src/qemu/qemu_namespace.h | 1 -
src/qemu/qemu_process.c | 2 --
src/qemu/qemu_process.h | 1 -
src/qemu/qemu_qapi.c | 2 --
src/qemu/qemu_saveimage.c | 2 --
src/qemu/qemu_saveimage.h | 2 --
src/qemu/qemu_security.h | 2 --
src/qemu/qemu_shim.c | 1 -
src/qemu/qemu_slirp.c | 3 ---
src/qemu/qemu_snapshot.c | 4 ----
src/qemu/qemu_snapshot.h | 1 -
src/qemu/qemu_tpm.c | 5 -----
src/qemu/qemu_validate.h | 1 -
src/qemu/qemu_vhost_user.c | 1 -
src/qemu/qemu_vhost_user.h | 2 --
src/qemu/qemu_vhost_user_gpu.c | 3 ---
src/qemu/qemu_vhost_user_gpu.h | 1 -
src/remote/remote_daemon.c | 3 ---
src/remote/remote_daemon.h | 1 -
src/remote/remote_daemon_config.c | 1 -
src/remote/remote_daemon_dispatch.c | 5 -----
src/remote/remote_daemon_dispatch.h | 1 -
src/remote/remote_daemon_stream.c | 1 -
src/remote/remote_driver.c | 2 --
src/rpc/virkeepalive.c | 3 ---
src/rpc/virnetclient.c | 1 -
src/rpc/virnetclient.h | 1 -
src/rpc/virnetclientprogram.h | 1 -
src/rpc/virnetclientstream.c | 1 -
src/rpc/virnetclientstream.h | 1 -
src/rpc/virnetdaemon.c | 2 --
src/rpc/virnetdaemon.h | 3 ---
src/rpc/virnetmessage.c | 1 -
src/rpc/virnetsaslcontext.c | 3 ---
src/rpc/virnetserver.c | 1 -
src/rpc/virnetserver.h | 1 -
src/rpc/virnetserverclient.c | 1 -
src/rpc/virnetserverprogram.h | 1 -
src/rpc/virnetserverservice.h | 1 -
src/rpc/virnetsocket.c | 1 -
src/rpc/virnetsshsession.c | 1 -
src/storage/parthelper.c | 1 -
src/storage/storage_backend.c | 3 ---
src/storage/storage_backend_fs.c | 1 -
src/storage/storage_backend_gluster.c | 1 -
src/storage/storage_backend_iscsi.c | 4 ----
src/storage/storage_backend_iscsi_direct.c | 2 --
src/storage/storage_backend_mpath.c | 1 -
src/storage/storage_backend_rbd.c | 1 -
src/storage/storage_backend_scsi.c | 3 ---
src/storage/storage_backend_vstorage.c | 2 --
src/storage/storage_driver.c | 2 --
src/storage/storage_util.c | 3 ---
src/storage/storage_util.h | 1 -
src/test/test_driver.c | 2 --
src/util/iohelper.c | 3 ---
src/util/virarptable.c | 2 --
src/util/virauth.c | 1 -
src/util/virauthconfig.c | 1 -
src/util/virbpf.c | 1 -
src/util/virbuffer.c | 2 --
src/util/vircgroup.c | 3 ---
src/util/vircgroupv2devices.c | 1 -
src/util/virconf.c | 1 -
src/util/vircrypto.c | 2 --
src/util/virdnsmasq.c | 2 --
src/util/virebtables.c | 3 ---
src/util/virenum.c | 1 -
src/util/virerror.c | 1 -
src/util/vireventglib.c | 1 -
src/util/virfcp.c | 2 --
src/util/virfdstream.c | 1 -
src/util/virfilecache.c | 2 --
src/util/virfirewall.c | 1 -
src/util/virfirmware.c | 1 -
src/util/virhook.c | 2 --
src/util/virhostcpu.c | 2 --
src/util/virhostmem.c | 2 --
src/util/virhostuptime.c | 1 -
src/util/viridentity.c | 3 ---
src/util/virinitctl.c | 3 ---
src/util/viriptables.c | 6 ------
src/util/viriscsi.c | 2 --
src/util/virjson.c | 1 -
src/util/virkmod.c | 1 -
src/util/virlease.c | 2 --
src/util/virlockspace.c | 1 -
src/util/virmacaddr.c | 1 -
src/util/virmacmap.c | 2 --
src/util/virnetdevbandwidth.c | 1 -
src/util/virnetdevbridge.c | 2 --
src/util/virnetdevmacvlan.c | 2 --
src/util/virnetdevmacvlan.h | 2 --
src/util/virnetdevmidonet.c | 1 -
src/util/virnetdevtap.c | 1 -
src/util/virnetdevveth.c | 2 --
src/util/virnetdevvlan.c | 1 -
src/util/virnetlink.c | 1 -
src/util/virnvme.c | 1 -
src/util/virobject.c | 2 --
src/util/virpci.c | 1 -
src/util/virpcivpd.c | 1 -
src/util/virperf.c | 2 --
src/util/virpidfile.c | 1 -
src/util/virpolkit.c | 2 --
src/util/virportallocator.c | 3 ---
src/util/virqemu.c | 2 --
src/util/virrandom.c | 3 ---
src/util/virresctrl.h | 1 -
src/util/virrotatingfile.c | 1 -
src/util/virscsivhost.c | 1 -
src/util/virseclabel.c | 2 --
src/util/virsecret.c | 1 -
src/util/virsocketaddr.c | 2 --
src/util/virstoragefile.c | 4 ----
src/util/virtpm.c | 1 -
src/util/virutil.c | 2 --
src/util/viruuid.c | 3 ---
src/vbox/vbox_XPCOMCGlue.c | 3 ---
src/vbox/vbox_driver.c | 2 --
src/vbox/vbox_network.c | 2 --
src/vbox/vbox_storage.c | 3 ---
src/vbox/vbox_tmpl.c | 1 -
src/vmware/vmware_conf.c | 1 -
src/vmware/vmware_driver.c | 1 -
src/vmx/vmx.c | 1 -
src/vmx/vmx.h | 1 -
tests/commandtest.c | 2 --
tests/cputest.c | 2 --
tests/domainconftest.c | 2 --
tests/esxutilstest.c | 1 -
tests/eventtest.c | 2 --
tests/fchosttest.c | 1 -
tests/fdstreamtest.c | 3 ---
tests/genericxml2xmltest.c | 1 -
tests/interfacexml2xmltest.c | 2 --
tests/libxlmock.c | 2 --
tests/libxlxml2domconfigtest.c | 5 -----
tests/lxcxml2xmltest.c | 1 -
tests/networkxml2conftest.c | 2 --
tests/networkxml2firewalltest.c | 2 --
tests/networkxml2xmltest.c | 2 --
tests/networkxml2xmlupdatetest.c | 2 --
tests/nodedevmdevctltest.c | 1 -
tests/nodedevxml2xmltest.c | 2 --
tests/nssmock.c | 2 --
tests/nsstest.c | 1 -
tests/nwfilterebiptablestest.c | 1 -
tests/nwfilterxml2firewalltest.c | 1 -
tests/nwfilterxml2xmltest.c | 5 -----
tests/objecteventtest.c | 3 ---
tests/openvzutilstest.c | 2 --
tests/qemuagenttest.c | 2 --
tests/qemublocktest.c | 4 ----
tests/qemucapsprobemock.c | 1 -
tests/qemucommandutiltest.c | 1 -
tests/qemucpumock.c | 1 -
tests/qemudomaincheckpointxml2xmltest.c | 2 --
tests/qemudomainsnapshotxml2xmltest.c | 2 --
tests/qemuhotplugmock.c | 1 -
tests/qemuhotplugtest.c | 3 ---
tests/qemumemlocktest.c | 2 --
tests/qemumigparamstest.c | 1 -
tests/qemumonitorjsontest.c | 2 --
tests/qemumonitortestutils.c | 2 --
tests/qemumonitortestutils.h | 1 -
tests/qemusecuritymock.c | 2 --
tests/qemuxml2argvmock.c | 6 ------
tests/qemuxml2argvtest.c | 8 --------
tests/qemuxml2xmltest.c | 3 ---
tests/scsihosttest.c | 2 --
tests/seclabeltest.c | 1 -
tests/securityselinuxhelper.c | 1 -
tests/securityselinuxlabeltest.c | 2 --
tests/securityselinuxtest.c | 3 ---
tests/sockettest.c | 1 -
tests/storagebackendsheepdogtest.c | 1 -
tests/storagepoolxml2argvtest.c | 3 ---
tests/storagepoolxml2xmltest.c | 2 --
tests/storagevolxml2argvtest.c | 3 ---
tests/storagevolxml2xmltest.c | 2 --
tests/sysinfotest.c | 1 -
tests/testutils.c | 4 ----
tests/testutils.h | 1 -
tests/testutilslxc.c | 1 -
tests/testutilslxc.h | 2 --
tests/testutilsqemu.c | 1 -
tests/utiltest.c | 1 -
tests/virauthconfigtest.c | 2 --
tests/virbuftest.c | 2 --
tests/vircaps2xmltest.c | 1 -
tests/vircgroupmock.c | 2 --
tests/vircgrouptest.c | 1 -
tests/virconftest.c | 1 -
tests/virdriverconnvalidatetest.c | 2 --
tests/virdrivermoduletest.c | 2 --
tests/virfilemock.c | 2 --
tests/virfiletest.c | 1 -
tests/virfilewrapper.c | 2 --
tests/virfirewalltest.c | 1 -
tests/virhostcputest.c | 1 -
tests/viridentitytest.c | 4 ----
tests/virkeycodetest.c | 4 ----
tests/virkmodtest.c | 1 -
tests/virlockspacetest.c | 2 --
tests/virmigtest.c | 1 -
tests/virmockstathelpers.c | 1 -
tests/virnetdevmock.c | 1 -
tests/virnetdevtest.c | 2 --
tests/virnetmessagetest.c | 2 --
tests/virnetsockettest.c | 1 -
tests/virnettlscontexttest.c | 5 -----
tests/virnettlssessiontest.c | 4 ----
tests/virnetworkportxml2xmltest.c | 1 -
tests/virnumamock.c | 3 ---
tests/virnwfilterbindingxml2xmltest.c | 3 ---
tests/virpcimock.c | 1 -
tests/virportallocatortest.c | 3 ---
tests/virrandommock.c | 1 -
tests/virschematest.c | 2 --
tests/virshtest.c | 2 --
tests/virstoragetest.c | 3 ---
tests/virstorageutiltest.c | 3 ---
tests/virstringtest.c | 3 ---
tests/virtestmock.c | 2 --
tests/virtimetest.c | 2 --
tests/viruritest.c | 1 -
tests/virusbmock.c | 3 ---
tests/virusbtest.c | 2 --
tests/vmx2xmltest.c | 2 --
tests/vshtabletest.c | 1 -
tests/xlconfigtest.c | 1 -
tests/xmconfigtest.c | 2 --
tests/xml2vmxtest.c | 1 -
tools/virsh-checkpoint.c | 2 --
tools/virsh-completer-checkpoint.c | 2 --
tools/virsh-completer-domain.c | 1 -
tools/virsh-completer-host.c | 1 -
tools/virsh-completer-interface.c | 2 --
tools/virsh-completer-network.c | 1 -
tools/virsh-completer-nodedev.c | 2 --
tools/virsh-completer-nwfilter.c | 2 --
tools/virsh-completer-pool.c | 2 --
tools/virsh-completer-secret.c | 2 --
tools/virsh-completer-snapshot.c | 2 --
tools/virsh-completer-volume.c | 2 --
tools/virsh-completer.c | 2 --
tools/virsh-console.c | 1 -
tools/virsh-domain-event.c | 2 --
tools/virsh-domain.c | 1 -
tools/virsh-nodedev.c | 1 -
tools/virsh-pool.c | 1 -
tools/virsh-snapshot.c | 1 -
tools/virsh-util.c | 1 -
tools/virsh.c | 7 -------
tools/virsh.h | 2 --
tools/virt-admin.c | 1 -
tools/virt-login-shell-helper.c | 1 -
tools/vsh-table.c | 1 -
tools/vsh.c | 1 -
tools/vsh.h | 1 -
448 files changed, 905 deletions(-)
--
2.36.1
3 years
- 2
- 27
[PATCH] virMacAddrParse: Fix wrong termination character
by Eustance Wu
>From 7df034e93d392c734ac5c4f4148a3d05f9edce29 Mon Sep 17 00:00:00 2001
From: WuLongTao <eustancewu(a)gmail.com>
Date: Thu, 16 Jun 2022 10:43:29 +0800
Subject: [PATCH] virMacAddrParse: Fix wrong termination character
The judgment of the termination character should be the null character, not
a space. Using spaces to judge, content can be injected into mac. such as:
"70:af:e7:1f:3f:89\001
injected".
This will result in an error: "virNetSocketReadWire:1805 : End of file
while reading data: Input/output error"
---
src/util/virmacaddr.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/util/virmacaddr.c b/src/util/virmacaddr.c
index 6b22384cee..5c4aa07713 100644
--- a/src/util/virmacaddr.c
+++ b/src/util/virmacaddr.c
@@ -163,7 +163,7 @@ virMacAddrParse(const char* str, virMacAddr *addr)
addr->addr[i] = (unsigned char) result;
- if ((i == 5) && (*end_ptr <= ' '))
+ if ((i == 5) && (*end_ptr <= 0))
return 0;
if (*end_ptr != ':')
break;
--
2.32.0
3 years
- 2
- 1
(no subject)
by Eustance Wu
>From 7df034e93d392c734ac5c4f4148a3d05f9edce29 Mon Sep 17 00:00:00 2001
From: WuLongTao <eustancewu(a)gmail.com>
Date: Thu, 16 Jun 2022 10:43:29 +0800
Subject: [PATCH] virMacAddrParse: Fix wrong termination character
The judgment of the termination character should be the null character, not
a space. Using spaces to judge, content can be injected into mac. such as:
"70:af:e7:1f:3f:89\001
injected".
This will result in an error: "virNetSocketReadWire:1805 : End of file
while reading data: Input/output error"
---
src/util/virmacaddr.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/util/virmacaddr.c b/src/util/virmacaddr.c
index 6b22384cee..5c4aa07713 100644
--- a/src/util/virmacaddr.c
+++ b/src/util/virmacaddr.c
@@ -163,7 +163,7 @@ virMacAddrParse(const char* str, virMacAddr *addr)
addr->addr[i] = (unsigned char) result;
- if ((i == 5) && (*end_ptr <= ' '))
+ if ((i == 5) && (*end_ptr <= 0))
return 0;
if (*end_ptr != ':')
break;
--
2.32.0
3 years
- 1
- 0
[PATCH] qemuxml2*test: Add 'startupPolicy' fields to aio-io_uring case
by Peter Krempa
Extend the test for io_uring to also test startup policy.
Since the actual logic for dropping disks is in the host preparation
phase, thus skipped for tests we can use any file path.
Add a case also for 'file' backing to have all cases covered.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../disk-aio-io_uring.x86_64-latest.args | 5 ++++-
tests/qemuxml2argvdata/disk-aio-io_uring.xml | 10 ++++++++--
.../disk-aio-io_uring.x86_64-latest.xml | 10 ++++++++--
3 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/tests/qemuxml2argvdata/disk-aio-io_uring.x86_64-latest.args b/tests/qemuxml2argvdata/disk-aio-io_uring.x86_64-latest.args
index 5500f70bf9..b771df752e 100644
--- a/tests/qemuxml2argvdata/disk-aio-io_uring.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-aio-io_uring.x86_64-latest.args
@@ -28,9 +28,12 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-no-acpi \
-boot strict=on \
-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
+-blockdev '{"driver":"file","filename":"/path/to/file.qcow2","aio":"io_uring","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"qcow2","file":"libvirt-2-storage"}' \
+-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0xa","drive":"libvirt-2-format","id":"virtio-disk0","bootindex":1}' \
-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","aio":"io_uring","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2","file":"libvirt-1-storage"}' \
--device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x9","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \
+-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x9","drive":"libvirt-1-format","id":"virtio-disk1"}' \
-audiodev '{"id":"audio1","driver":"none"}' \
-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
diff --git a/tests/qemuxml2argvdata/disk-aio-io_uring.xml b/tests/qemuxml2argvdata/disk-aio-io_uring.xml
index 9e6ea6225d..21769c0552 100644
--- a/tests/qemuxml2argvdata/disk-aio-io_uring.xml
+++ b/tests/qemuxml2argvdata/disk-aio-io_uring.xml
@@ -14,10 +14,16 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <disk type='block' device='disk'>
+ <disk type='file' device='disk'>
<driver name='qemu' type='qcow2' io='io_uring'/>
- <source dev='/dev/HostVG/QEMUGuest1'/>
+ <source file='/path/to/file.qcow2' startupPolicy='optional'/>
<target dev='vda' bus='virtio'/>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x0A' function='0x0'/>
+ </disk>
+ <disk type='block' device='disk'>
+ <driver name='qemu' type='qcow2' io='io_uring'/>
+ <source dev='/dev/HostVG/QEMUGuest1' startupPolicy='optional'/>
+ <target dev='vdb' bus='virtio'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x09' function='0x0'/>
</disk>
<controller type='usb' index='0'/>
diff --git a/tests/qemuxml2xmloutdata/disk-aio-io_uring.x86_64-latest.xml b/tests/qemuxml2xmloutdata/disk-aio-io_uring.x86_64-latest.xml
index 0e0ef77eae..190e827d10 100644
--- a/tests/qemuxml2xmloutdata/disk-aio-io_uring.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/disk-aio-io_uring.x86_64-latest.xml
@@ -17,10 +17,16 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
- <disk type='block' device='disk'>
+ <disk type='file' device='disk'>
<driver name='qemu' type='qcow2' io='io_uring'/>
- <source dev='/dev/HostVG/QEMUGuest1'/>
+ <source file='/path/to/file.qcow2' startupPolicy='optional'/>
<target dev='vda' bus='virtio'/>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/>
+ </disk>
+ <disk type='block' device='disk'>
+ <driver name='qemu' type='qcow2' io='io_uring'/>
+ <source dev='/dev/HostVG/QEMUGuest1' startupPolicy='optional'/>
+ <target dev='vdb' bus='virtio'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x09' function='0x0'/>
</disk>
<controller type='usb' index='0' model='piix3-uhci'>
--
2.36.1
3 years
- 2
- 1
[PATCH v2] conf: cpu: Add <signature family=X model=X stepping=X/>
by Cole Robinson
Internally we already collect x86 host family + model + stepping
numeric values. This exposed them in capabilities CPU output.
Example:
$ sudo virsh capabilities | grep -A1 -B1 signature
<microcode version='240'/>
<signature family='6' model='94' stepping='3'/>
<counter name='tsc' frequency='3408010000' scaling='no'/>
Users need to know these values to calculate an expected.
SEV-ES/SEV-SNP launch measurement.
Signed-off-by: Cole Robinson <crobinso(a)redhat.com>
---
v2:
sigXXX naming was kept, since there's a conflicting 'model'
member in the struct already.
Addressed Jirka's review comments
src/conf/cpu_conf.c | 32 +++++++++++++++++++
src/conf/cpu_conf.h | 3 ++
src/conf/schemas/cputypes.rng | 13 ++++++++
src/cpu/cpu_x86.c | 3 ++
.../x86_64-cpuid-A10-5800K-host.xml | 1 +
.../x86_64-cpuid-Atom-D510-host.xml | 1 +
.../x86_64-cpuid-Atom-N450-host.xml | 1 +
.../x86_64-cpuid-Atom-P5362-host.xml | 1 +
.../x86_64-cpuid-Cooperlake-host.xml | 1 +
.../x86_64-cpuid-Core-i5-2500-host.xml | 1 +
.../x86_64-cpuid-Core-i5-2540M-host.xml | 1 +
.../x86_64-cpuid-Core-i5-4670T-host.xml | 1 +
.../x86_64-cpuid-Core-i5-650-host.xml | 1 +
.../x86_64-cpuid-Core-i5-6600-host.xml | 1 +
.../x86_64-cpuid-Core-i7-2600-host.xml | 1 +
...86_64-cpuid-Core-i7-2600-xsaveopt-host.xml | 1 +
.../x86_64-cpuid-Core-i7-3520M-host.xml | 1 +
.../x86_64-cpuid-Core-i7-3740QM-host.xml | 1 +
.../x86_64-cpuid-Core-i7-3770-host.xml | 1 +
.../x86_64-cpuid-Core-i7-4510U-host.xml | 1 +
.../x86_64-cpuid-Core-i7-4600U-host.xml | 1 +
.../x86_64-cpuid-Core-i7-5600U-arat-host.xml | 1 +
.../x86_64-cpuid-Core-i7-5600U-host.xml | 1 +
.../x86_64-cpuid-Core-i7-5600U-ibrs-host.xml | 1 +
.../x86_64-cpuid-Core-i7-7600U-host.xml | 1 +
.../x86_64-cpuid-Core-i7-7700-host.xml | 1 +
.../x86_64-cpuid-Core-i7-8550U-host.xml | 1 +
.../x86_64-cpuid-Core-i7-8700-host.xml | 1 +
.../x86_64-cpuid-Core2-E6850-host.xml | 1 +
.../x86_64-cpuid-Core2-Q9500-host.xml | 1 +
.../x86_64-cpuid-EPYC-7502-32-Core-host.xml | 1 +
.../x86_64-cpuid-EPYC-7601-32-Core-host.xml | 1 +
...6_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml | 1 +
.../cputestdata/x86_64-cpuid-FX-8150-host.xml | 1 +
...6_64-cpuid-Hygon-C86-7185-32-core-host.xml | 1 +
.../x86_64-cpuid-Ice-Lake-Server-host.xml | 1 +
.../x86_64-cpuid-Opteron-1352-host.xml | 1 +
.../x86_64-cpuid-Opteron-2350-host.xml | 1 +
.../x86_64-cpuid-Opteron-6234-host.xml | 1 +
.../x86_64-cpuid-Opteron-6282-host.xml | 1 +
.../x86_64-cpuid-Pentium-P6100-host.xml | 1 +
.../x86_64-cpuid-Phenom-B95-host.xml | 1 +
...64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml | 1 +
...86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml | 1 +
.../x86_64-cpuid-Xeon-5110-host.xml | 1 +
.../x86_64-cpuid-Xeon-E3-1225-v5-host.xml | 1 +
.../x86_64-cpuid-Xeon-E3-1245-v5-host.xml | 1 +
.../x86_64-cpuid-Xeon-E5-2609-v3-host.xml | 1 +
.../x86_64-cpuid-Xeon-E5-2623-v4-host.xml | 1 +
.../x86_64-cpuid-Xeon-E5-2630-v3-host.xml | 1 +
.../x86_64-cpuid-Xeon-E5-2630-v4-host.xml | 1 +
.../x86_64-cpuid-Xeon-E5-2650-host.xml | 1 +
.../x86_64-cpuid-Xeon-E5-2650-v3-host.xml | 1 +
.../x86_64-cpuid-Xeon-E5-2650-v4-host.xml | 1 +
.../x86_64-cpuid-Xeon-E7-4820-host.xml | 1 +
.../x86_64-cpuid-Xeon-E7-4830-host.xml | 1 +
.../x86_64-cpuid-Xeon-E7-8890-v3-host.xml | 1 +
.../x86_64-cpuid-Xeon-E7540-host.xml | 1 +
.../x86_64-cpuid-Xeon-Gold-5115-host.xml | 1 +
.../x86_64-cpuid-Xeon-Gold-6130-host.xml | 1 +
.../x86_64-cpuid-Xeon-Gold-6148-host.xml | 1 +
.../x86_64-cpuid-Xeon-Platinum-8268-host.xml | 1 +
.../x86_64-cpuid-Xeon-Platinum-9242-host.xml | 1 +
.../x86_64-cpuid-Xeon-W3520-host.xml | 1 +
.../x86_64-cpuid-Xeon-X5460-host.xml | 1 +
65 files changed, 112 insertions(+)
diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
index 2d447da7c3..8774a625ab 100644
--- a/src/conf/cpu_conf.c
+++ b/src/conf/cpu_conf.c
@@ -245,6 +245,9 @@ virCPUDefCopyWithoutModel(const virCPUDef *cpu)
copy->threads = cpu->threads;
copy->arch = cpu->arch;
copy->migratable = cpu->migratable;
+ copy->sigFamily = cpu->sigFamily;
+ copy->sigModel = cpu->sigModel;
+ copy->sigStepping = cpu->sigStepping;
if (cpu->cache) {
copy->cache = g_new0(virCPUCacheDef, 1);
@@ -421,6 +424,7 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt,
if (def->type == VIR_CPU_TYPE_HOST) {
g_autofree char *arch = virXPathString("string(./arch[1])", ctxt);
xmlNodePtr counter_node = NULL;
+ xmlNodePtr signature_node = NULL;
if (!arch) {
virReportError(VIR_ERR_XML_ERROR, "%s",
@@ -441,6 +445,26 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt,
return -1;
}
+ if ((signature_node = virXPathNode("./signature[1]", ctxt))) {
+ if (virXMLPropUInt(signature_node, "family", 10,
+ VIR_XML_PROP_REQUIRED | VIR_XML_PROP_NONZERO,
+ &def->sigFamily) < 0) {
+ return -1;
+ }
+
+ if (virXMLPropUInt(signature_node, "model", 10,
+ VIR_XML_PROP_REQUIRED,
+ &def->sigModel) < 0) {
+ return -1;
+ }
+
+ if (virXMLPropUInt(signature_node, "stepping", 10,
+ VIR_XML_PROP_REQUIRED,
+ &def->sigStepping) < 0) {
+ return -1;
+ }
+ }
+
if ((counter_node = virXPathNode("./counter[@name='tsc']", ctxt))) {
tsc = g_new0(virHostCPUTscInfo, 1);
@@ -753,6 +777,14 @@ virCPUDefFormatBuf(virBuffer *buf,
virBufferAsprintf(buf, "<microcode version='%u'/>\n",
def->microcodeVersion);
+ if (def->type == VIR_CPU_TYPE_HOST && def->sigFamily) {
+ virBufferAddLit(buf, "<signature");
+ virBufferAsprintf(buf, " family='%u'", def->sigFamily);
+ virBufferAsprintf(buf, " model='%u'", def->sigModel);
+ virBufferAsprintf(buf, " stepping='%u'", def->sigStepping);
+ virBufferAddLit(buf, "/>\n");
+ }
+
if (def->type == VIR_CPU_TYPE_HOST && def->tsc) {
virBufferAddLit(buf, "<counter name='tsc'");
virBufferAsprintf(buf, " frequency='%llu'", def->tsc->frequency);
diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h
index 2cda4ee1f4..17867d6a30 100644
--- a/src/conf/cpu_conf.h
+++ b/src/conf/cpu_conf.h
@@ -134,6 +134,9 @@ struct _virCPUDef {
unsigned int dies;
unsigned int cores;
unsigned int threads;
+ unsigned int sigFamily;
+ unsigned int sigModel;
+ unsigned int sigStepping;
size_t nfeatures;
size_t nfeatures_max;
virCPUFeatureDef *features;
diff --git a/src/conf/schemas/cputypes.rng b/src/conf/schemas/cputypes.rng
index 056e66e1b4..122880fb2e 100644
--- a/src/conf/schemas/cputypes.rng
+++ b/src/conf/schemas/cputypes.rng
@@ -342,6 +342,19 @@
</attribute>
</element>
</optional>
+ <optional>
+ <element name="signature">
+ <attribute name="family">
+ <ref name="positiveInteger"/>
+ </attribute>
+ <attribute name="model">
+ <ref name="unsignedInt"/>
+ </attribute>
+ <attribute name="stepping">
+ <ref name="unsignedInt"/>
+ </attribute>
+ </element>
+ </optional>
<optional>
<element name="counter">
<attribute name="name">
diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index a4aca6055d..c4462f34a7 100644
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -2265,6 +2265,9 @@ x86Decode(virCPUDef *cpu,
cpuModel->nfeatures = 0;
cpu->nfeatures_max = cpuModel->nfeatures_max;
cpuModel->nfeatures_max = 0;
+ cpu->sigFamily = sigFamily;
+ cpu->sigModel = sigModel;
+ cpu->sigStepping = sigStepping;
return 0;
}
diff --git a/tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml b/tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml
index 2430adbfbc..220dfb6467 100644
--- a/tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Opteron_G5</model>
<vendor>AMD</vendor>
+ <signature family='21' model='16' stepping='1'/>
<feature name='vme'/>
<feature name='ht'/>
<feature name='monitor'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml b/tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml
index 8cf4341099..3c8a005122 100644
--- a/tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>n270</model>
<vendor>Intel</vendor>
+ <signature family='6' model='28' stepping='10'/>
<feature name='pse36'/>
<feature name='ds'/>
<feature name='acpi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml b/tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml
index c79713dcaa..1f4eb7b727 100644
--- a/tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>n270</model>
<vendor>Intel</vendor>
+ <signature family='6' model='28' stepping='10'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml b/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml
index b3e9d5c1ff..c59ebfa799 100644
--- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Westmere-IBRS</model>
<vendor>Intel</vendor>
+ <signature family='6' model='134' stepping='5'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml b/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml
index b0777181bb..6ac4ad55ef 100644
--- a/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Cooperlake</model>
<vendor>Intel</vendor>
+ <signature family='6' model='85' stepping='11'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-host.xml
index a604acb911..cf8b175db1 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>SandyBridge</model>
<vendor>Intel</vendor>
+ <signature family='6' model='42' stepping='7'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
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 a604acb911..cf8b175db1 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>SandyBridge</model>
<vendor>Intel</vendor>
+ <signature family='6' model='42' stepping='7'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
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 d1d0bc7168..827b16cb69 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Haswell-noTSX</model>
<vendor>Intel</vendor>
+ <signature family='6' model='60' stepping='3'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-650-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-650-host.xml
index e7256d52d0..4234c4df5a 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-650-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-650-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Westmere</model>
<vendor>Intel</vendor>
+ <signature family='6' model='37' stepping='2'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml
index faaa07f19b..c52e8db235 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Skylake-Client</model>
<vendor>Intel</vendor>
+ <signature family='6' model='94' stepping='3'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-host.xml
index a604acb911..cf8b175db1 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>SandyBridge</model>
<vendor>Intel</vendor>
+ <signature family='6' model='42' stepping='7'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
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 e139004923..adcc4b86c5 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
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>SandyBridge</model>
<vendor>Intel</vendor>
+ <signature family='6' model='42' stepping='7'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
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 a23c651a08..94352ee8bf 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>IvyBridge</model>
<vendor>Intel</vendor>
+ <signature family='6' model='58' stepping='9'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
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 9fec131ac9..e2503cd35c 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>IvyBridge</model>
<vendor>Intel</vendor>
+ <signature family='6' model='58' stepping='9'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-host.xml
index a23c651a08..94352ee8bf 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>IvyBridge</model>
<vendor>Intel</vendor>
+ <signature family='6' model='58' stepping='9'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
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 61bcefbfcb..a6307e834e 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Westmere</model>
<vendor>Intel</vendor>
+ <signature family='6' model='69' stepping='1'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
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 fae8e8d0a8..8bbac47a2e 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Haswell-noTSX</model>
<vendor>Intel</vendor>
+ <signature family='6' model='69' stepping='1'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml
index ea622c87c7..b39148f37f 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
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Broadwell</model>
<vendor>Intel</vendor>
+ <signature family='6' model='61' stepping='4'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
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 ea622c87c7..b39148f37f 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Broadwell</model>
<vendor>Intel</vendor>
+ <signature family='6' model='61' stepping='4'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml
index a534d2dec5..2ab8890464 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
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Broadwell-IBRS</model>
<vendor>Intel</vendor>
+ <signature family='6' model='61' stepping='4'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
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 bbdfb6aa61..edfb8ec421 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Skylake-Client-IBRS</model>
<vendor>Intel</vendor>
+ <signature family='6' model='142' stepping='9'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml
index faaa07f19b..08255621ec 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Skylake-Client</model>
<vendor>Intel</vendor>
+ <signature family='6' model='158' stepping='9'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
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 7681c94649..1e3f1d1719 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Skylake-Client-noTSX-IBRS</model>
<vendor>Intel</vendor>
+ <signature family='6' model='142' stepping='10'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml
index bbdfb6aa61..4174d79ce7 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Skylake-Client-IBRS</model>
<vendor>Intel</vendor>
+ <signature family='6' model='158' stepping='10'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core2-E6850-host.xml b/tests/cputestdata/x86_64-cpuid-Core2-E6850-host.xml
index e7ddc39ceb..e0ec4cd795 100644
--- a/tests/cputestdata/x86_64-cpuid-Core2-E6850-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core2-E6850-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Conroe</model>
<vendor>Intel</vendor>
+ <signature family='6' model='15' stepping='11'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml b/tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml
index 4dc25588d5..586b8e0f59 100644
--- a/tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Penryn</model>
<vendor>Intel</vendor>
+ <signature family='6' model='23' stepping='10'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml
index 9f8108cdaa..debddc194f 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
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>EPYC-Rome</model>
<vendor>AMD</vendor>
+ <signature family='23' model='49' stepping='0'/>
<feature name='ht'/>
<feature name='monitor'/>
<feature name='osxsave'/>
diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml
index 8c2c975fdd..da05dd4709 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
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>EPYC</model>
<vendor>AMD</vendor>
+ <signature family='23' model='1' stepping='2'/>
<feature name='ht'/>
<feature name='monitor'/>
<feature name='osxsave'/>
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 c3bbf78396..e91c14c715 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
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>EPYC-IBPB</model>
<vendor>AMD</vendor>
+ <signature family='23' model='1' stepping='2'/>
<feature name='ht'/>
<feature name='monitor'/>
<feature name='osxsave'/>
diff --git a/tests/cputestdata/x86_64-cpuid-FX-8150-host.xml b/tests/cputestdata/x86_64-cpuid-FX-8150-host.xml
index 75595c02af..4fb2d3978b 100644
--- a/tests/cputestdata/x86_64-cpuid-FX-8150-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-FX-8150-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Opteron_G4</model>
<vendor>AMD</vendor>
+ <signature family='21' model='1' stepping='2'/>
<feature name='vme'/>
<feature name='ht'/>
<feature name='monitor'/>
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 76c3753505..d06a7afc3f 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
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Dhyana</model>
<vendor>Hygon</vendor>
+ <signature family='24' model='0' stepping='1'/>
<feature name='ht'/>
<feature name='monitor'/>
<feature name='osxsave'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml
index 07e8f8bc24..2ce74da604 100644
--- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Icelake-Server</model>
<vendor>Intel</vendor>
+ <signature family='6' model='106' stepping='0'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml b/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml
index ecd532167a..7b0b3dfe6a 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Opteron_G3</model>
<vendor>AMD</vendor>
+ <signature family='16' model='2' stepping='3'/>
<feature name='vme'/>
<feature name='ht'/>
<feature name='monitor'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml b/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml
index ecd532167a..7b0b3dfe6a 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Opteron_G3</model>
<vendor>AMD</vendor>
+ <signature family='16' model='2' stepping='3'/>
<feature name='vme'/>
<feature name='ht'/>
<feature name='monitor'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml b/tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml
index 75595c02af..4fb2d3978b 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Opteron_G4</model>
<vendor>AMD</vendor>
+ <signature family='21' model='1' stepping='2'/>
<feature name='vme'/>
<feature name='ht'/>
<feature name='monitor'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml b/tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml
index 75595c02af..4fb2d3978b 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Opteron_G4</model>
<vendor>AMD</vendor>
+ <signature family='21' model='1' stepping='2'/>
<feature name='vme'/>
<feature name='ht'/>
<feature name='monitor'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml b/tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml
index 3975aa7e1f..a70f8ccd46 100644
--- a/tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>core2duo</model>
<vendor>Intel</vendor>
+ <signature family='6' model='37' stepping='5'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml b/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml
index 95875918c9..dba7b2b161 100644
--- a/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>athlon</model>
<vendor>AMD</vendor>
+ <signature family='16' model='4' stepping='2'/>
<feature name='mca'/>
<feature name='clflush'/>
<feature name='ht'/>
diff --git 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
index 8c2c975fdd..15ec20bd63 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
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>EPYC</model>
<vendor>AMD</vendor>
+ <signature family='23' model='1' stepping='1'/>
<feature name='ht'/>
<feature name='monitor'/>
<feature name='osxsave'/>
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 65eaeabdd0..7f86683bf2 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
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>EPYC-Rome</model>
<vendor>AMD</vendor>
+ <signature family='23' model='113' stepping='0'/>
<feature name='ht'/>
<feature name='monitor'/>
<feature name='osxsave'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-5110-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-5110-host.xml
index ca3a84cc5c..beb465df86 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-5110-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-5110-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Conroe</model>
<vendor>Intel</vendor>
+ <signature family='6' model='15' stepping='6'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
index e7ced42797..d4a2a15e60 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
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Skylake-Client-IBRS</model>
<vendor>Intel</vendor>
+ <signature family='6' model='94' stepping='3'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml
index faaa07f19b..c52e8db235 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
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Skylake-Client</model>
<vendor>Intel</vendor>
+ <signature family='6' model='94' stepping='3'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml
index 9bac4b4648..bc39536de9 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
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Haswell-noTSX-IBRS</model>
<vendor>Intel</vendor>
+ <signature family='6' model='63' stepping='2'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml
index 43a0b93ab4..70419d7944 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
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Broadwell-IBRS</model>
<vendor>Intel</vendor>
+ <signature family='6' model='79' stepping='1'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-host.xml
index 431a737a44..6d959eedc3 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
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Haswell-noTSX</model>
<vendor>Intel</vendor>
+ <signature family='6' model='63' stepping='2'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml
index 5dd8d749de..e2ace9021b 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
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Broadwell</model>
<vendor>Intel</vendor>
+ <signature family='6' model='79' stepping='1'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml
index 80ca6c343f..628900fd2c 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>SandyBridge-IBRS</model>
<vendor>Intel</vendor>
+ <signature family='6' model='45' stepping='7'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-host.xml
index 431a737a44..6d959eedc3 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
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Haswell-noTSX</model>
<vendor>Intel</vendor>
+ <signature family='6' model='63' stepping='2'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml
index 5dd8d749de..e2ace9021b 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
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Broadwell</model>
<vendor>Intel</vendor>
+ <signature family='6' model='79' stepping='1'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-host.xml
index 52902479b9..58468cd096 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Westmere</model>
<vendor>Intel</vendor>
+ <signature family='6' model='47' stepping='2'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-host.xml
index 52902479b9..58468cd096 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Westmere</model>
<vendor>Intel</vendor>
+ <signature family='6' model='47' stepping='2'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-host.xml
index e90598ec63..6a18204c02 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
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Haswell</model>
<vendor>Intel</vendor>
+ <signature family='6' model='63' stepping='4'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7540-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7540-host.xml
index 42b43116bd..ee526e7119 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7540-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7540-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Nehalem-IBRS</model>
<vendor>Intel</vendor>
+ <signature family='6' model='46' stepping='6'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
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 9de76fd640..e004747ada 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Skylake-Server-IBRS</model>
<vendor>Intel</vendor>
+ <signature family='6' model='85' stepping='4'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
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 207e9e0ee4..fba4ccf506 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Skylake-Server-IBRS</model>
<vendor>Intel</vendor>
+ <signature family='6' model='85' stepping='4'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
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 b18ceddc60..da7e96e533 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Skylake-Server</model>
<vendor>Intel</vendor>
+ <signature family='6' model='85' stepping='4'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
index fdeafc4870..96effe5684 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Cascadelake-Server</model>
<vendor>Intel</vendor>
+ <signature family='6' model='85' stepping='6'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml
index 01447f3478..ea51fc40a1 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Cascadelake-Server</model>
<vendor>Intel</vendor>
+ <signature family='6' model='85' stepping='7'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-host.xml
index c4a9226973..35dd63f360 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Nehalem</model>
<vendor>Intel</vendor>
+ <signature family='6' model='26' stepping='5'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml
index e73c4780c9..91ab9726da 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Penryn</model>
<vendor>Intel</vendor>
+ <signature family='6' model='23' stepping='6'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
--
2.36.1
3 years
- 2
- 1
Release of libvirt-php-0.5.6
by Michal Prívozník
The 0.5.6 release of libvirt-php is tagged and tarball is available at:
https://libvirt.org/sources/php/
Notable changes:
* PHP-8.0 support
* Implemented virDomainSnapshotCurrent() API
* Implemented virNetworkGetDHCPLeases() API
* Implemented virDomainGetCPUStats() API
* Implemented virDomainUndefineFlags() API
* Fixed libvirt_domain_interface_addresses() when multiple addresses are
reported
* Bug fixes
Thanks to everybody who helped with this release.
Michal
3 years
- 1
- 0
[PATCH 0/4] Fix regression in 'startupPolicy' validation for block disks
by Peter Krempa
Patch 4/4 fixes the regression. Patch 3/4 fixes missing cases in the
validation. Rest of the series is preparation/cleanup.
Peter Krempa (4):
virDomainDiskDefValidate: Improve error messages for 'startupPolicy'
checks
domain_validate: Split out validation of disk startup policy
virDomainDiskDefValidateStartupPolicy: Validate disk type better
virDomainDiskTranslateSourcePool: Fix check of 'startupPolicy'
definition
src/conf/domain_conf.c | 12 +++++-----
src/conf/domain_validate.c | 49 ++++++++++++++++++++++++--------------
src/conf/domain_validate.h | 2 ++
src/libvirt_private.syms | 1 +
4 files changed, 40 insertions(+), 24 deletions(-)
--
2.36.1
3 years
- 2
- 5
[PATCH] conf: cpu: Add <signature family=X model=X stepping=X/>
by Cole Robinson
Internally we already collect x86 host family + model + stepping
numeric values. This exposed them in capabilities CPU output.
Example:
$ sudo virsh capabilities | grep -A1 -B1 signature
<microcode version='240'/>
<signature family='6' model='94' stepping='3'/>
<counter name='tsc' frequency='3408010000' scaling='no'/>
Users need to know these values to calculate an expected.
SEV-ES/SEV-SNP launch measurement.
Signed-off-by: Cole Robinson <crobinso(a)redhat.com>
---
src/conf/cpu_conf.c | 36 +++++++++++++++++++
src/conf/cpu_conf.h | 3 ++
src/conf/schemas/cputypes.rng | 13 +++++++
src/cpu/cpu_x86.c | 3 ++
.../x86_64-cpuid-A10-5800K-host.xml | 1 +
.../x86_64-cpuid-Atom-D510-host.xml | 1 +
.../x86_64-cpuid-Atom-N450-host.xml | 1 +
.../x86_64-cpuid-Atom-P5362-host.xml | 1 +
.../x86_64-cpuid-Cooperlake-host.xml | 1 +
.../x86_64-cpuid-Core-i5-2500-host.xml | 1 +
.../x86_64-cpuid-Core-i5-2540M-host.xml | 1 +
.../x86_64-cpuid-Core-i5-4670T-host.xml | 1 +
.../x86_64-cpuid-Core-i5-650-host.xml | 1 +
.../x86_64-cpuid-Core-i5-6600-host.xml | 1 +
.../x86_64-cpuid-Core-i7-2600-host.xml | 1 +
...86_64-cpuid-Core-i7-2600-xsaveopt-host.xml | 1 +
.../x86_64-cpuid-Core-i7-3520M-host.xml | 1 +
.../x86_64-cpuid-Core-i7-3740QM-host.xml | 1 +
.../x86_64-cpuid-Core-i7-3770-host.xml | 1 +
.../x86_64-cpuid-Core-i7-4510U-host.xml | 1 +
.../x86_64-cpuid-Core-i7-4600U-host.xml | 1 +
.../x86_64-cpuid-Core-i7-5600U-arat-host.xml | 1 +
.../x86_64-cpuid-Core-i7-5600U-host.xml | 1 +
.../x86_64-cpuid-Core-i7-5600U-ibrs-host.xml | 1 +
.../x86_64-cpuid-Core-i7-7600U-host.xml | 1 +
.../x86_64-cpuid-Core-i7-7700-host.xml | 1 +
.../x86_64-cpuid-Core-i7-8550U-host.xml | 1 +
.../x86_64-cpuid-Core-i7-8700-host.xml | 1 +
.../x86_64-cpuid-Core2-E6850-host.xml | 1 +
.../x86_64-cpuid-Core2-Q9500-host.xml | 1 +
.../x86_64-cpuid-EPYC-7601-32-Core-host.xml | 1 +
...6_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml | 1 +
.../cputestdata/x86_64-cpuid-FX-8150-host.xml | 1 +
.../x86_64-cpuid-Opteron-1352-host.xml | 1 +
.../x86_64-cpuid-Opteron-2350-host.xml | 1 +
.../x86_64-cpuid-Opteron-6234-host.xml | 1 +
.../x86_64-cpuid-Opteron-6282-host.xml | 1 +
.../x86_64-cpuid-Pentium-P6100-host.xml | 1 +
.../x86_64-cpuid-Phenom-B95-host.xml | 1 +
...64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml | 1 +
.../x86_64-cpuid-Xeon-5110-host.xml | 1 +
.../x86_64-cpuid-Xeon-E3-1225-v5-host.xml | 1 +
.../x86_64-cpuid-Xeon-E3-1245-v5-host.xml | 1 +
.../x86_64-cpuid-Xeon-E5-2609-v3-host.xml | 1 +
.../x86_64-cpuid-Xeon-E5-2623-v4-host.xml | 1 +
.../x86_64-cpuid-Xeon-E5-2630-v3-host.xml | 1 +
.../x86_64-cpuid-Xeon-E5-2630-v4-host.xml | 1 +
.../x86_64-cpuid-Xeon-E5-2650-host.xml | 1 +
.../x86_64-cpuid-Xeon-E5-2650-v3-host.xml | 1 +
.../x86_64-cpuid-Xeon-E5-2650-v4-host.xml | 1 +
.../x86_64-cpuid-Xeon-E7-4820-host.xml | 1 +
.../x86_64-cpuid-Xeon-E7-4830-host.xml | 1 +
.../x86_64-cpuid-Xeon-E7-8890-v3-host.xml | 1 +
.../x86_64-cpuid-Xeon-E7540-host.xml | 1 +
.../x86_64-cpuid-Xeon-Gold-5115-host.xml | 1 +
.../x86_64-cpuid-Xeon-Gold-6130-host.xml | 1 +
.../x86_64-cpuid-Xeon-Gold-6148-host.xml | 1 +
.../x86_64-cpuid-Xeon-Platinum-8268-host.xml | 1 +
.../x86_64-cpuid-Xeon-Platinum-9242-host.xml | 1 +
.../x86_64-cpuid-Xeon-W3520-host.xml | 1 +
.../x86_64-cpuid-Xeon-X5460-host.xml | 1 +
61 files changed, 112 insertions(+)
diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
index 2d447da7c3..1a09e27dca 100644
--- a/src/conf/cpu_conf.c
+++ b/src/conf/cpu_conf.c
@@ -159,6 +159,9 @@ virCPUDefCopyModelFilter(virCPUDef *dst,
dst->vendor = g_strdup(src->vendor);
dst->vendor_id = g_strdup(src->vendor_id);
dst->microcodeVersion = src->microcodeVersion;
+ dst->sigFamily = src->sigFamily;
+ dst->sigModel = src->sigModel;
+ dst->sigStepping = src->sigStepping;
dst->nfeatures_max = src->nfeatures;
dst->nfeatures = 0;
@@ -210,6 +213,9 @@ virCPUDefStealModel(virCPUDef *dst,
dst->model = g_steal_pointer(&src->model);
dst->features = g_steal_pointer(&src->features);
dst->microcodeVersion = src->microcodeVersion;
+ dst->sigFamily = src->sigFamily;
+ dst->sigModel = src->sigModel;
+ dst->sigStepping = src->sigStepping;
dst->nfeatures_max = src->nfeatures_max;
src->nfeatures_max = 0;
dst->nfeatures = src->nfeatures;
@@ -421,6 +427,7 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt,
if (def->type == VIR_CPU_TYPE_HOST) {
g_autofree char *arch = virXPathString("string(./arch[1])", ctxt);
xmlNodePtr counter_node = NULL;
+ xmlNodePtr signature_node = NULL;
if (!arch) {
virReportError(VIR_ERR_XML_ERROR, "%s",
@@ -441,6 +448,26 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt,
return -1;
}
+ if ((signature_node = virXPathNode("./signature[1]", ctxt))) {
+ if (virXMLPropUInt(signature_node, "family", 10,
+ VIR_XML_PROP_REQUIRED | VIR_XML_PROP_NONZERO,
+ &def->sigFamily) < 0) {
+ return -1;
+ }
+
+ if (virXMLPropUInt(signature_node, "model", 10,
+ VIR_XML_PROP_REQUIRED | VIR_XML_PROP_NONZERO,
+ &def->sigModel) < 0) {
+ return -1;
+ }
+
+ if (virXMLPropUInt(signature_node, "stepping", 10,
+ VIR_XML_PROP_REQUIRED | VIR_XML_PROP_NONZERO,
+ &def->sigStepping) < 0) {
+ return -1;
+ }
+ }
+
if ((counter_node = virXPathNode("./counter[@name='tsc']", ctxt))) {
tsc = g_new0(virHostCPUTscInfo, 1);
@@ -753,6 +780,15 @@ virCPUDefFormatBuf(virBuffer *buf,
virBufferAsprintf(buf, "<microcode version='%u'/>\n",
def->microcodeVersion);
+ if (def->type == VIR_CPU_TYPE_HOST &&
+ def->sigFamily && def->sigModel && def->sigStepping) {
+ virBufferAddLit(buf, "<signature");
+ virBufferAsprintf(buf, " family='%u'", def->sigFamily);
+ virBufferAsprintf(buf, " model='%u'", def->sigModel);
+ virBufferAsprintf(buf, " stepping='%u'", def->sigStepping);
+ virBufferAddLit(buf, "/>\n");
+ }
+
if (def->type == VIR_CPU_TYPE_HOST && def->tsc) {
virBufferAddLit(buf, "<counter name='tsc'");
virBufferAsprintf(buf, " frequency='%llu'", def->tsc->frequency);
diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h
index 2cda4ee1f4..17867d6a30 100644
--- a/src/conf/cpu_conf.h
+++ b/src/conf/cpu_conf.h
@@ -134,6 +134,9 @@ struct _virCPUDef {
unsigned int dies;
unsigned int cores;
unsigned int threads;
+ unsigned int sigFamily;
+ unsigned int sigModel;
+ unsigned int sigStepping;
size_t nfeatures;
size_t nfeatures_max;
virCPUFeatureDef *features;
diff --git a/src/conf/schemas/cputypes.rng b/src/conf/schemas/cputypes.rng
index 056e66e1b4..7c84216240 100644
--- a/src/conf/schemas/cputypes.rng
+++ b/src/conf/schemas/cputypes.rng
@@ -342,6 +342,19 @@
</attribute>
</element>
</optional>
+ <optional>
+ <element name="signature">
+ <attribute name="family">
+ <ref name="positiveInteger"/>
+ </attribute>
+ <attribute name="model">
+ <ref name="positiveInteger"/>
+ </attribute>
+ <attribute name="stepping">
+ <ref name="positiveInteger"/>
+ </attribute>
+ </element>
+ </optional>
<optional>
<element name="counter">
<attribute name="name">
diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index a4aca6055d..c4462f34a7 100644
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -2265,6 +2265,9 @@ x86Decode(virCPUDef *cpu,
cpuModel->nfeatures = 0;
cpu->nfeatures_max = cpuModel->nfeatures_max;
cpuModel->nfeatures_max = 0;
+ cpu->sigFamily = sigFamily;
+ cpu->sigModel = sigModel;
+ cpu->sigStepping = sigStepping;
return 0;
}
diff --git a/tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml b/tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml
index 2430adbfbc..220dfb6467 100644
--- a/tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Opteron_G5</model>
<vendor>AMD</vendor>
+ <signature family='21' model='16' stepping='1'/>
<feature name='vme'/>
<feature name='ht'/>
<feature name='monitor'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml b/tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml
index 8cf4341099..3c8a005122 100644
--- a/tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-D510-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>n270</model>
<vendor>Intel</vendor>
+ <signature family='6' model='28' stepping='10'/>
<feature name='pse36'/>
<feature name='ds'/>
<feature name='acpi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml b/tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml
index c79713dcaa..1f4eb7b727 100644
--- a/tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-N450-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>n270</model>
<vendor>Intel</vendor>
+ <signature family='6' model='28' stepping='10'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml b/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml
index b3e9d5c1ff..c59ebfa799 100644
--- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Westmere-IBRS</model>
<vendor>Intel</vendor>
+ <signature family='6' model='134' stepping='5'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml b/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml
index b0777181bb..6ac4ad55ef 100644
--- a/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Cooperlake</model>
<vendor>Intel</vendor>
+ <signature family='6' model='85' stepping='11'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-host.xml
index a604acb911..cf8b175db1 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>SandyBridge</model>
<vendor>Intel</vendor>
+ <signature family='6' model='42' stepping='7'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
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 a604acb911..cf8b175db1 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>SandyBridge</model>
<vendor>Intel</vendor>
+ <signature family='6' model='42' stepping='7'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
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 d1d0bc7168..827b16cb69 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Haswell-noTSX</model>
<vendor>Intel</vendor>
+ <signature family='6' model='60' stepping='3'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-650-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-650-host.xml
index e7256d52d0..4234c4df5a 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-650-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-650-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Westmere</model>
<vendor>Intel</vendor>
+ <signature family='6' model='37' stepping='2'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml
index faaa07f19b..c52e8db235 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Skylake-Client</model>
<vendor>Intel</vendor>
+ <signature family='6' model='94' stepping='3'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-host.xml
index a604acb911..cf8b175db1 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>SandyBridge</model>
<vendor>Intel</vendor>
+ <signature family='6' model='42' stepping='7'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
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 e139004923..adcc4b86c5 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
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>SandyBridge</model>
<vendor>Intel</vendor>
+ <signature family='6' model='42' stepping='7'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
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 a23c651a08..94352ee8bf 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>IvyBridge</model>
<vendor>Intel</vendor>
+ <signature family='6' model='58' stepping='9'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
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 9fec131ac9..e2503cd35c 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>IvyBridge</model>
<vendor>Intel</vendor>
+ <signature family='6' model='58' stepping='9'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-host.xml
index a23c651a08..94352ee8bf 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>IvyBridge</model>
<vendor>Intel</vendor>
+ <signature family='6' model='58' stepping='9'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
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 61bcefbfcb..a6307e834e 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Westmere</model>
<vendor>Intel</vendor>
+ <signature family='6' model='69' stepping='1'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
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 fae8e8d0a8..8bbac47a2e 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Haswell-noTSX</model>
<vendor>Intel</vendor>
+ <signature family='6' model='69' stepping='1'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml
index ea622c87c7..b39148f37f 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
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Broadwell</model>
<vendor>Intel</vendor>
+ <signature family='6' model='61' stepping='4'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
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 ea622c87c7..b39148f37f 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Broadwell</model>
<vendor>Intel</vendor>
+ <signature family='6' model='61' stepping='4'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml
index a534d2dec5..2ab8890464 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
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Broadwell-IBRS</model>
<vendor>Intel</vendor>
+ <signature family='6' model='61' stepping='4'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
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 bbdfb6aa61..edfb8ec421 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Skylake-Client-IBRS</model>
<vendor>Intel</vendor>
+ <signature family='6' model='142' stepping='9'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml
index faaa07f19b..08255621ec 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Skylake-Client</model>
<vendor>Intel</vendor>
+ <signature family='6' model='158' stepping='9'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
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 7681c94649..1e3f1d1719 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Skylake-Client-noTSX-IBRS</model>
<vendor>Intel</vendor>
+ <signature family='6' model='142' stepping='10'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml
index bbdfb6aa61..4174d79ce7 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Skylake-Client-IBRS</model>
<vendor>Intel</vendor>
+ <signature family='6' model='158' stepping='10'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core2-E6850-host.xml b/tests/cputestdata/x86_64-cpuid-Core2-E6850-host.xml
index e7ddc39ceb..e0ec4cd795 100644
--- a/tests/cputestdata/x86_64-cpuid-Core2-E6850-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core2-E6850-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Conroe</model>
<vendor>Intel</vendor>
+ <signature family='6' model='15' stepping='11'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml b/tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml
index 4dc25588d5..586b8e0f59 100644
--- a/tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core2-Q9500-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Penryn</model>
<vendor>Intel</vendor>
+ <signature family='6' model='23' stepping='10'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml
index 8c2c975fdd..da05dd4709 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
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>EPYC</model>
<vendor>AMD</vendor>
+ <signature family='23' model='1' stepping='2'/>
<feature name='ht'/>
<feature name='monitor'/>
<feature name='osxsave'/>
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 c3bbf78396..e91c14c715 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
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>EPYC-IBPB</model>
<vendor>AMD</vendor>
+ <signature family='23' model='1' stepping='2'/>
<feature name='ht'/>
<feature name='monitor'/>
<feature name='osxsave'/>
diff --git a/tests/cputestdata/x86_64-cpuid-FX-8150-host.xml b/tests/cputestdata/x86_64-cpuid-FX-8150-host.xml
index 75595c02af..4fb2d3978b 100644
--- a/tests/cputestdata/x86_64-cpuid-FX-8150-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-FX-8150-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Opteron_G4</model>
<vendor>AMD</vendor>
+ <signature family='21' model='1' stepping='2'/>
<feature name='vme'/>
<feature name='ht'/>
<feature name='monitor'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml b/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml
index ecd532167a..7b0b3dfe6a 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Opteron_G3</model>
<vendor>AMD</vendor>
+ <signature family='16' model='2' stepping='3'/>
<feature name='vme'/>
<feature name='ht'/>
<feature name='monitor'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml b/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml
index ecd532167a..7b0b3dfe6a 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Opteron_G3</model>
<vendor>AMD</vendor>
+ <signature family='16' model='2' stepping='3'/>
<feature name='vme'/>
<feature name='ht'/>
<feature name='monitor'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml b/tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml
index 75595c02af..4fb2d3978b 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Opteron_G4</model>
<vendor>AMD</vendor>
+ <signature family='21' model='1' stepping='2'/>
<feature name='vme'/>
<feature name='ht'/>
<feature name='monitor'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml b/tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml
index 75595c02af..4fb2d3978b 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Opteron_G4</model>
<vendor>AMD</vendor>
+ <signature family='21' model='1' stepping='2'/>
<feature name='vme'/>
<feature name='ht'/>
<feature name='monitor'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml b/tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml
index 3975aa7e1f..a70f8ccd46 100644
--- a/tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Pentium-P6100-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>core2duo</model>
<vendor>Intel</vendor>
+ <signature family='6' model='37' stepping='5'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml b/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml
index 95875918c9..dba7b2b161 100644
--- a/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>athlon</model>
<vendor>AMD</vendor>
+ <signature family='16' model='4' stepping='2'/>
<feature name='mca'/>
<feature name='clflush'/>
<feature name='ht'/>
diff --git 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
index 8c2c975fdd..15ec20bd63 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
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>EPYC</model>
<vendor>AMD</vendor>
+ <signature family='23' model='1' stepping='1'/>
<feature name='ht'/>
<feature name='monitor'/>
<feature name='osxsave'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-5110-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-5110-host.xml
index ca3a84cc5c..beb465df86 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-5110-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-5110-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Conroe</model>
<vendor>Intel</vendor>
+ <signature family='6' model='15' stepping='6'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
index e7ced42797..d4a2a15e60 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
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Skylake-Client-IBRS</model>
<vendor>Intel</vendor>
+ <signature family='6' model='94' stepping='3'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml
index faaa07f19b..c52e8db235 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
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Skylake-Client</model>
<vendor>Intel</vendor>
+ <signature family='6' model='94' stepping='3'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml
index 9bac4b4648..bc39536de9 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
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Haswell-noTSX-IBRS</model>
<vendor>Intel</vendor>
+ <signature family='6' model='63' stepping='2'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml
index 43a0b93ab4..70419d7944 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
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Broadwell-IBRS</model>
<vendor>Intel</vendor>
+ <signature family='6' model='79' stepping='1'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-host.xml
index 431a737a44..6d959eedc3 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
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Haswell-noTSX</model>
<vendor>Intel</vendor>
+ <signature family='6' model='63' stepping='2'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml
index 5dd8d749de..e2ace9021b 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
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Broadwell</model>
<vendor>Intel</vendor>
+ <signature family='6' model='79' stepping='1'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml
index 80ca6c343f..628900fd2c 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>SandyBridge-IBRS</model>
<vendor>Intel</vendor>
+ <signature family='6' model='45' stepping='7'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-host.xml
index 431a737a44..6d959eedc3 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
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Haswell-noTSX</model>
<vendor>Intel</vendor>
+ <signature family='6' model='63' stepping='2'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml
index 5dd8d749de..e2ace9021b 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
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Broadwell</model>
<vendor>Intel</vendor>
+ <signature family='6' model='79' stepping='1'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-host.xml
index 52902479b9..58468cd096 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Westmere</model>
<vendor>Intel</vendor>
+ <signature family='6' model='47' stepping='2'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-host.xml
index 52902479b9..58468cd096 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Westmere</model>
<vendor>Intel</vendor>
+ <signature family='6' model='47' stepping='2'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-host.xml
index e90598ec63..6a18204c02 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
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Haswell</model>
<vendor>Intel</vendor>
+ <signature family='6' model='63' stepping='4'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7540-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-E7540-host.xml
index 42b43116bd..ee526e7119 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7540-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7540-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Nehalem-IBRS</model>
<vendor>Intel</vendor>
+ <signature family='6' model='46' stepping='6'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
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 9de76fd640..e004747ada 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Skylake-Server-IBRS</model>
<vendor>Intel</vendor>
+ <signature family='6' model='85' stepping='4'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
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 207e9e0ee4..fba4ccf506 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Skylake-Server-IBRS</model>
<vendor>Intel</vendor>
+ <signature family='6' model='85' stepping='4'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
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 b18ceddc60..da7e96e533 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Skylake-Server</model>
<vendor>Intel</vendor>
+ <signature family='6' model='85' stepping='4'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
index fdeafc4870..96effe5684 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Cascadelake-Server</model>
<vendor>Intel</vendor>
+ <signature family='6' model='85' stepping='6'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml
index 01447f3478..ea51fc40a1 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Cascadelake-Server</model>
<vendor>Intel</vendor>
+ <signature family='6' model='85' stepping='7'/>
<feature name='ds'/>
<feature name='acpi'/>
<feature name='ss'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-host.xml
index c4a9226973..35dd63f360 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Nehalem</model>
<vendor>Intel</vendor>
+ <signature family='6' model='26' stepping='5'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml
index e73c4780c9..91ab9726da 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-X5460-host.xml
@@ -2,6 +2,7 @@
<arch>x86_64</arch>
<model>Penryn</model>
<vendor>Intel</vendor>
+ <signature family='6' model='23' stepping='6'/>
<feature name='vme'/>
<feature name='ds'/>
<feature name='acpi'/>
--
2.36.1
3 years
- 3
- 2