shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-09-16 17:45:48 +03:00
Code Releases Activity

conf: Don't overwrite KVM feature config struct if the feature is present twice

Browse Source 
Don't allocate the struct if it exists already. This sidesteps the
discussion about whether forbidding multiple feature definitions makes
sense.

Fixes: a8e0f9c682
Closes: https://gitlab.com/libvirt/libvirt/-/issues/670
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Peter Krempa
2024-09-06 14:02:31 +02:00
parent 3afbb1644c
commit 5d77061d7e
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/conf/domain_conf.c
View File

@@ -16657,10 +16657,12 @@ static int
virDomainFeaturesKVMDefParse(virDomainDef *def, virDomainFeaturesKVMDefParse(virDomainDef *def,
xmlNodePtr node) xmlNodePtr node)
{ {
g_autofree virDomainFeatureKVM *kvm = g_new0(virDomainFeatureKVM, 1);
g_autoptr(GPtrArray) feats = virXMLNodeGetSubelementList(node, NULL); g_autoptr(GPtrArray) feats = virXMLNodeGetSubelementList(node, NULL);
size_t i; size_t i;
if (!def->kvm_features)
def->kvm_features = g_new0(virDomainFeatureKVM, 1);
for (i = 0; i < feats->len; i++) { for (i = 0; i < feats->len; i++) {
xmlNodePtr feat = g_ptr_array_index(feats, i); xmlNodePtr feat = g_ptr_array_index(feats, i);
int feature; int feature;
@@ -16678,20 +16680,20 @@ virDomainFeaturesKVMDefParse(virDomainDef *def,
&value) < 0) &value) < 0)
return -1; return -1;
kvm->features[feature] = value; def->kvm_features->features[feature] = value;
/* dirty ring feature should parse size property */ /* dirty ring feature should parse size property */
if (feature == VIR_DOMAIN_KVM_DIRTY_RING && if (feature == VIR_DOMAIN_KVM_DIRTY_RING &&
value == VIR_TRISTATE_SWITCH_ON) { value == VIR_TRISTATE_SWITCH_ON) {
if (virXMLPropUInt(feat, "size", 0, VIR_XML_PROP_REQUIRED, if (virXMLPropUInt(feat, "size", 0, VIR_XML_PROP_REQUIRED,
&kvm->dirty_ring_size) < 0) { &def->kvm_features->dirty_ring_size) < 0) {
return -1; return -1;
} }
if (!VIR_IS_POW2(kvm->dirty_ring_size) || if (!VIR_IS_POW2(def->kvm_features->dirty_ring_size) ||
kvm->dirty_ring_size < 1024 || def->kvm_features->dirty_ring_size < 1024 ||
kvm->dirty_ring_size > 65536) { def->kvm_features->dirty_ring_size > 65536) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
_("dirty ring must be power of 2 and ranges [1024, 65536]")); _("dirty ring must be power of 2 and ranges [1024, 65536]"));
@@ -16701,7 +16703,6 @@ virDomainFeaturesKVMDefParse(virDomainDef *def,
} }
def->features[VIR_DOMAIN_FEATURE_KVM] = VIR_TRISTATE_SWITCH_ON; def->features[VIR_DOMAIN_FEATURE_KVM] = VIR_TRISTATE_SWITCH_ON;
def->kvm_features = g_steal_pointer(&kvm);
return 0; return 0;
} }