External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 07:59:00 +00:00
Code

conf: remove redundant local variable

Browse Source 
Use just one int variable for all the FromString calls.
This commit is contained in:
Ján Tomko 2014-09-11 12:54:20 +02:00
parent fb78d1cee7
commit 0ece766bd2
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/conf/domain_conf.c
View File

@ -6907,7 +6907,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt,
virNWFilterHashTablePtr filterparams = NULL; virNWFilterHashTablePtr filterparams = NULL;
virDomainActualNetDefPtr actual = NULL; virDomainActualNetDefPtr actual = NULL;
xmlNodePtr oldnode = ctxt->node; xmlNodePtr oldnode = ctxt->node;
int ret; int ret, val;
if (VIR_ALLOC(def) < 0) if (VIR_ALLOC(def) < 0)
return NULL; return NULL;
@ -7251,13 +7251,12 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt,
} }
if (mode != NULL) { if (mode != NULL) {
int m; if ((val = virNetDevMacVLanModeTypeFromString(mode)) < 0) {
if ((m = virNetDevMacVLanModeTypeFromString(mode)) < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Unknown mode has been specified")); _("Unknown mode has been specified"));
goto error; goto error;
} }
def->data.direct.mode = m; def->data.direct.mode = val;
} else { } else {
def->data.direct.mode = VIR_NETDEV_MACVLAN_MODE_VEPA; def->data.direct.mode = VIR_NETDEV_MACVLAN_MODE_VEPA;
} }
@ -7332,31 +7331,28 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt,
if (def->type != VIR_DOMAIN_NET_TYPE_HOSTDEV && if (def->type != VIR_DOMAIN_NET_TYPE_HOSTDEV &&
STREQ_NULLABLE(def->model, "virtio")) { STREQ_NULLABLE(def->model, "virtio")) {
if (backend != NULL) { if (backend != NULL) {
int name; if ((val = virDomainNetBackendTypeFromString(backend)) < 0 ||
if ((name = virDomainNetBackendTypeFromString(backend)) < 0 || val == VIR_DOMAIN_NET_BACKEND_TYPE_DEFAULT) {
name == VIR_DOMAIN_NET_BACKEND_TYPE_DEFAULT) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("Unknown interface <driver name='%s'> " _("Unknown interface <driver name='%s'> "
"has been specified"), "has been specified"),
backend); backend);
goto error; goto error;
} }
def->driver.virtio.name = name; def->driver.virtio.name = val;
} }
if (txmode != NULL) { if (txmode != NULL) {
int m; if ((val = virDomainNetVirtioTxModeTypeFromString(txmode)) < 0 ||
if ((m = virDomainNetVirtioTxModeTypeFromString(txmode)) < 0 || val == VIR_DOMAIN_NET_VIRTIO_TX_MODE_DEFAULT) {
m == VIR_DOMAIN_NET_VIRTIO_TX_MODE_DEFAULT) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("Unknown interface <driver txmode='%s'> " _("Unknown interface <driver txmode='%s'> "
"has been specified"), "has been specified"),
txmode); txmode);
goto error; goto error;
} }
def->driver.virtio.txmode = m; def->driver.virtio.txmode = val;
} }
if (ioeventfd) { if (ioeventfd) {
int val;
if ((val = virTristateSwitchTypeFromString(ioeventfd)) <= 0) { if ((val = virTristateSwitchTypeFromString(ioeventfd)) <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown interface ioeventfd mode '%s'"), _("unknown interface ioeventfd mode '%s'"),
@ -7366,14 +7362,13 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt,
def->driver.virtio.ioeventfd = val; def->driver.virtio.ioeventfd = val;
} }
if (event_idx) { if (event_idx) {
int idx; if ((val = virTristateSwitchTypeFromString(event_idx)) <= 0) {
if ((idx = virTristateSwitchTypeFromString(event_idx)) <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown interface event_idx mode '%s'"), _("unknown interface event_idx mode '%s'"),
event_idx); event_idx);
goto error; goto error;
} }
def->driver.virtio.event_idx = idx; def->driver.virtio.event_idx = val;
} }
if (queues) { if (queues) {
unsigned int q; unsigned int q;