External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-21 19:02:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

xen_vm: convert to typesafe virConf accessors

Browse Source 
Signed-off-by: Fabiano Fidêncio <fabiano@fidencio.org>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Fabiano Fidêncio 2018-05-28 00:28:21 +02:00 committed by Ján Tomko
parent 5d358df82a
commit 7c2b32a691
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/xenconfig/xen_xm.c
View File

@ -263,20 +263,20 @@ xenParseXMDisk(char *entry, int hvm)
static int
xenParseXMDiskList(virConfPtr conf, virDomainDefPtr def)
{
char **disks = NULL, **entries;
int hvm = def->os.type == VIR_DOMAIN_OSTYPE_HVM;
virConfValuePtr list = virConfGetValue(conf, "disk");
int ret = -1;
int rc;
if (!list || list->type != VIR_CONF_LIST)
return 0;
rc = virConfGetValueStringList(conf, "disk", false, &disks);
if (rc <= 0)
return rc;
for (list = list->list; list; list = list->next) {
for (entries = disks; *entries; entries++) {
virDomainDiskDefPtr disk;
int rc;
char *entry = *entries;
if ((list->type != VIR_CONF_STRING) || (list->str == NULL))
continue;
if (!(disk = xenParseXMDisk(list->str, hvm)))
if (!(disk = xenParseXMDisk(entry, hvm)))
continue;
/* Maintain list in sorted order according to target device name */
@ -284,10 +284,14 @@ xenParseXMDiskList(virConfPtr conf, virDomainDefPtr def)
virDomainDiskDefFree(disk);
if (rc < 0)
return -1;
goto cleanup;
}
return 0;
ret = 0;
cleanup:
virStringListFree(disks);
return ret;
}