External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 05:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

cpu_x86: Promote added/removed from ancestor

Browse Source 
When a CPU model is defined based on another model, we were completely
ignoring features marked as added to or removed from the original model
after it was released. For added features this is the right thing to do
as it will promote them to become normal features included in the new
model. But features marked as removed would become included in the new
model as well. We need to explicitly remove them as if they were never
included in the model.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Jiri Denemark 2024-11-15 14:52:12 +01:00
parent 61dd5d6bef
commit 88e7cc1477
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/cpu/cpu_x86.c
View File

@ -161,7 +161,10 @@ struct _virCPUx86Model {
virCPUx86Signatures *signatures;
/* Inherited from ancestor */
virCPUx86Data data;
/* Not inherited from ancestor */
/* Not inherited from ancestor.
* The corresponding features are removed from the new model data.
*/
GStrv removedFeatures;
/* Features added to the CPU model after its original version was released.
@ -172,7 +175,9 @@ struct _virCPUx86Model {
* included in the CPU model by the hypervisor, but libvirt didn't support
* them when introducing the CPU model. In other words, they were enabled,
* but we ignored them.
*
* Not inherited from ancestor.
* The corresponding features are a genuine part of the new model.
*/
GStrv addedFeatures;
};
@ -1542,6 +1547,7 @@ x86ModelParseAncestor(virCPUx86Model *model,
g_autofree char *name = NULL;
virCPUx86Model *ancestor;
int rc;
char **removed;
if ((rc = virXPathBoolean("boolean(./model)", ctxt)) <= 0)
return rc;
@ -1565,6 +1571,13 @@ x86ModelParseAncestor(virCPUx86Model *model,
model->signatures = virCPUx86SignaturesCopy(ancestor->signatures);
x86DataCopy(&model->data, &ancestor->data);
for (removed = ancestor->removedFeatures; removed && *removed; removed++) {
virCPUx86Feature *feat;
if ((feat = x86FeatureFind(map, *removed)))
x86DataSubtract(&model->data, &feat->data);
}
return 0;
}