External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-30 21:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: Convert virDomainNetDefParseXML() to virXMLProp*()

Browse Source 
After previous cleanups, the virDomainNetDefParseXML() function
uses a mixture of virXMLProp*() and the old virXMLPropString() +
virXXXTypeFromString() patterns. Rework it so that virXMLProp*()
is used.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Michal Privoznik 2022-01-20 13:15:03 +01:00
parent a1ce98061c
commit 97129ed43a
3 changed files with 38 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
src/conf/domain_conf.c
View File

@ -10225,7 +10225,6 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt,
virDomainChrSourceReconnectDef reconnect = {0}; virDomainChrSourceReconnectDef reconnect = {0};
int rv, val; int rv, val;
g_autofree char *macaddr = NULL; g_autofree char *macaddr = NULL;
g_autofree char *macaddr_type = NULL;
g_autofree char *network = NULL; g_autofree char *network = NULL;
g_autofree char *portgroup = NULL; g_autofree char *portgroup = NULL;
g_autofree char *portid = NULL; g_autofree char *portid = NULL;
@ -10242,11 +10241,6 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt,
g_autofree char *localaddr = NULL; g_autofree char *localaddr = NULL;
g_autofree char *localport = NULL; g_autofree char *localport = NULL;
g_autofree char *model = NULL; g_autofree char *model = NULL;
g_autofree char *backend = NULL;
g_autofree char *txmode = NULL;
g_autofree char *queues = NULL;
g_autofree char *rx_queue_size = NULL;
g_autofree char *tx_queue_size = NULL;
g_autofree char *filter = NULL; g_autofree char *filter = NULL;
g_autofree char *internal = NULL; g_autofree char *internal = NULL;
g_autofree char *mode = NULL; g_autofree char *mode = NULL;
@ -10393,12 +10387,6 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt,
(virDomainVirtioOptionsParseXML(driver_node, &def->virtio) < 0)) (virDomainVirtioOptionsParseXML(driver_node, &def->virtio) < 0))
goto error; goto error;
backend = virXMLPropString(driver_node, "name");
txmode = virXMLPropString(driver_node, "txmode");
queues = virXMLPropString(driver_node, "queues");
rx_queue_size = virXMLPropString(driver_node, "rx_queue_size");
tx_queue_size = virXMLPropString(driver_node, "tx_queue_size");
if ((filterref_node = virXPathNode("./filterref", ctxt))) { if ((filterref_node = virXPathNode("./filterref", ctxt))) {
filter = virXMLPropString(filterref_node, "filter"); filter = virXMLPropString(filterref_node, "filter");
filterparams = virNWFilterParseParamAttributes(filterref_node); filterparams = virNWFilterParseParamAttributes(filterref_node);
@ -10446,18 +10434,11 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt,
def->mac_generated = true; def->mac_generated = true;
} }
if ((macaddr_type = virXPathString("string(./mac/@type)", ctxt))) { if (virXMLPropEnum(mac_node, "type",
int tmp; virDomainNetMacTypeTypeFromString,
VIR_XML_PROP_NONZERO,
if ((tmp = virDomainNetMacTypeTypeFromString(macaddr_type)) <= 0) { &def->mac_type) < 0)
virReportError(VIR_ERR_XML_ERROR, goto error;
_("invalid mac address type value: '%s'. Valid "
"values are \"generated\" and \"static\"."),
macaddr_type);
goto error;
}
def->mac_type = tmp;
}
if (virXMLPropTristateBool(mac_node, "check", if (virXMLPropTristateBool(mac_node, "check",
VIR_XML_PROP_NONE, VIR_XML_PROP_NONE,
@ -10732,28 +10713,18 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt,
if (def->type != VIR_DOMAIN_NET_TYPE_HOSTDEV && if (def->type != VIR_DOMAIN_NET_TYPE_HOSTDEV &&
virDomainNetIsVirtioModel(def)) { virDomainNetIsVirtioModel(def)) {
if (backend != NULL) {
if ((val = virDomainNetBackendTypeFromString(backend)) < 0 || if (virXMLPropEnum(driver_node, "name",
val == VIR_DOMAIN_NET_BACKEND_TYPE_DEFAULT) { virDomainNetBackendTypeFromString,
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, VIR_XML_PROP_NONZERO,
_("Unknown interface <driver name='%s'> " &def->driver.virtio.name) < 0)
"has been specified"), goto error;
backend);
goto error; if (virXMLPropEnum(driver_node, "txmode",
} virDomainNetVirtioTxModeTypeFromString,
def->driver.virtio.name = val; VIR_XML_PROP_NONZERO,
} &def->driver.virtio.txmode) < 0)
if (txmode != NULL) { goto error;
if ((val = virDomainNetVirtioTxModeTypeFromString(txmode)) < 0 ||
val == VIR_DOMAIN_NET_VIRTIO_TX_MODE_DEFAULT) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("Unknown interface <driver txmode='%s'> "
"has been specified"),
txmode);
goto error;
}
def->driver.virtio.txmode = val;
}
if (virXMLPropTristateSwitch(driver_node, "ioeventfd", if (virXMLPropTristateSwitch(driver_node, "ioeventfd",
VIR_XML_PROP_NONE, VIR_XML_PROP_NONE,
@ -10765,37 +10736,24 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt,
&def->driver.virtio.event_idx) < 0) &def->driver.virtio.event_idx) < 0)
goto error; goto error;
if (queues) { if (virXMLPropUInt(driver_node, "queues", 10,
unsigned int q; VIR_XML_PROP_NONE,
if (virStrToLong_uip(queues, NULL, 10, &q) < 0) { &def->driver.virtio.queues) < 0)
virReportError(VIR_ERR_XML_DETAIL, goto error;
_("'queues' attribute must be positive number: %s"),
queues); /* There's always at least one TX/RX queue. */
goto error; if (def->driver.virtio.queues == 1)
} def->driver.virtio.queues = 0;
if (q > 1)
def->driver.virtio.queues = q; if (virXMLPropUInt(driver_node, "rx_queue_size", 10,
} VIR_XML_PROP_NONE,
if (rx_queue_size) { &def->driver.virtio.rx_queue_size) < 0)
unsigned int q; goto error;
if (virStrToLong_uip(rx_queue_size, NULL, 10, &q) < 0) {
virReportError(VIR_ERR_XML_DETAIL, if (virXMLPropUInt(driver_node, "tx_queue_size", 10,
_("'rx_queue_size' attribute must be positive number: %s"), VIR_XML_PROP_NONE,
rx_queue_size); &def->driver.virtio.tx_queue_size) < 0)
goto error; goto error;
}
def->driver.virtio.rx_queue_size = q;
}
if (tx_queue_size) {
unsigned int q;
if (virStrToLong_uip(tx_queue_size, NULL, 10, &q) < 0) {
virReportError(VIR_ERR_XML_DETAIL,
_("'tx_queue_size' attribute must be positive number: %s"),
tx_queue_size);
goto error;
}
def->driver.virtio.tx_queue_size = q;
}
if ((tmpNode = virXPathNode("./driver/host", ctxt))) { if ((tmpNode = virXPathNode("./driver/host", ctxt))) {
if (virXMLPropTristateSwitch(tmpNode, "csum", VIR_XML_PROP_NONE, if (virXMLPropTristateSwitch(tmpNode, "csum", VIR_XML_PROP_NONE,

4
src/conf/domain_conf.h
View File

@ -945,7 +945,7 @@ typedef enum {
/* the backend driver used for virtio interfaces */ /* the backend driver used for virtio interfaces */
typedef enum { typedef enum {
VIR_DOMAIN_NET_BACKEND_TYPE_DEFAULT, /* prefer kernel, fall back to user */ VIR_DOMAIN_NET_BACKEND_TYPE_DEFAULT = 0, /* prefer kernel, fall back to user */
VIR_DOMAIN_NET_BACKEND_TYPE_QEMU, /* userland */ VIR_DOMAIN_NET_BACKEND_TYPE_QEMU, /* userland */
VIR_DOMAIN_NET_BACKEND_TYPE_VHOST, /* kernel */ VIR_DOMAIN_NET_BACKEND_TYPE_VHOST, /* kernel */
@ -954,7 +954,7 @@ typedef enum {
/* the TX algorithm used for virtio interfaces */ /* the TX algorithm used for virtio interfaces */
typedef enum { typedef enum {
VIR_DOMAIN_NET_VIRTIO_TX_MODE_DEFAULT, /* default for this version of qemu */ VIR_DOMAIN_NET_VIRTIO_TX_MODE_DEFAULT = 0, /* default for this version of qemu */
VIR_DOMAIN_NET_VIRTIO_TX_MODE_IOTHREAD, VIR_DOMAIN_NET_VIRTIO_TX_MODE_IOTHREAD,
VIR_DOMAIN_NET_VIRTIO_TX_MODE_TIMER, VIR_DOMAIN_NET_VIRTIO_TX_MODE_TIMER,

2
tests/qemuxml2argvdata/vhost_queues-invalid.err
View File

@ -1 +1 @@
'queues' attribute must be positive number: -5 XML error: Invalid value for attribute 'queues' in element 'driver': '-5'. Expected non-negative integer value