NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

xen_common: Change xenParseCharDev to use virConfGetValueStringList

Browse Source 
Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
Fabiano Fidêncio 2018-09-20 15:28:52 +02:00 committed by John Ferlan
parent 1bb379ad8e
commit 6efa07e7b9
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/xenconfig/xen_common.c
View File

@ -768,11 +768,13 @@ xenParseVfb(virConfPtr conf, virDomainDefPtr def)
static int static int
xenParseCharDev(virConfPtr conf, virDomainDefPtr def, const char *nativeFormat) xenParseCharDev(virConfPtr conf, virDomainDefPtr def, const char *nativeFormat)
{ {
virConfValuePtr value = NULL; VIR_AUTOPTR(virString) serials = NULL;
virDomainChrDefPtr chr = NULL; virDomainChrDefPtr chr = NULL;
if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) { if (def->os.type == VIR_DOMAIN_OSTYPE_HVM) {
VIR_AUTOFREE(char *) parallel = NULL; VIR_AUTOFREE(char *) parallel = NULL;
int rc;
if (xenConfigGetString(conf, "parallel", &parallel, NULL) < 0) if (xenConfigGetString(conf, "parallel", &parallel, NULL) < 0)
goto cleanup; goto cleanup;
if (parallel && STRNEQ(parallel, "none") && if (parallel && STRNEQ(parallel, "none") &&
@ -790,8 +792,8 @@ xenParseCharDev(virConfPtr conf, virDomainDefPtr def, const char *nativeFormat)
} }
/* Try to get the list of values to support multiple serial ports */ /* Try to get the list of values to support multiple serial ports */
value = virConfGetValue(conf, "serial"); if ((rc = virConfGetValueStringList(conf, "serial", false, &serials)) == 1) {
if (value && value->type == VIR_CONF_LIST) { virString *entries;
int portnum = -1; int portnum = -1;
if (STREQ(nativeFormat, XEN_CONFIG_FORMAT_XM)) { if (STREQ(nativeFormat, XEN_CONFIG_FORMAT_XM)) {
@ -800,18 +802,12 @@ xenParseCharDev(virConfPtr conf, virDomainDefPtr def, const char *nativeFormat)
goto cleanup; goto cleanup;
} }
value = value->list; for (entries = serials; *entries; entries++) {
while (value) { virString port = *entries;
char *port = NULL;
if ((value->type != VIR_CONF_STRING) || (value->str == NULL))
goto cleanup;
port = value->str;
portnum++; portnum++;
if (STREQ(port, "none")) { if (STREQ(port, "none"))
value = value->next;
continue; continue;
}
if (!(chr = xenParseSxprChar(port, NULL))) if (!(chr = xenParseSxprChar(port, NULL)))
goto cleanup; goto cleanup;
@ -819,11 +815,13 @@ xenParseCharDev(virConfPtr conf, virDomainDefPtr def, const char *nativeFormat)
chr->target.port = portnum; chr->target.port = portnum;
if (VIR_APPEND_ELEMENT(def->serials, def->nserials, chr) < 0) if (VIR_APPEND_ELEMENT(def->serials, def->nserials, chr) < 0)
goto cleanup; goto cleanup;
value = value->next;
} }
} else { } else {
VIR_AUTOFREE(char *) serial = NULL; VIR_AUTOFREE(char *) serial = NULL;
if (xenHandleConfGetValueStringListErrors(rc) < 0)
goto cleanup;
/* If domain is not using multiple serial ports we parse data old way */ /* If domain is not using multiple serial ports we parse data old way */
if (xenConfigGetString(conf, "serial", &serial, NULL) < 0) if (xenConfigGetString(conf, "serial", &serial, NULL) < 0)
goto cleanup; goto cleanup;