June 2022 - Devel - libvirt List Archives

Plans for the next release
by Jiri Denemark 16 Jun '22

16 Jun '22

We are getting close to the next release of libvirt. To aim for the release on Jul 01 I suggest entering the freeze on Monday Jun 27 and tagging RC2 on Wednesday Jun 29. I hope this works for everyone. Jirka

1 0

[PATCH] virMacAddrParse: Fix wrong termination character
by Eustance Wu 16 Jun '22

16 Jun '22

>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

2 2

[PATCH] [Doc] Update 2 items in the formatdomain.rst
by Yalan Zhang 16 Jun '22

16 Jun '22

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

2 1

[PATCH v3 00/26] Remove some unused includes
by Peng Liang 16 Jun '22

16 Jun '22

2 27

[PATCH] virMacAddrParse: Fix wrong termination character
by Eustance Wu 16 Jun '22

16 Jun '22

>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

2 1

(no subject)
by Eustance Wu 16 Jun '22

16 Jun '22

>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

1 0

[PATCH] qemuxml2*test: Add 'startupPolicy' fields to aio-io_uring case
by Peter Krempa 14 Jun '22

14 Jun '22

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

2 1

[PATCH v2] conf: cpu: Add <signature family=X model=X stepping=X/>
by Cole Robinson 14 Jun '22

14 Jun '22

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

2 1

Release of libvirt-php-0.5.6
by Michal Prívozník 14 Jun '22

14 Jun '22

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

1 0

[PATCH 0/4] Fix regression in 'startupPolicy' validation for block disks
by Peter Krempa 14 Jun '22

14 Jun '22

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

2 5

[PATCH] conf: cpu: Add <signature family=X model=X stepping=X/>
by Cole Robinson 14 Jun '22

14 Jun '22

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 2

[PATCH v4 00/13] Introduce network backed NVRAM
by Peter Krempa 14 Jun '22

14 Jun '22

This version fixes multiple problems which I'd point out when reviewing: - virStorageSource is properly used in all places - logic for initializing NVRAM imgages from template is fixed to avoid touching network backed nvrams - documentation now states the correct version - some cleanups - dropped NEWS entry stashed in a patch with other stuff - fixed/simplified schema Rohit, please give it a try. I didn't yet have time to test this beyond unit tests. This series can also be fetched from my repo: git fetch https://gitlab.com/pipo.sk/libvirt.git network-nvram2 Peter Krempa (9): qemuDomainPrepareStorageSourceBlockdev: Add a variant for custom nodename qemuBuildPflashBlockdevCommandLine: Take virDomainObj instead of private data qemu: Use 'def->os.loader->nvram' directly instead of 'priv->pflash1' qemu: Properly setup the NVRAM virStorageSource qemuProcessReconnect: Don't re-instantiate pflash storage source qemuDomainInitializePflashStorageSource: Properly and fully initialize nvram source qemuFirmwareFillDomain: Don't fill in firmware for network backed nvram conf: Extract formatting of NVRAM out of virDomainLoaderDefFormat virDomainHugepagesFormat: Use virXMLFormatElementEmpty Rohit Kumar (4): conf: Convert def->os.loader->nvram a virStorageSource qemu: validate: Reject virStorageSource features we don't want to support with nvram conf: Add support to parse/format <source> for NVRAM Add unit tests for new specification of nvram. docs/formatdomain.rst | 37 +++++ src/conf/domain_conf.c | 136 ++++++++++++++---- src/conf/domain_conf.h | 3 +- src/conf/schemas/domaincommon.rng | 9 +- src/qemu/qemu_cgroup.c | 2 +- src/qemu/qemu_command.c | 22 +-- src/qemu/qemu_domain.c | 58 +++++--- src/qemu/qemu_domain.h | 9 +- src/qemu/qemu_driver.c | 5 +- src/qemu/qemu_firmware.c | 30 +++- src/qemu/qemu_namespace.c | 6 +- src/qemu/qemu_process.c | 11 +- src/qemu/qemu_validate.c | 115 +++++++++++---- src/security/security_dac.c | 19 +-- src/security/security_selinux.c | 21 +-- src/security/virt-aa-helper.c | 5 +- src/vbox/vbox_common.c | 3 +- .../bios-nvram-file.x86_64-latest.args | 37 +++++ tests/qemuxml2argvdata/bios-nvram-file.xml | 23 +++ .../bios-nvram-network-iscsi.x86_64-4.1.0.err | 1 + ...ios-nvram-network-iscsi.x86_64-latest.args | 38 +++++ .../bios-nvram-network-iscsi.xml | 31 ++++ .../bios-nvram-network-nbd.x86_64-latest.args | 37 +++++ .../bios-nvram-network-nbd.xml | 28 ++++ tests/qemuxml2argvtest.c | 4 + .../bios-nvram-file.x86_64-latest.xml | 39 +++++ ...bios-nvram-network-iscsi.x86_64-latest.xml | 44 ++++++ .../bios-nvram-network-nbd.x86_64-latest.xml | 41 ++++++ tests/qemuxml2xmltest.c | 3 + 29 files changed, 696 insertions(+), 121 deletions(-) create mode 100644 tests/qemuxml2argvdata/bios-nvram-file.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/bios-nvram-file.xml create mode 100644 tests/qemuxml2argvdata/bios-nvram-network-iscsi.x86_64-4.1.0.err create mode 100644 tests/qemuxml2argvdata/bios-nvram-network-iscsi.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/bios-nvram-network-iscsi.xml create mode 100644 tests/qemuxml2argvdata/bios-nvram-network-nbd.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/bios-nvram-network-nbd.xml create mode 100644 tests/qemuxml2xmloutdata/bios-nvram-file.x86_64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/bios-nvram-network-iscsi.x86_64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/bios-nvram-network-nbd.x86_64-latest.xml -- 2.35.3

