提交 7c2b32a6 编写于 作者: F Fabiano Fidêncio 提交者: Ján Tomko

xen_vm: convert to typesafe virConf accessors

Signed-off-by: NFabiano Fidêncio <fabiano@fidencio.org>
Reviewed-by: NJán Tomko <jtomko@redhat.com>
Signed-off-by: NJán Tomko <jtomko@redhat.com>
上级 5d358df8
......@@ -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;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册