mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-21 21:25:25 +00:00
cpu: Check blockers in virCPUCompareUnusable only if they exist
virCPUCompareUnusable can be called with blockers == NULL in case the CPU model itself is usable (i.e., QEMU reports an empty list of blockers), but the CPU definition contains some additional features which have to be checked. Fixes: v10.8.0-129-g5f8abbb7d0 Reported-by: Han Han <hhan@redhat.com> Signed-off-by: Jiri Denemark <jdenemar@redhat.com> Tested-by: Han Han <hhan@redhat.com> Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
parent
444f45135a
commit
c0b6774d50
@ -201,11 +201,13 @@ virCPUCompareUnusable(virArch arch,
|
||||
char **blocker;
|
||||
size_t i;
|
||||
|
||||
for (blocker = blockers; *blocker; blocker++) {
|
||||
if (!(feat = virCPUDefFindFeature(cpu, *blocker)) ||
|
||||
feat->policy != VIR_CPU_FEATURE_DISABLE) {
|
||||
virBufferAddStr(&features, *blocker);
|
||||
virBufferAddLit(&features, ", ");
|
||||
if (blockers) {
|
||||
for (blocker = blockers; *blocker; blocker++) {
|
||||
if (!(feat = virCPUDefFindFeature(cpu, *blocker)) ||
|
||||
feat->policy != VIR_CPU_FEATURE_DISABLE) {
|
||||
virBufferAddStr(&features, *blocker);
|
||||
virBufferAddLit(&features, ", ");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user