From 6622e3cc33712450cc8bfdfb9a5a0b66e186e18d Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Tue, 18 Jan 2022 15:43:42 +0100 Subject: [PATCH] virDomainDeviceInfoParseXML: Reject '0' value for ACPI index Value of '0' is treated equivalently to when it's not provided by the user. Reject an explicit '0' provided by the user as it would get ignored. In this rare case we can make the XML parser more strict, as libvirt would never format the '' element if the index is '0' thus there are no libvirt-generated XMLs we'd not load back, as of such this is identical to rejecting it in the validation phase. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2037146 Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a805f7f6a3..393f9d9478 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6786,7 +6786,7 @@ virDomainDeviceInfoParseXML(virDomainXMLOption *xmlopt, } if ((acpi = virXPathNode("./acpi", ctxt))) { - if (virXMLPropUInt(acpi, "index", 10, VIR_XML_PROP_NONE, + if (virXMLPropUInt(acpi, "index", 10, VIR_XML_PROP_NONZERO, &info->acpiIndex) < 0) goto cleanup; } -- 2.47.2