From nobody Mon Feb 9 01:16:57 2026 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 1533818954912498.4300536375448; Thu, 9 Aug 2018 05:49:14 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DBF5D8110F; Thu, 9 Aug 2018 12:49:12 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9F6901001F57; Thu, 9 Aug 2018 12:49:12 +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 4E9AF24F63; Thu, 9 Aug 2018 12:49:12 +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 w79Cn6E7004705 for ; Thu, 9 Aug 2018 08:49:06 -0400 Received: by smtp.corp.redhat.com (Postfix) id A9AD5215670D; Thu, 9 Aug 2018 12:49:06 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 264DA2156711; Thu, 9 Aug 2018 12:49:06 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 9 Aug 2018 14:48:56 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 3/6] qemu: Remove unused argument 'bootable' from qemuBuildDriveStr 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.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 09 Aug 2018 12:49:13 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Now that the argument is unused we can remove it transitively from all the call graphs. Signed-off-by: Peter Krempa Reviewed-by: J=EF=BF=BDn Tomko --- src/qemu/qemu_command.c | 20 +++++++------------- src/qemu/qemu_command.h | 3 +-- src/qemu/qemu_hotplug.c | 2 +- 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 78090898be..daf037328f 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1632,7 +1632,6 @@ qemuBuildDiskFrontendAttributes(virDomainDiskDefPtr d= isk, static char * qemuBuildDriveStr(virDomainDiskDefPtr disk, - bool bootable ATTRIBUTE_UNUSED, virQEMUCapsPtr qemuCaps) { virBuffer opt =3D VIR_BUFFER_INITIALIZER; @@ -2244,14 +2243,12 @@ qemuBuildBlockStorageSourceAttachDataCommandline(vi= rCommandPtr cmd, static int qemuBuildDiskSourceCommandLine(virCommandPtr cmd, virDomainDiskDefPtr disk, - virQEMUCapsPtr qemuCaps, - bool driveBoot) + virQEMUCapsPtr qemuCaps) { qemuBlockStorageSourceAttachDataPtr data =3D NULL; int ret =3D -1; - if (!(data =3D qemuBuildStorageSourceAttachPrepareDrive(disk, qemuCaps, - driveBoot))) + if (!(data =3D qemuBuildStorageSourceAttachPrepareDrive(disk, qemuCaps= ))) return -1; if (qemuBuildStorageSourceAttachPrepareCommon(disk->src, data, qemuCap= s) < 0 || @@ -2271,12 +2268,11 @@ qemuBuildDiskCommandLine(virCommandPtr cmd, const virDomainDef *def, virDomainDiskDefPtr disk, virQEMUCapsPtr qemuCaps, - unsigned int bootindex, - bool driveBoot) + unsigned int bootindex) { char *optstr; - if (qemuBuildDiskSourceCommandLine(cmd, disk, qemuCaps, driveBoot) < 0) + if (qemuBuildDiskSourceCommandLine(cmd, disk, qemuCaps) < 0) return -1; if (!qemuDiskBusNeedsDriveArg(disk->bus)) { @@ -2326,7 +2322,6 @@ qemuBuildDisksCommandLine(virCommandPtr cmd, for (i =3D 0; i < def->ndisks; i++) { virDomainDiskDefPtr disk =3D def->disks[i]; unsigned int bootindex =3D 0; - bool driveBoot =3D false; if (disk->info.bootIndex) { bootindex =3D disk->info.bootIndex; @@ -2349,7 +2344,7 @@ qemuBuildDisksCommandLine(virCommandPtr cmd, } if (qemuBuildDiskCommandLine(cmd, def, disk, qemuCaps, - bootindex, driveBoot) < 0) + bootindex) < 0) return -1; } @@ -10691,15 +10686,14 @@ qemuBuildHotpluggableCPUProps(const virDomainVcpu= Def *vcpu) */ qemuBlockStorageSourceAttachDataPtr qemuBuildStorageSourceAttachPrepareDrive(virDomainDiskDefPtr disk, - virQEMUCapsPtr qemuCaps, - bool driveBoot) + virQEMUCapsPtr qemuCaps) { qemuBlockStorageSourceAttachDataPtr data =3D NULL; if (VIR_ALLOC(data) < 0) return NULL; - if (!(data->driveCmd =3D qemuBuildDriveStr(disk, driveBoot, qemuCaps))= || + if (!(data->driveCmd =3D qemuBuildDriveStr(disk, qemuCaps)) || !(data->driveAlias =3D qemuAliasDiskDriveFromDisk(disk))) { qemuBlockStorageSourceAttachDataFree(data); return NULL; diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index cf17dc1ede..283bf3120d 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -103,8 +103,7 @@ bool qemuDiskBusNeedsDriveArg(int bus); qemuBlockStorageSourceAttachDataPtr qemuBuildStorageSourceAttachPrepareDrive(virDomainDiskDefPtr disk, - virQEMUCapsPtr qemuCaps, - bool driveBoot); + virQEMUCapsPtr qemuCaps); int qemuBuildStorageSourceAttachPrepareCommon(virStorageSourcePtr src, qemuBlockStorageSourceAttachData= Ptr data, diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 1488f0a7c2..5b52fe9edc 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -509,7 +509,7 @@ qemuHotplugDiskSourceAttachPrepare(virDomainDiskDefPtr = disk, if (VIR_ALLOC(data) < 0) return NULL; - if (!(backend =3D qemuBuildStorageSourceAttachPrepareDrive(disk, qemuC= aps, false))) + if (!(backend =3D qemuBuildStorageSourceAttachPrepareDrive(disk, qemuC= aps))) goto cleanup; if (qemuBuildStorageSourceAttachPrepareCommon(disk->src, backend, qemu= Caps) < 0) --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list