From: Eric Blake <eblake@redhat.com>
Date: Wed, 19 Mar 2014 12:31:04 +0000 (-0600)
Subject: conf: use disk source accessors in bhyve/
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=119a258c4c093dda23b2b504bd664aeba2433df1;p=people%2Fliuw%2Flibxenctrl-split%2Flibvirt.git

conf: use disk source accessors in bhyve/

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>
---

diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c
index 6d64c27d8..b9bc0a685 100644
--- a/src/bhyve/bhyve_command.c
+++ b/src/bhyve/bhyve_command.c
@@ -216,14 +216,15 @@ bhyveBuildDiskArgStr(const virDomainDef *def, virCommandPtr cmd)
         return -1;
     }
 
-    if (disk->type != VIR_DOMAIN_DISK_TYPE_FILE) {
+    if (virDomainDiskGetType(disk) != VIR_DOMAIN_DISK_TYPE_FILE) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                        _("unsupported disk type"));
         return -1;
     }
 
     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;
 }
@@ -319,7 +320,7 @@ virBhyveProcessBuildLoadCmd(bhyveConnPtr driver ATTRIBUTE_UNUSED,
         return NULL;
     }
 
-    if (disk->type != VIR_DOMAIN_DISK_TYPE_FILE) {
+    if (virDomainDiskGetType(disk) != VIR_DOMAIN_DISK_TYPE_FILE) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                        _("unsupported disk type"));
         return NULL;
@@ -334,7 +335,7 @@ virBhyveProcessBuildLoadCmd(bhyveConnPtr driver ATTRIBUTE_UNUSED,
 
     /* Image path */
     virCommandAddArg(cmd, "-d");
-    virCommandAddArg(cmd, disk->src);
+    virCommandAddArg(cmd, virDomainDiskGetSource(disk));
 
     /* VM name */
     virCommandAddArg(cmd, vm->def->name);