From f9159efec853ae0b8c9658b4d0623572676a5f49 Mon Sep 17 00:00:00 2001
From: Andrea Bolognani <abologna@redhat.com>
Date: Mon, 19 Feb 2018 14:19:41 +0100
Subject: [PATCH] bhyve: Fix build

Commit 2d43f0a2dcfd dropped virDomainDiskTranslateSourcePool()'s
first argument but failed to update callers in the bhyve driver.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---
 src/bhyve/bhyve_command.c | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c
index c1241b8110..fd738b42c9 100644
--- a/src/bhyve/bhyve_command.c
+++ b/src/bhyve/bhyve_command.c
@@ -198,7 +198,7 @@ bhyveBuildAHCIControllerArgStr(const virDomainDef *def,
             goto error;
         }
 
-        if (virDomainDiskTranslateSourcePool(conn, disk) < 0)
+        if (virDomainDiskTranslateSourcePool(disk) < 0)
             goto error;
 
         disk_source = virDomainDiskGetSource(disk);
@@ -289,12 +289,11 @@ bhyveBuildUSBControllerArgStr(const virDomainDef *def,
 static int
 bhyveBuildVirtIODiskArgStr(const virDomainDef *def ATTRIBUTE_UNUSED,
                      virDomainDiskDefPtr disk,
-                     virConnectPtr conn,
                      virCommandPtr cmd)
 {
     const char *disk_source;
 
-    if (virDomainDiskTranslateSourcePool(conn, disk) < 0)
+    if (virDomainDiskTranslateSourcePool(disk) < 0)
         return -1;
 
     if (disk->device != VIR_DOMAIN_DISK_DEVICE_DISK) {
@@ -562,7 +561,7 @@ virBhyveProcessBuildBhyveCmd(virConnectPtr conn,
             /* Handled by bhyveBuildAHCIControllerArgStr() */
             break;
         case VIR_DOMAIN_DISK_BUS_VIRTIO:
-            if (bhyveBuildVirtIODiskArgStr(def, disk, conn, cmd) < 0)
+            if (bhyveBuildVirtIODiskArgStr(def, disk, cmd) < 0)
                 goto error;
             break;
         default:
@@ -672,10 +671,10 @@ virBhyveProcessBuildCustomLoaderCmd(virDomainDefPtr def)
 }
 
 static bool
-virBhyveUsableDisk(virConnectPtr conn, virDomainDiskDefPtr disk)
+virBhyveUsableDisk(virDomainDiskDefPtr disk)
 {
 
-    if (virDomainDiskTranslateSourcePool(conn, disk) < 0)
+    if (virDomainDiskTranslateSourcePool(disk) < 0)
         return false;
 
     if ((disk->device != VIR_DOMAIN_DISK_DEVICE_DISK) &&
@@ -729,7 +728,7 @@ virBhyveProcessBuildGrubbhyveCmd(virDomainDefPtr def,
      * across. */
     cd = hdd = userdef = NULL;
     for (i = 0; i < def->ndisks; i++) {
-        if (!virBhyveUsableDisk(conn, def->disks[i]))
+        if (!virBhyveUsableDisk(def->disks[i]))
             continue;
 
         diskdef = def->disks[i];
@@ -815,7 +814,7 @@ virBhyveProcessBuildGrubbhyveCmd(virDomainDefPtr def,
 }
 
 static virDomainDiskDefPtr
-virBhyveGetBootDisk(virConnectPtr conn, virDomainDefPtr def)
+virBhyveGetBootDisk(virDomainDefPtr def)
 {
     size_t i;
     virDomainDiskDefPtr match = NULL;
@@ -851,7 +850,7 @@ virBhyveGetBootDisk(virConnectPtr conn, virDomainDefPtr def)
         /* If boot_dev is set, we return the first device of
          * the request type */
         for (i = 0; i < def->ndisks; i++) {
-            if (!virBhyveUsableDisk(conn, def->disks[i]))
+            if (!virBhyveUsableDisk(def->disks[i]))
                 continue;
 
             if (def->disks[i]->device == boot_dev) {
@@ -875,7 +874,7 @@ virBhyveGetBootDisk(virConnectPtr conn, virDomainDefPtr def)
         int first_usable_disk_index = -1;
 
         for (i = 0; i < def->ndisks; i++) {
-            if (!virBhyveUsableDisk(conn, def->disks[i]))
+            if (!virBhyveUsableDisk(def->disks[i]))
                 continue;
             else
                 first_usable_disk_index = i;
@@ -907,7 +906,7 @@ virBhyveProcessBuildLoadCmd(virConnectPtr conn, virDomainDefPtr def,
     virDomainDiskDefPtr disk = NULL;
 
     if (def->os.bootloader == NULL) {
-        disk = virBhyveGetBootDisk(conn, def);
+        disk = virBhyveGetBootDisk(def);
 
         if (disk == NULL)
             return NULL;
-- 
GitLab