FWIW, this patch is conflicting with current master to apply due to changes
of labels made recently. The fix is rather simple:
On 12/19/19 9:42 AM, Daniel P. Berrangé wrote:
Recently CPU hardware vendors have started to support a new level of
inside the CPU package topology known as a "die". Thus the hierarchy
is now:
sockets > dies > cores > threads
This adds support for "dies" in the XML parser, with the value
defaulting to 1 if not specified for backwards compatibility.
For example a system with 64 logical CPUs might report
<topology sockets="4" dies="2" cores="4" threads="2"/>
Signed-off-by: Daniel P. Berrangé <berrange@xxxxxxxxxx>
---
docs/formatcaps.html.in | 2 +-
[...]
@@ -1059,6 +1067,12 @@ virCPUDefIsEqual(virCPUDefPtr src,
goto cleanup;
}
+ if (src->dies != dst->dies) {
+ MISMATCH(_("Target CPU dies %d does not match source %d"),
+ dst->dies, src->dies);
+ goto cleanup;
+ }
+
if (src->cores != dst->cores) {
MISMATCH(_("Target CPU cores %d does not match source %d"),
dst->cores, src->cores);
In this chunk there is no 'cleanup' anymore, thus you'll just 'return false'
in the new code you're adding.
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