3 27

[PATCH v3 0/5] Introduce network backed NVRAM
by Rohit Kumar 14 Jun '22

14 Jun '22

Libvirt domain XML currently allows only local filepaths that can be used to specify a NVRAM disk. It should be possible to support NVRAM disks on network storage as it would give flexibility to start the VM on any host without having to worry about where to get the latest nvram image. This series extends the NVRAM element to support hosting over network-backed disks. It achieves this by embedding virStorageSource pointer for nvram into _virDomainLoaderDef. It introduces a 'type' attribute for NVRAM element to specify 'file' vs 'network' backed NVRAM. XML with new annotation: <nvram type='network'> <source protocol='iscsi' name='iqn.2013-07.com.example:iscsi-nopool/0'> <host name='example.com' port='6000'/> <auth username='myname'> <secret type='iscsi' usage='mycluster_myname'/> </auth> </host> </source> </nvram> or <nvram type='network'> <source protocol='nbd' name='bar'> <host name='example.org' port='6000'/> </source> </nvram> or <nvram type='file'> <source file='/var/lib/libvirt/nvram/guest_VARS.fd'/> </nvram> Changes v1->v2: - Split the patch into smaller patches - Added unit test - Updated the doc - Addressed Peter's comment on v1 (https://listman.redhat.com/archives/libvir-list/2022-March/229684.html) Changes v2->v3: - Added authentication with 'iscsi' protocol unit test - Updated the validation logic - Addressed Peter's other comments on v2 patch(https://listman.redhat.com/archives/libvir-list/2022-April/229971.htm… Rohit Kumar (5): Make NVRAM a virStorageSource type. Add support to parse/format/validate virStorageSource type NVRAM Update schema, docs, and validation logic to support network backed NVRAM Add unit tests for network backed NVRAM Add unit test to support new 'file' type NVRAM NEWS.rst | 5 + docs/formatdomain.rst | 34 +++++- src/conf/domain_conf.c | 115 +++++++++++++++--- src/conf/domain_conf.h | 3 +- src/conf/schemas/domaincommon.rng | 21 +++- src/qemu/qemu_cgroup.c | 3 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_domain.c | 23 +++- src/qemu/qemu_driver.c | 5 +- src/qemu/qemu_firmware.c | 23 +++- src/qemu/qemu_namespace.c | 5 +- src/qemu/qemu_process.c | 5 +- src/qemu/qemu_validate.c | 71 +++++++++++ src/security/security_dac.c | 6 +- src/security/security_selinux.c | 6 +- src/security/virt-aa-helper.c | 5 +- src/vbox/vbox_common.c | 3 +- .../bios-nvram-file.x86_64-latest.args | 37 ++++++ tests/qemuxml2argvdata/bios-nvram-file.xml | 23 ++++ .../bios-nvram-network-iscsi.x86_64-4.1.0.err | 1 + ...ios-nvram-network-iscsi.x86_64-latest.args | 38 ++++++ .../bios-nvram-network-iscsi.xml | 31 +++++ .../bios-nvram-network-nbd.x86_64-latest.args | 37 ++++++ .../bios-nvram-network-nbd.xml | 28 +++++ tests/qemuxml2argvtest.c | 4 + .../bios-nvram-file.x86_64-latest.xml | 39 ++++++ ...bios-nvram-network-iscsi.x86_64-latest.xml | 44 +++++++ .../bios-nvram-network-nbd.x86_64-latest.xml | 41 +++++++ tests/qemuxml2xmltest.c | 3 + 29 files changed, 618 insertions(+), 43 deletions(-) create mode 100644 tests/qemuxml2argvdata/bios-nvram-file.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/bios-nvram-file.xml create mode 100644 tests/qemuxml2argvdata/bios-nvram-network-iscsi.x86_64-4.1.0.err create mode 100644 tests/qemuxml2argvdata/bios-nvram-network-iscsi.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/bios-nvram-network-iscsi.xml create mode 100644 tests/qemuxml2argvdata/bios-nvram-network-nbd.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/bios-nvram-network-nbd.xml create mode 100644 tests/qemuxml2xmloutdata/bios-nvram-file.x86_64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/bios-nvram-network-iscsi.x86_64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/bios-nvram-network-nbd.x86_64-latest.xml -- 2.25.1

3 15

[libvirt PATCH] Fix incorrect uses of g_clear_pointer() introduced in 8.1.0
by Mark Mielke 13 Jun '22

13 Jun '22

This is a partial revert of 87a43a907f0ad4897a28ad7c216bc70f37270b93. The change to use g_clear_pointer() in more places was accidentally applied to cases involving vir_g_source_unref(). In some cases, the ordering of g_source_destroy() and vir_g_source_unref() was reversed, which resulted in the source being marked as destroyed, after it is already unreferenced. This use-after-free case might work in many cases, but with versions of glibc older than 2.64.0 it may defer unref to run within the main thread to avoid a race condition, which creates a large distance between the g_source_unref() and g_source_destroy(). In some cases, the call to vir_g_source_unref() was replaced with a second call to g_source_destroy(), leading to a memory leak or worse. In our experience, the symptoms were that use of libvirt-python became slower over time, with OpenStack nova-compute initially taking around one second to periodically query the host PCI devices, and within an hour it was taking over a minute to complete the same operation, until it is was eventually running this query back-to-back, resulting in the nova-compute process consuming 100% of one CPU thread, losing its RabbitMQ connection frequently, and showing up as down to the control plane. --- src/qemu/qemu_agent.c | 3 ++- src/qemu/qemu_monitor.c | 3 ++- src/util/vireventglib.c | 12 ++++++++---- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index f57a8d5f25..e6e92c7dc4 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -452,8 +452,9 @@ static void qemuAgentUnregister(qemuAgent *agent) { if (agent->watch) { + g_source_destroy(agent->watch); vir_g_source_unref(agent->watch, agent->context); - g_clear_pointer(&agent->watch, g_source_destroy); + agent->watch = NULL; } } diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 37bcbde31e..32c993a941 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -794,8 +794,9 @@ void qemuMonitorUnregister(qemuMonitor *mon) { if (mon->watch) { + g_source_destroy(mon->watch); vir_g_source_unref(mon->watch, mon->context); - g_clear_pointer(&mon->watch, g_source_destroy); + mon->watch = NULL; } } diff --git a/src/util/vireventglib.c b/src/util/vireventglib.c index fc04d8f712..983787932f 100644 --- a/src/util/vireventglib.c +++ b/src/util/vireventglib.c @@ -228,7 +228,8 @@ virEventGLibHandleUpdate(int watch, VIR_DEBUG("Removed old handle source=%p", data->source); g_source_destroy(data->source); - g_clear_pointer(&data->source, g_source_destroy); + vir_g_source_unref(data->source, NULL); + data->source = NULL; data->events = 0; } @@ -275,8 +276,9 @@ virEventGLibHandleRemove(int watch) data, watch, data->fd); if (data->source != NULL) { + g_source_destroy(data->source); vir_g_source_unref(data->source, NULL); - g_clear_pointer(&data->source, g_source_destroy); + data->source = NULL; data->events = 0; } @@ -417,8 +419,9 @@ virEventGLibTimeoutUpdate(int timer, if (data->source == NULL) goto cleanup; + g_source_destroy(data->source); vir_g_source_unref(data->source, NULL); - g_clear_pointer(&data->source, g_source_destroy); + data->source = NULL; } cleanup: @@ -465,8 +468,9 @@ virEventGLibTimeoutRemove(int timer) data, timer); if (data->source != NULL) { + g_source_destroy(data->source); vir_g_source_unref(data->source, NULL); - g_clear_pointer(&data->source, g_source_destroy); + data->source = NULL; } /* since the actual timeout deletion is done asynchronously, a timeoutUpdate call may -- 2.36.1

2 3

[PATCH 0/2] Two <interface type='direct'/> related fixes
by Michal Privoznik 13 Jun '22

13 Jun '22

Except not really. Only the first one is strictly related to that type of <interface/>. The other one fixes a regression introduced in 8.4.0 and it just so happens that I'm able to reproduce it 100% on my (SRIOV-less) machine. Michal Prívozník (2): virNetDevSaveNetConfig: Pass mode to virFileWriteStr() qemuBuildInterfaceConnect: Initialize @tapfd array src/qemu/qemu_command.c | 2 ++ src/util/virnetdev.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) -- 2.35.1

4 7

[PATCH] spec: Xen arches have changed on Fedora 36+
by Cole Robinson 13 Jun '22

13 Jun '22

Latest fedora 36+ xen builds have dropped i686 and armv7hl builds. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- libvirt.spec.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 59d2f96709..c4ea02fc8e 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -21,6 +21,9 @@ %define arches_systemtap_64bit %{arches_64bit} %define arches_dmidecode %{arches_x86} %define arches_xen %{arches_x86} aarch64 +%if 0%{?fedora} >= 36 +%define arches_xen x86_64 aarch64 +%endif %define arches_vbox %{arches_x86} %define arches_ceph %{arches_64bit} %define arches_zfs %{arches_x86} %{power64} %{arm} -- 2.36.1

2 4

[PATCH] kbase: launch_security_sev: Break up overly long line
by Peter Krempa 13 Jun '22

13 Jun '22

Standard text is aligned to 80 colums in all .rst files. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Pushed as trivial. docs/kbase/launch_security_sev.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/kbase/launch_security_sev.rst b/docs/kbase/launch_security_sev.rst index 51b3e14dbf..2734832487 100644 --- a/docs/kbase/launch_security_sev.rst +++ b/docs/kbase/launch_security_sev.rst @@ -295,9 +295,9 @@ In order to make virtio devices work, we need to use ``<driver iommu='on'/>`` inside the given device XML element in order to enable DMA API in the virtio driver. -Starting with QEMU 6.0.0 QEMU will set this for us by default. For earlier versions though, you will need to explicitly enable this in the device XML as follows: - -:: +Starting with QEMU 6.0.0 QEMU will set this for us by default. For earlier +versions though, you will need to explicitly enable this in the device XML as +follows:: # virsh edit <domain> <domain> -- 2.36.1

1 0

[libvirt PATCH 0/2] qemu: virtiofs: add --thread-pool-size option
by Ján Tomko 13 Jun '22

13 Jun '22

Ján Tomko (2): conf: virtiofs: add thread_pool element qemu: virtiofs: format --thread-pool-size docs/formatdomain.rst | 6 ++++++ src/conf/domain_conf.c | 14 ++++++++++++++ src/conf/domain_conf.h | 1 + src/conf/schemas/domaincommon.rng | 9 +++++++++ src/qemu/qemu_virtiofs.c | 4 ++++ tests/qemuxml2argvdata/vhost-user-fs-fd-memory.xml | 1 + 6 files changed, 35 insertions(+) -- 2.35.1

2 4

[PATCH] docs: kbase/launch_security_sev: QEMU 6.0+ sets iommu=on for us
by Cole Robinson 13 Jun '22

13 Jun '22

Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- docs/kbase/launch_security_sev.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/kbase/launch_security_sev.rst b/docs/kbase/launch_security_sev.rst index 3ebb01ad80..9f6330a1ca 100644 --- a/docs/kbase/launch_security_sev.rst +++ b/docs/kbase/launch_security_sev.rst @@ -295,6 +295,8 @@ In order to make virtio devices work, we need to use ``<driver iommu='on'/>`` inside the given device XML element in order to enable DMA API in the virtio driver. +QEMU 6.0 and later will `set this by default <https://gitlab.com/qemu-project/qemu/-/commit/9f88a7a3df>`__. For earlier QEMU versions, you will need to explicitly enable this in the device XML: + :: # virsh edit <domain> -- 2.36.1

2 2

[libvirt PATCH] util: Fix error reporting in virProcessSetMaxMemLock
by Jiri Denemark 10 Jun '22

10 Jun '22

Commit v7.1.0-136-g6a6d6bb520 refactored virProcessSetMaxMemLock by moving its part into a new virProcessSetLimit, but lost "return -1" on error; Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/util/virprocess.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 5ed0b5d0db..013afd91b4 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -926,6 +926,7 @@ virProcessSetMaxMemLock(pid_t pid, unsigned long long bytes) _("cannot limit locked memory " "of process %lld to %llu"), (long long int)pid, bytes); + return -1; } VIR_DEBUG("Locked memory for process %lld limited to %llu bytes", -- 2.35.1

2 2

[libvirt PATCH 0/3] firmware: Small fixes and cleanups
by Andrea Bolognani 10 Jun '22

10 Jun '22

Andrea Bolognani (3): vmx: Declare support for firmware autoselection conf: Fix virDomainDefOSValidate() qemu: Simplify handling of virTristateBool values src/conf/domain_validate.c | 6 +++--- src/qemu/qemu_firmware.c | 38 ++++++++++++++++---------------------- src/vmx/vmx.c | 1 + 3 files changed, 20 insertions(+), 25 deletions(-) -- 2.35.3

2 4

[libvirt PATCH v2 0/7] ci: Drop Fedora 34, add Fedora 36
by Andrea Bolognani 09 Jun '22

09 Jun '22

Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/548848259 Only patches 1-5 should be pushed until the issues outlined in https://listman.redhat.com/archives/libvir-list/2022-May/231851.html have been addressed. Changes from [v1] * handle integration tests separately; * don't stop publishing RPMs from the Fedora 35 job [v1] https://listman.redhat.com/archives/libvir-list/2022-May/231838.html Andrea Bolognani (7): ci: Drop Fedora 34 ci: Refresh generated files ci: Add Fedora 36 ci: Move MinGW jobs to Fedora 36 ci: Don't mark any Fedora 36 job as optional ci: Add Fedora 36 to integration tests ci: Move upstream QEMU integration test to Fedora 36 ...ile => fedora-36-cross-mingw32.Dockerfile} | 2 +- ...ile => fedora-36-cross-mingw64.Dockerfile} | 2 +- ...ora-34.Dockerfile => fedora-36.Dockerfile} | 3 +- ci/gitlab.yml | 767 +----------------- ci/gitlab/build-templates.yml | 45 + ci/gitlab/builds.yml | 406 +++++++++ ci/gitlab/container-templates.yml | 52 ++ ci/gitlab/containers.yml | 325 ++++++++ ci/gitlab/sanity-checks.yml | 18 + ci/integration.yml | 24 +- ci/manifest.yml | 5 +- 11 files changed, 869 insertions(+), 780 deletions(-) rename ci/containers/{fedora-35-cross-mingw32.Dockerfile => fedora-36-cross-mingw32.Dockerfile} (98%) rename ci/containers/{fedora-35-cross-mingw64.Dockerfile => fedora-36-cross-mingw64.Dockerfile} (98%) rename ci/containers/{fedora-34.Dockerfile => fedora-36.Dockerfile} (97%) create mode 100644 ci/gitlab/build-templates.yml create mode 100644 ci/gitlab/builds.yml create mode 100644 ci/gitlab/container-templates.yml create mode 100644 ci/gitlab/containers.yml create mode 100644 ci/gitlab/sanity-checks.yml -- 2.35.3

2 17

[libvirt PATCH 0/2] ci: Fixes to enable upstream QEMU integration tests on Fedora 36
by Erik Skultety 09 Jun '22

09 Jun '22

- CVE-2022-24765 handling (>= git-2.35.2) - SELinux relabel the QEMU installation from source Successful pipeline: https://gitlab.com/eskultety/libvirt/-/pipelines/557712098 Erik Skultety (2): ci: integration: SELinux relabel the QEMU we installed from git ci: integration: Set 'safe.directory' when installing QEMU from git ci/integration-template.yml | 6 ++++++ 1 file changed, 6 insertions(+) -- 2.36.1

3 9

[Questions] non-shared disk migration: jobs abort and bandwidth
by Han Han 09 Jun '22

09 Jun '22

Hi developers, Recently, I am researching migration with non-share disk(flags VIR_MIGRATE_NON_SHARED_DISK and VIR_MIGRATE_NON_SHARED_INC). As we know, the non-shared disk migration could have block jobs to copy the disk image from the src host to the dst host. So here are my questions for non-shared disk migration: q1. For the API virDomainMigrate3 with the bandwidth param, could it set the bandwidth of block jobs? q2. For the API virDomainMigrateSetMaxSpeed, could it set the bandwidth of block jobs? q3. For the domain job abort API virDomainAbortJob, could it stop the block job of non-shared disk migration? q4. For the block job bandwidth API virDomainBlockJobSetSpeed, could it set the block job of non-shared disk migration? q5. For the block job abort API virDomainBlockJobAbort, could it stop the block job of non-shared disk migration? Then I got the test results of libvirt-8.4.0-1.el9.x86_64 qemu-kvm-7.0.0-4.el9.x86_64: q1: The bandwidth limit of virDomainMigrate3 is effective to the blockjob: ➜ ~ virsh migrate OVMF qemu+ssh://root@hhan-rhel9--1/system --live --p2p --tls --tls-destination hhan-rhel9--1 --copy-storage-all --disks-uri tcp://hhan-rhel9--1:49156 --bandwidth 2 ➜ ~ virsh blockjob OVMF vda Block Copy: [ 0 %] Bandwidth limit: 2097152 bytes/s (2.000 MiB/s) q2: The virDomainMigrateSetMaxSpeed doesn't change the the bandwidth of block jobs. ➜ ~ virsh migrate-setspeed OVMF 8 ➜ ~ virsh blockjob OVMF vda Block Copy: [ 9 %] Bandwidth limit: 2097152 bytes/s (2.000 MiB/s) q3: The virDomainAbortJob could stop a block job of non-shared disk migration ➜ ~ virsh migrate OVMF qemu+ssh://root@hhan-rhel9--1/system --live --p2p --tls --tls-destination hhan-rhel9--1 --copy-storage-all --disks-uri tcp://hhan-rhel9--1:49156 --bandwidth 2 Then start a virsh event on another terminal: ➜ ~ virsh event --loop --all Abort the domain job: ➜ ~ virsh domjobabort OVMF The error "error: operation aborted: migration out: canceled by client" appears at the terminal of "virsh migrate" The terminal of "virsh event" shows the block job has been failed: event 'block-job' for domain 'OVMF': Block Copy for /var/lib/libvirt/images/OVMF.qcow2 failed event 'block-job-2' for domain 'OVMF': Block Copy for vda failed q4: The block job bandwidth of non-shared disk migration cannot be set by virDomainBlockJobSetSpeed: ➜ ~ virsh blockjob OVMF vda --bandwidth 10 error: Timed out during operation: cannot acquire state change lock (held by monitor=remoteDispatchDomainMigratePerform3Params) q5: The block job of non-shared disk migration cannot be aborted by virDomainBlockJobAbort: ➜ ~ virsh blockjob OVMF vda --abort error: Timed out during operation: cannot acquire state change lock (held by monitor=remoteDispatchDomainMigratePerform3Params) Are the results above expected? Here are my personal thoughts: For the bandwidth in q1 and q2, they are commented as migration bandwidth( https://gitlab.com/libvirt/libvirt/-/blob/master/include/libvirt/libvirt-do… , https://gitlab.com/libvirt/libvirt/-/blob/master/src/libvirt-domain.c#L9696 ), but one works for block jobs while one doesn't. So we should make the comment clear whether they are the bandwidth of VM migration or the bandwidth of migration with blockjobs. What's more, add a flag to virDomainMigrateMaxSpeedFlags to support set bandwidth to the blockjobs in migration. For q4 and q5, if we will not support to change the block job of non-shared disk migration by blockjob APIs, we should note that in the migration doc or the block job doc, to present the difference between this type of block job and the others.

2 2

[PATCH v2 00/15] qemu: Allow setting EventLoopBaseProperties
by Michal Privoznik 08 Jun '22

08 Jun '22

v2 of: https://listman.redhat.com/archives/libvir-list/2022-June/232118.html diff to v1: - switched from <mainloop/> to <defaultiothread/> - switched from long long to int for pool sizes (this means that the 02/16 patch from the original series that introduced virXMLPropLongLong() is no longer needed and thus not in this series). - Extended some docs - Hopefully, I've worked in all Peter's review points. Michal Prívozník (15): virml: Introduce VIR_XML_PROP_NONNEGATIVE flag virDomainDefParseIOThreads: Use g_autoptr() for @iothrid virDomainIOThreadIDDefArrayInit: Decrease scope of @iothrid conf: Move iothread formatter into a separate function conf: Introduce allocator for virDomainIOThreadIDDef conf: Introduce pool_min and pool_max attributes to IOThread qemu: Introduce QEMU_CAPS_IOTHREAD_THREAD_POOL_MAX qemu_validate: Check if QEMU's capable of setting iothread pool size qemu: Generate command line for IOThread pool size include: Introduce typed params for virDomainSetIOThreadParams wrt pool size qemu: Wire up new virDomainSetIOThreadParams parameters virsh: Wire up new virDomainSetIOThreadParams parameters conf: Expose QEMU's main loop object qemu_validate: Check if QEMU's capable of setting main loop pool size qemu: Generate command line for main-loop pool size docs/formatdomain.rst | 14 +- docs/manpages/virsh.rst | 7 +- include/libvirt/libvirt-domain.h | 22 +++ src/conf/domain_conf.c | 162 +++++++++++++++--- src/conf/domain_conf.h | 11 ++ src/conf/schemas/domaincommon.rng | 25 +++ src/conf/virconftypes.h | 2 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 26 ++- src/qemu/qemu_driver.c | 62 ++++++- src/qemu/qemu_monitor.h | 4 + src/qemu/qemu_monitor_json.c | 2 + src/qemu/qemu_validate.c | 33 ++++ src/util/virxml.c | 7 + src/util/virxml.h | 3 + .../caps_7.1.0.x86_64.xml | 1 + ...othreads-ids-pool-sizes.x86_64-latest.args | 45 +++++ .../iothreads-ids-pool-sizes.xml | 62 +++++++ tests/qemuxml2argvtest.c | 1 + ...iothreads-ids-pool-sizes.x86_64-latest.xml | 1 + tests/qemuxml2xmltest.c | 1 + tools/virsh-domain.c | 24 ++- 23 files changed, 480 insertions(+), 38 deletions(-) create mode 100644 tests/qemuxml2argvdata/iothreads-ids-pool-sizes.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/iothreads-ids-pool-sizes.xml create mode 120000 tests/qemuxml2xmloutdata/iothreads-ids-pool-sizes.x86_64-latest.xml -- 2.35.1

3 27