From nobody Sun Apr 28 06:51:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1519046752168830.2671159709961; Mon, 19 Feb 2018 05:25:52 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5AE3781E09; Mon, 19 Feb 2018 13:25:29 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 30E935D9CB; Mon, 19 Feb 2018 13:25:29 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id E66DB18033E9; Mon, 19 Feb 2018 13:25:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w1JDPRKh024189 for ; Mon, 19 Feb 2018 08:25:28 -0500 Received: by smtp.corp.redhat.com (Postfix) id B8A19213AEE4; Mon, 19 Feb 2018 13:25:27 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.98]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5F13B213AEE2 for ; Mon, 19 Feb 2018 13:25:27 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Mon, 19 Feb 2018 14:25:23 +0100 Message-Id: <20180219132523.19097-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] bhyve: Fix build X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 19 Feb 2018 13:25:29 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Commit 2d43f0a2dcfd dropped virDomainDiskTranslateSourcePool()'s first argument but failed to update callers in the bhyve driver. Signed-off-by: Andrea Bolognani --- Pushed under the build breaker rule. 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 c1241b811..fd738b42c 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -198,7 +198,7 @@ bhyveBuildAHCIControllerArgStr(const virDomainDef *def, goto error; } =20 - if (virDomainDiskTranslateSourcePool(conn, disk) < 0) + if (virDomainDiskTranslateSourcePool(disk) < 0) goto error; =20 disk_source =3D 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; =20 - if (virDomainDiskTranslateSourcePool(conn, disk) < 0) + if (virDomainDiskTranslateSourcePool(disk) < 0) return -1; =20 if (disk->device !=3D 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 d= ef) } =20 static bool -virBhyveUsableDisk(virConnectPtr conn, virDomainDiskDefPtr disk) +virBhyveUsableDisk(virDomainDiskDefPtr disk) { =20 - if (virDomainDiskTranslateSourcePool(conn, disk) < 0) + if (virDomainDiskTranslateSourcePool(disk) < 0) return false; =20 if ((disk->device !=3D VIR_DOMAIN_DISK_DEVICE_DISK) && @@ -729,7 +728,7 @@ virBhyveProcessBuildGrubbhyveCmd(virDomainDefPtr def, * across. */ cd =3D hdd =3D userdef =3D NULL; for (i =3D 0; i < def->ndisks; i++) { - if (!virBhyveUsableDisk(conn, def->disks[i])) + if (!virBhyveUsableDisk(def->disks[i])) continue; =20 diskdef =3D def->disks[i]; @@ -815,7 +814,7 @@ virBhyveProcessBuildGrubbhyveCmd(virDomainDefPtr def, } =20 static virDomainDiskDefPtr -virBhyveGetBootDisk(virConnectPtr conn, virDomainDefPtr def) +virBhyveGetBootDisk(virDomainDefPtr def) { size_t i; virDomainDiskDefPtr match =3D 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 =3D 0; i < def->ndisks; i++) { - if (!virBhyveUsableDisk(conn, def->disks[i])) + if (!virBhyveUsableDisk(def->disks[i])) continue; =20 if (def->disks[i]->device =3D=3D boot_dev) { @@ -875,7 +874,7 @@ virBhyveGetBootDisk(virConnectPtr conn, virDomainDefPtr= def) int first_usable_disk_index =3D -1; =20 for (i =3D 0; i < def->ndisks; i++) { - if (!virBhyveUsableDisk(conn, def->disks[i])) + if (!virBhyveUsableDisk(def->disks[i])) continue; else first_usable_disk_index =3D i; @@ -907,7 +906,7 @@ virBhyveProcessBuildLoadCmd(virConnectPtr conn, virDoma= inDefPtr def, virDomainDiskDefPtr disk =3D NULL; =20 if (def->os.bootloader =3D=3D NULL) { - disk =3D virBhyveGetBootDisk(conn, def); + disk =3D virBhyveGetBootDisk(def); =20 if (disk =3D=3D NULL) return NULL; --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list