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

xen_common: Change xenParseVfbs 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:51 +02:00 committed by John Ferlan
parent 5f0c1c1e25
commit 1bb379ad8e
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/xenconfig/xen_common.c
View File

@ -615,7 +615,6 @@ xenParseVfb(virConfPtr conf, virDomainDefPtr def)
int val; int val;
char *listenAddr = NULL; char *listenAddr = NULL;
int hvm = def->os.type == VIR_DOMAIN_OSTYPE_HVM; int hvm = def->os.type == VIR_DOMAIN_OSTYPE_HVM;
virConfValuePtr list;
virDomainGraphicsDefPtr graphics = NULL; virDomainGraphicsDefPtr graphics = NULL;
if (hvm) { if (hvm) {
@ -671,17 +670,17 @@ xenParseVfb(virConfPtr conf, virDomainDefPtr def)
} }
if (!hvm && def->graphics == NULL) { /* New PV guests use this format */ if (!hvm && def->graphics == NULL) { /* New PV guests use this format */
list = virConfGetValue(conf, "vfb"); VIR_AUTOPTR(virString) vfbs = NULL;
if (list && list->type == VIR_CONF_LIST && int rc;
list->list && list->list->type == VIR_CONF_STRING &&
list->list->str) { if ((rc = virConfGetValueStringList(conf, "vfb", false, &vfbs)) == 1) {
char vfb[MAX_VFB]; char vfb[MAX_VFB];
char *key = vfb; char *key = vfb;
if (virStrcpyStatic(vfb, list->list->str) < 0) { if (virStrcpyStatic(vfb, *vfbs) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("VFB %s too big for destination"), _("VFB %s too big for destination"),
list->list->str); *vfbs);
goto cleanup; goto cleanup;
} }
@ -751,6 +750,9 @@ xenParseVfb(virConfPtr conf, virDomainDefPtr def)
def->graphics[0] = graphics; def->graphics[0] = graphics;
def->ngraphics = 1; def->ngraphics = 1;
graphics = NULL; graphics = NULL;
} else {
if (xenHandleConfGetValueStringListErrors(rc) < 0)
goto cleanup;
} }
} }