External/libvirt
1
0
Fork 0
Code

conf: use disk source accessors in bhyve/

Browse Source 
Part of a series of cleanups to use new accessor methods.

* src/bhyve/bhyve_command.c (bhyveBuildDiskArgStr)
(virBhyveProcessBuildLoadCmd): Use accessors.

Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Eric Blake 2014-03-19 06:31:04 -06:00
parent a9ab99cac2
commit 119a258c4c
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/bhyve/bhyve_command.c
View File

@ -216,14 +216,15 @@ bhyveBuildDiskArgStr(const virDomainDef *def, virCommandPtr cmd)
return -1; return -1;
} }
if (disk->type != VIR_DOMAIN_DISK_TYPE_FILE) { if (virDomainDiskGetType(disk) != VIR_DOMAIN_DISK_TYPE_FILE) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("unsupported disk type")); _("unsupported disk type"));
return -1; return -1;
} }
virCommandAddArg(cmd, "-s"); virCommandAddArg(cmd, "-s");
virCommandAddArgFormat(cmd, "2:0,%s,%s", bus_type, disk->src); virCommandAddArgFormat(cmd, "2:0,%s,%s", bus_type,
virDomainDiskGetSource(disk));
return 0; return 0;
} }
@ -319,7 +320,7 @@ virBhyveProcessBuildLoadCmd(bhyveConnPtr driver ATTRIBUTE_UNUSED,
return NULL; return NULL;
} }
if (disk->type != VIR_DOMAIN_DISK_TYPE_FILE) { if (virDomainDiskGetType(disk) != VIR_DOMAIN_DISK_TYPE_FILE) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("unsupported disk type")); _("unsupported disk type"));
return NULL; return NULL;
@ -334,7 +335,7 @@ virBhyveProcessBuildLoadCmd(bhyveConnPtr driver ATTRIBUTE_UNUSED,
/* Image path */ /* Image path */
virCommandAddArg(cmd, "-d"); virCommandAddArg(cmd, "-d");
virCommandAddArg(cmd, disk->src); virCommandAddArg(cmd, virDomainDiskGetSource(disk));
/* VM name */ /* VM name */
virCommandAddArg(cmd, vm->def->name); virCommandAddArg(cmd, vm->def->name);