5:04 p.m.
For background, see
https://listman.redhat.com/archives/libvir-list/2021-April/msg00668.html
Tim Wiederhake (10):
virDomainHostdevDef: Change type of startupPolicy to
virDomainStartupPolicy
virDomainHostdevSubsysUSBDefParseXML: Use virXMLProp*
virDomainDeviceUSBMasterParseXML: Use virXMLProp*
virDomainDiskDef: Change type of geometry.trans to
virDomainDiskGeometryTrans
virDomainDiskDefGeometryParse: Use virXMLProp*
virDomainChrSourceReconnectDefParseXML: Use virXMLProp*
virDomainChrDefParseTargetXML: Use virXMLProp*
virDomainAudioCoreAudioParse: Use virXMLProp*
virDomainAudioOSSParse: Use virXMLProp*
virNodeDevCapPCIDevIommuGroupParseXML: Use virXMLProp*
src/conf/domain_conf.c | 168 +++++++++---------------------------
src/conf/domain_conf.h | 23 +++--
src/conf/node_device_conf.c | 15 +---
3 files changed, 52 insertions(+), 154 deletions(-)
--
2.26.3
5:04 p.m.
New subject: [libvirt PATCH 01/10] virDomainHostdevDef: Change type of startupPolicy to virDomainStartupPolicy
Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com>
---
src/conf/domain_conf.c | 6 +++---
src/conf/domain_conf.h | 21 ++++++++++-----------
2 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 7044701fac..734fa584a4 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -6704,14 +6704,14 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node,
ctxt->node = node;
if ((startupPolicy = virXMLPropString(node, "startupPolicy"))) {
- def->startupPolicy =
- virDomainStartupPolicyTypeFromString(startupPolicy);
- if (def->startupPolicy <= 0) {
+ int value = virDomainStartupPolicyTypeFromString(startupPolicy);
+ if (value <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("Unknown startup policy '%s'"),
startupPolicy);
return -1;
}
+ def->startupPolicy = value;
}
if ((autoAddress = virXMLPropString(node, "autoAddress")))
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 2d5462bb55..41e570765e 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -332,6 +332,15 @@ struct _virDomainHostdevCaps {
};
+typedef enum {
+ VIR_DOMAIN_STARTUP_POLICY_DEFAULT = 0,
+ VIR_DOMAIN_STARTUP_POLICY_MANDATORY,
+ VIR_DOMAIN_STARTUP_POLICY_REQUISITE,
+ VIR_DOMAIN_STARTUP_POLICY_OPTIONAL,
+
+ VIR_DOMAIN_STARTUP_POLICY_LAST
+} virDomainStartupPolicy;
+
/* basic device for direct passthrough */
struct _virDomainHostdevDef {
/* If 'parentnet' is non-NULL it means this host dev was
@@ -343,7 +352,7 @@ struct _virDomainHostdevDef {
virDomainNetDef *parentnet;
int mode; /* enum virDomainHostdevMode */
- int startupPolicy; /* enum virDomainStartupPolicy */
+ virDomainStartupPolicy startupPolicy;
bool managed;
bool missing;
bool readonly;
@@ -432,16 +441,6 @@ typedef enum {
VIR_DOMAIN_DISK_IO_LAST
} virDomainDiskIo;
-typedef enum {
- VIR_DOMAIN_STARTUP_POLICY_DEFAULT = 0,
- VIR_DOMAIN_STARTUP_POLICY_MANDATORY,
- VIR_DOMAIN_STARTUP_POLICY_REQUISITE,
- VIR_DOMAIN_STARTUP_POLICY_OPTIONAL,
-
- VIR_DOMAIN_STARTUP_POLICY_LAST
-} virDomainStartupPolicy;
-
-
typedef enum {
VIR_DOMAIN_DEVICE_SGIO_DEFAULT = 0,
VIR_DOMAIN_DEVICE_SGIO_FILTERED,
--
2.26.3
5:04 p.m.
New subject: [libvirt PATCH 02/10] virDomainHostdevSubsysUSBDefParseXML: Use virXMLProp*
Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com>
---
src/conf/domain_conf.c | 23 +++++++++--------------
1 file changed, 9 insertions(+), 14 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 734fa584a4..661fa53206 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -6694,28 +6694,23 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node,
virDomainHostdevDef *def)
{
virDomainHostdevSubsysUSB *usbsrc = &def->source.subsys.u.usb;
- g_autofree char *startupPolicy = NULL;
- g_autofree char *autoAddress = NULL;
xmlNodePtr vendorNode;
xmlNodePtr productNode;
xmlNodePtr addressNode;
+ virTristateBool autoAddress;
VIR_XPATH_NODE_AUTORESTORE(ctxt)
ctxt->node = node;
- if ((startupPolicy = virXMLPropString(node, "startupPolicy"))) {
- int value = virDomainStartupPolicyTypeFromString(startupPolicy);
- if (value <= 0) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
- _("Unknown startup policy '%s'"),
- startupPolicy);
- return -1;
- }
- def->startupPolicy = value;
- }
+ if (virXMLPropEnum(node, "startupPolicy",
+ virDomainStartupPolicyTypeFromString,
+ VIR_XML_PROP_NONZERO, &def->startupPolicy) < 0)
+ return -1;
- if ((autoAddress = virXMLPropString(node, "autoAddress")))
- ignore_value(virStringParseYesNo(autoAddress, &usbsrc->autoAddress));
+ if (virXMLPropTristateBool(node, "autoAddress", VIR_XML_PROP_NONE,
+ &autoAddress) < 0)
+ return -1;
+ usbsrc->autoAddress = autoAddress == VIR_TRISTATE_BOOL_YES;
/* Product can validly be 0, so we need some extra help to determine
* if it is uninitialized */
--
2.26.3
6:17 p.m.
New subject: [libvirt PATCH 02/10] virDomainHostdevSubsysUSBDefParseXML: Use virXMLProp*
On 5/18/21 11:04 AM, Tim Wiederhake wrote:
Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com>
---
src/conf/domain_conf.c | 23 +++++++++--------------
1 file changed, 9 insertions(+), 14 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 734fa584a4..661fa53206 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -6694,28 +6694,23 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node,
virDomainHostdevDef *def)
{
virDomainHostdevSubsysUSB *usbsrc = &def->source.subsys.u.usb;
- g_autofree char *startupPolicy = NULL;
- g_autofree char *autoAddress = NULL;
xmlNodePtr vendorNode;
xmlNodePtr productNode;
xmlNodePtr addressNode;
+ virTristateBool autoAddress;
VIR_XPATH_NODE_AUTORESTORE(ctxt)
ctxt->node = node;
- if ((startupPolicy = virXMLPropString(node, "startupPolicy"))) {
- int value = virDomainStartupPolicyTypeFromString(startupPolicy);
- if (value <= 0) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
- _("Unknown startup policy '%s'"),
- startupPolicy);
- return -1;
- }
- def->startupPolicy = value;
- }
+ if (virXMLPropEnum(node, "startupPolicy",
+ virDomainStartupPolicyTypeFromString,
+ VIR_XML_PROP_NONZERO, &def->startupPolicy) < 0)
+ return -1;
- if ((autoAddress = virXMLPropString(node, "autoAddress")))
- ignore_value(virStringParseYesNo(autoAddress, &usbsrc->autoAddress));
+ if (virXMLPropTristateBool(node, "autoAddress", VIR_XML_PROP_NONE,
+ &autoAddress) < 0)
+ return -1;
+ usbsrc->autoAddress = autoAddress == VIR_TRISTATE_BOOL_YES;
(my poor eyesight kept seeing that "==" as "=" and I was confused for
a
second! :-)
Too bad we have to do this rather than having a virTristateBool directly
in the object. But history doesn't permit it (without some *other* extra
code to set it to ..._NO in the case when it isn't specified).
/* Product can validly be 0, so we need some extra help to determine
* if it is uninitialized */
5:04 p.m.
New subject: [libvirt PATCH 03/10] virDomainDeviceUSBMasterParseXML: Use virXMLProp*
This strictens the parser to disallow negative values (interpreted as
`UINT_MAX + value + 1`) for attribute `startport`. Allowing negative
numbers to be interpreted this way makes no sense for this attribute.
Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com>
---
src/conf/domain_conf.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 661fa53206..86680e0cdb 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -6439,18 +6439,11 @@ static int
virDomainDeviceUSBMasterParseXML(xmlNodePtr node,
virDomainDeviceUSBMaster *master)
{
- g_autofree char *startport = NULL;
-
memset(master, 0, sizeof(*master));
- startport = virXMLPropString(node, "startport");
-
- if (startport &&
- virStrToLong_ui(startport, NULL, 10, &master->startport) < 0) {
- virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
- _("Cannot parse <master> 'startport'
attribute"));
+ if (virXMLPropUInt(node, "startport", 10, VIR_XML_PROP_NONE,
+ &master->startport) < 0)
return -1;
- }
return 0;
}
--
2.26.3
5:04 p.m.
New subject: [libvirt PATCH 04/10] virDomainDiskDef: Change type of geometry.trans to virDomainDiskGeometryTrans
Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com>
---
src/conf/domain_conf.c | 5 +++--
src/conf/domain_conf.h | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 86680e0cdb..f55117e849 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -8845,13 +8845,14 @@ virDomainDiskDefGeometryParse(virDomainDiskDef *def,
}
if ((tmp = virXMLPropString(cur, "trans"))) {
- def->geometry.trans = virDomainDiskGeometryTransTypeFromString(tmp);
- if (def->geometry.trans <= 0) {
+ int value;
+ if ((value = virDomainDiskGeometryTransTypeFromString(tmp)) <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("invalid translation value '%s'"),
tmp);
return -1;
}
+ def->geometry.trans = value;
}
return 0;
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 41e570765e..cf8481f1f6 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -549,7 +549,7 @@ struct _virDomainDiskDef {
unsigned int cylinders;
unsigned int heads;
unsigned int sectors;
- int trans; /* enum virDomainDiskGeometryTrans */
+ virDomainDiskGeometryTrans trans;
} geometry;
struct {
--
2.26.3
5:04 p.m.
New subject: [libvirt PATCH 05/10] virDomainDiskDefGeometryParse: Use virXMLProp*
This strictens the parser to disallow negative values (interpreted as
`UINT_MAX + value + 1`) for attributes `cyls`, `heads` and `secs`.
Allowing negative numbers to be interpreted this way makes no sense for
these attributes.
Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com>
---
src/conf/domain_conf.c | 48 +++++++++++-------------------------------
1 file changed, 12 insertions(+), 36 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index f55117e849..bfcc56ca9e 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -8815,45 +8815,21 @@ static int
virDomainDiskDefGeometryParse(virDomainDiskDef *def,
xmlNodePtr cur)
{
- g_autofree char *tmp = NULL;
-
- if ((tmp = virXMLPropString(cur, "cyls"))) {
- if (virStrToLong_ui(tmp, NULL, 10, &def->geometry.cylinders) < 0) {
- virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
- _("invalid geometry settings (cyls)"));
- return -1;
- }
- VIR_FREE(tmp);
- }
+ if (virXMLPropUInt(cur, "cyls", 10, VIR_XML_PROP_NONE,
+ &def->geometry.cylinders) < 0)
+ return -1;
- if ((tmp = virXMLPropString(cur, "heads"))) {
- if (virStrToLong_ui(tmp, NULL, 10, &def->geometry.heads) < 0) {
- virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
- _("invalid geometry settings (heads)"));
- return -1;
- }
- VIR_FREE(tmp);
- }
+ if (virXMLPropUInt(cur, "heads", 10, VIR_XML_PROP_NONE,
+ &def->geometry.heads) < 0)
+ return -1;
- if ((tmp = virXMLPropString(cur, "secs"))) {
- if (virStrToLong_ui(tmp, NULL, 10, &def->geometry.sectors) < 0) {
- virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
- _("invalid geometry settings (secs)"));
- return -1;
- }
- VIR_FREE(tmp);
- }
+ if (virXMLPropUInt(cur, "secs", 10, VIR_XML_PROP_NONE,
+ &def->geometry.sectors) < 0)
+ return -1;
- if ((tmp = virXMLPropString(cur, "trans"))) {
- int value;
- if ((value = virDomainDiskGeometryTransTypeFromString(tmp)) <= 0) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
- _("invalid translation value '%s'"),
- tmp);
- return -1;
- }
- def->geometry.trans = value;
- }
+ if (virXMLPropEnum(cur, "trans", virDomainDiskGeometryTransTypeFromString,
+ VIR_XML_PROP_NONZERO, &def->geometry.trans) < 0)
+ return -1;
return 0;
}
--
2.26.3
5:04 p.m.
New subject: [libvirt PATCH 06/10] virDomainChrSourceReconnectDefParseXML: Use virXMLProp*
This strictens the parser to disallow negative values (interpreted as
`UINT_MAX + value + 1`) for attribute `timeout`. Allowing negative
numbers to be interpreted this way makes no sense for this attribute.
Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com>
---
src/conf/domain_conf.c | 29 +++++------------------------
1 file changed, 5 insertions(+), 24 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index bfcc56ca9e..a5514660cc 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -10093,39 +10093,20 @@
virDomainChrSourceReconnectDefParseXML(virDomainChrSourceReconnectDef *def,
xmlNodePtr node,
xmlXPathContextPtr ctxt)
{
- int tmpVal;
VIR_XPATH_NODE_AUTORESTORE(ctxt)
xmlNodePtr cur;
- g_autofree char *tmp = NULL;
ctxt->node = node;
if ((cur = virXPathNode("./reconnect", ctxt))) {
- if ((tmp = virXMLPropString(cur, "enabled"))) {
- if ((tmpVal = virTristateBoolTypeFromString(tmp)) < 0) {
- virReportError(VIR_ERR_XML_ERROR,
- _("invalid reconnect enabled value:
'%s'"),
- tmp);
- return -1;
- }
- def->enabled = tmpVal;
- VIR_FREE(tmp);
- }
+ if (virXMLPropTristateBool(cur, "enabled", VIR_XML_PROP_NONE,
+ &def->enabled) < 0)
+ return -1;
if (def->enabled == VIR_TRISTATE_BOOL_YES) {
- if ((tmp = virXMLPropString(cur, "timeout"))) {
- if (virStrToLong_ui(tmp, NULL, 10, &def->timeout) < 0) {
- virReportError(VIR_ERR_XML_ERROR,
- _("invalid reconnect timeout value:
'%s'"),
- tmp);
- return -1;
- }
- } else {
- virReportError(VIR_ERR_XML_ERROR, "%s",
- _("missing timeout for chardev with "
- "reconnect enabled"));
+ if (virXMLPropUInt(cur, "timeout", 10, VIR_XML_PROP_REQUIRED,
+ &def->timeout) < 0)
return -1;
- }
}
}
--
2.26.3
5:04 p.m.
New subject: [libvirt PATCH 07/10] virDomainChrDefParseTargetXML: Use virXMLProp*
This strictens the parser to disallow negative values (interpreted as
`UINT_MAX + value + 1`) for attribute `port`. Allowing negative
numbers to be interpreted this way makes no sense for this attribute.
Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com>
---
src/conf/domain_conf.c | 29 +++++------------------------
1 file changed, 5 insertions(+), 24 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index a5514660cc..57a54f12ef 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -10977,7 +10977,6 @@ virDomainChrDefParseTargetXML(virDomainChrDef *def,
g_autofree char *targetModel = NULL;
g_autofree char *addrStr = NULL;
g_autofree char *portStr = NULL;
- g_autofree char *stateStr = NULL;
VIR_XPATH_NODE_AUTORESTORE(ctxt)
ctxt->node = cur;
@@ -11007,7 +11006,6 @@ virDomainChrDefParseTargetXML(virDomainChrDef *def,
switch (def->targetType) {
case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GUESTFWD:
addrStr = virXMLPropString(cur, "address");
- portStr = virXMLPropString(cur, "port");
def->target.addr = g_new0(virSocketAddr, 1);
@@ -11028,19 +11026,8 @@ virDomainChrDefParseTargetXML(virDomainChrDef *def,
return -1;
}
- if (portStr == NULL) {
- virReportError(VIR_ERR_XML_ERROR, "%s",
- _("guestfwd channel does "
- "not define a target port"));
- return -1;
- }
-
- if (virStrToLong_ui(portStr, NULL, 10, &port) < 0) {
- virReportError(VIR_ERR_XML_ERROR,
- _("Invalid port number: %s"),
- portStr);
+ if (virXMLPropUInt(cur, "port", 10, VIR_XML_PROP_REQUIRED,
&port) < 0)
return -1;
- }
virSocketAddrSetPort(def->target.addr, port);
break;
@@ -11050,18 +11037,12 @@ virDomainChrDefParseTargetXML(virDomainChrDef *def,
def->target.name = virXMLPropString(cur, "name");
if (def->targetType == VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO
&&
- !(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE) &&
- (stateStr = virXMLPropString(cur, "state"))) {
- int tmp;
+ !(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE)) {
- if ((tmp = virDomainChrDeviceStateTypeFromString(stateStr)) <= 0) {
- virReportError(VIR_ERR_XML_ERROR,
- _("invalid channel state value
'%s'"),
- stateStr);
+ if (virXMLPropEnum(cur, "state",
+ virDomainChrDeviceStateTypeFromString,
+ VIR_XML_PROP_NONZERO, &def->state) < 0)
return -1;
- }
-
- def->state = tmp;
}
break;
}
--
2.26.3
5:04 p.m.
New subject: [libvirt PATCH 08/10] virDomainAudioCoreAudioParse: Use virXMLProp*
This strictens the parser to disallow negative values (interpreted as
`UINT_MAX + value + 1`) for attribute `bufferCount`. Allowing negative
numbers to be interpreted this way makes no sense for this attribute.
Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com>
---
src/conf/domain_conf.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 57a54f12ef..a46e64c64a 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -13046,15 +13046,9 @@ static int
virDomainAudioCoreAudioParse(virDomainAudioIOCoreAudio *def,
xmlNodePtr node)
{
- g_autofree char *bufferCount = virXMLPropString(node, "bufferCount");
-
- if (bufferCount &&
- virStrToLong_ui(bufferCount, NULL, 10,
- &def->bufferCount) < 0) {
- virReportError(VIR_ERR_XML_ERROR,
- _("cannot parse 'bufferCount' value
'%s'"), bufferCount);
+ if (virXMLPropUInt(node, "bufferCount", 10, VIR_XML_PROP_NONE,
+ &def->bufferCount) < 0)
return -1;
- }
return 0;
}
--
2.26.3
5:04 p.m.
New subject: [libvirt PATCH 09/10] virDomainAudioOSSParse: Use virXMLProp*
This strictens the parser to disallow negative values (interpreted as
`UINT_MAX + value + 1`) for attribute `bufferCount`. Allowing negative
numbers to be interpreted this way makes no sense for this attribute.
Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com>
---
src/conf/domain_conf.c | 19 ++++---------------
1 file changed, 4 insertions(+), 15 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index a46e64c64a..b3ed3a9c5a 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -13074,26 +13074,15 @@ static int
virDomainAudioOSSParse(virDomainAudioIOOSS *def,
xmlNodePtr node)
{
- g_autofree char *tryPoll = virXMLPropString(node, "tryPoll");
- g_autofree char *bufferCount = virXMLPropString(node, "bufferCount");
-
def->dev = virXMLPropString(node, "dev");
- if (tryPoll &&
- ((def->tryPoll =
- virTristateBoolTypeFromString(tryPoll)) <= 0)) {
- virReportError(VIR_ERR_XML_ERROR,
- _("unknown 'tryPoll' value '%s'"),
tryPoll);
+ if (virXMLPropTristateBool(node, "tryPoll", VIR_XML_PROP_NONE,
+ &def->tryPoll) < 0)
return -1;
- }
- if (bufferCount &&
- virStrToLong_ui(bufferCount, NULL, 10,
- &def->bufferCount) < 0) {
- virReportError(VIR_ERR_XML_ERROR,
- _("cannot parse 'bufferCount' value
'%s'"), bufferCount);
+ if (virXMLPropUInt(node, "bufferCount", 10, VIR_XML_PROP_NONE,
+ &def->bufferCount) < 0)
return -1;
- }
return 0;
}
--
2.26.3
5:04 p.m.
New subject: [libvirt PATCH 10/10] virNodeDevCapPCIDevIommuGroupParseXML: Use virXMLProp*
This strictens the parser to disallow negative values (interpreted as
`UINT_MAX + value + 1`) for attribute `number`. Allowing negative
numbers to be interpreted this way makes no sense for this attribute.
Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com>
---
src/conf/node_device_conf.c | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index 861f43f6c4..332b12f997 100644
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -1557,25 +1557,14 @@ virNodeDevCapPCIDevIommuGroupParseXML(xmlXPathContextPtr ctxt,
{
VIR_XPATH_NODE_AUTORESTORE(ctxt)
g_autofree xmlNodePtr *addrNodes = NULL;
- g_autofree char *numberStr = NULL;
int nAddrNodes;
size_t i;
ctxt->node = iommuGroupNode;
- numberStr = virXMLPropString(iommuGroupNode, "number");
- if (!numberStr) {
- virReportError(VIR_ERR_XML_ERROR,
- "%s", _("missing iommuGroup number
attribute"));
+ if (virXMLPropUInt(iommuGroupNode, "number", 10, VIR_XML_PROP_REQUIRED,
+ &pci_dev->iommuGroupNumber) < 0)
return -1;
- }
- if (virStrToLong_ui(numberStr, NULL, 10,
- &pci_dev->iommuGroupNumber) < 0) {
- virReportError(VIR_ERR_XML_ERROR,
- _("invalid iommuGroup number attribute '%s'"),
- numberStr);
- return -1;
- }
if ((nAddrNodes = virXPathNodeSet("./address", ctxt, &addrNodes)) <
0)
return -1;
--
2.26.3
6:30 p.m.
New subject: [libvirt PATCH 00/10] Refactor more XML parsing boilerplate code, part XI
Reviewed-by: Laine Stump <laine(a)redhat.com>
I'll push when the CI on my review branch is finished.
On 5/18/21 11:04 AM, Tim Wiederhake wrote:
For background, see
https://listman.redhat.com/archives/libvir-list/2021-April/msg00668.html
Tim Wiederhake (10):
virDomainHostdevDef: Change type of startupPolicy to
virDomainStartupPolicy
virDomainHostdevSubsysUSBDefParseXML: Use virXMLProp*
virDomainDeviceUSBMasterParseXML: Use virXMLProp*
virDomainDiskDef: Change type of geometry.trans to
virDomainDiskGeometryTrans
virDomainDiskDefGeometryParse: Use virXMLProp*
virDomainChrSourceReconnectDefParseXML: Use virXMLProp*
virDomainChrDefParseTargetXML: Use virXMLProp*
virDomainAudioCoreAudioParse: Use virXMLProp*
virDomainAudioOSSParse: Use virXMLProp*
virNodeDevCapPCIDevIommuGroupParseXML: Use virXMLProp*
src/conf/domain_conf.c | 168 +++++++++---------------------------
src/conf/domain_conf.h | 23 +++--
src/conf/node_device_conf.c | 15 +---
3 files changed, 52 insertions(+), 154 deletions(-)
1222
days inactive
1222
days old
12 comments
2 participants
participants (2)
-
Laine Stump -
Tim Wiederhake