[libvirt] [PATCH v2 07/21] conf: Improve virDomainChrTargetDefFormat()
Make the switch statement type-aware, avoid calling
virDomainChrTargetTypeToString() more than once and check its
return value before using it.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
src/conf/domain_conf.c | 29 ++++++++++++++++++++++-------
1 file changed, 22 insertions(+), 7 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index cb4ed6ef6..cd9d384d3 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -23942,7 +23942,7 @@ virDomainChrTargetDefFormat(virBufferPtr buf,
const char *targetType = virDomainChrTargetTypeToString(def->deviceType,
def->targetType);
- switch (def->deviceType) {
+ switch ((virDomainChrDeviceType) def->deviceType) {
case VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL: {
if (!targetType) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@@ -23989,28 +23989,43 @@ virDomainChrTargetDefFormat(virBufferPtr buf,
}
case VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE:
+ if (!targetType) {
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("Could not format console target type"));
+ return -1;
+ }
+
virBufferAsprintf(buf,
"<target type='%s'
port='%d'/>\n",
- virDomainChrTargetTypeToString(def->deviceType,
- def->targetType),
- def->target.port);
+ targetType, def->target.port);
break;
case VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL:
+ if (!targetType) {
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("Could not format serial target type"));
+ return -1;
+ }
+
if (def->targetType != VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_NONE) {
virBufferAsprintf(buf,
"<target type='%s'
port='%d'/>\n",
- virDomainChrTargetTypeToString(def->deviceType,
- def->targetType),
+ targetType,
def->target.port);
break;
}
ATTRIBUTE_FALLTHROUGH;
- default:
+ case VIR_DOMAIN_CHR_DEVICE_TYPE_PARALLEL:
virBufferAsprintf(buf, "<target port='%d'/>\n",
def->target.port);
break;
+
+ case VIR_DOMAIN_CHR_DEVICE_TYPE_LAST:
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ _("unexpected char device type %d"),
+ def->deviceType);
+ return -1;
}
return 0;
--
2.14.3