From nobody Thu May 15 10:17:51 2025 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1509710652939828.3443918794918; Fri, 3 Nov 2017 05:04:12 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 53FCAC04B952; Fri, 3 Nov 2017 12:04:11 +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 2F2576062D; Fri, 3 Nov 2017 12:04:11 +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 EBB865ED66; Fri, 3 Nov 2017 12:04:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id vA3C45jM005336 for ; Fri, 3 Nov 2017 08:04:05 -0400 Received: by smtp.corp.redhat.com (Postfix) id BF95A5C6D4; Fri, 3 Nov 2017 12:04:05 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7003960618; Fri, 3 Nov 2017 12:04:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 53FCAC04B952 Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: Peter Krempa To: libvir-list@redhat.com Date: Fri, 3 Nov 2017 13:03:30 +0100 Message-Id: <282c1ae7b5604d4d5606f2786fb33fadf458dc4c.1509710570.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 2/9] qemu: command: Remove dead code when formatting -drive 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Fri, 03 Nov 2017 12:04:11 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" busid and unitid are ever used only if the device is an SD card due to the check in qemuDiskBusNeedsDeviceArg. Since the SD card does not have an bus or unit number, most of the code and command line formatter can be removed since it will never be used. --- src/qemu/qemu_command.c | 37 +------------------------------------ 1 file changed, 1 insertion(+), 36 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index b1cfafa79..a77a0a1fa 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1639,38 +1639,11 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, const char *trans =3D virDomainDiskGeometryTransTypeToString(disk->geometry.trans); int idx =3D virDiskNameToIndex(disk->dst); - int busid =3D -1, unitid =3D -1; bool emitDeviceSyntax =3D qemuDiskBusNeedsDeviceArg(disk->bus); if (qemuBuildDriveStrValidate(disk, qemuCaps, bus, idx) < 0) goto error; - switch (disk->bus) { - case VIR_DOMAIN_DISK_BUS_SCSI: - busid =3D disk->info.addr.drive.controller; - unitid =3D disk->info.addr.drive.unit; - break; - - case VIR_DOMAIN_DISK_BUS_IDE: - busid =3D disk->info.addr.drive.bus; - unitid =3D disk->info.addr.drive.unit; - break; - - case VIR_DOMAIN_DISK_BUS_FDC: - unitid =3D disk->info.addr.drive.unit; - break; - - case VIR_DOMAIN_DISK_BUS_VIRTIO: - idx =3D -1; - break; - - case VIR_DOMAIN_DISK_BUS_XEN: - case VIR_DOMAIN_DISK_BUS_SD: - /* Xen and SD have no address type currently, so assign - * based on index */ - break; - } - if (qemuBuildDriveSourceStr(disk, cfg, &opt, qemuCaps) < 0) goto error; @@ -1698,15 +1671,7 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, virBufferAsprintf(&opt, ",id=3D%s", drivealias); VIR_FREE(drivealias); } else { - if (busid =3D=3D -1 && unitid =3D=3D -1) { - if (idx !=3D -1) - virBufferAsprintf(&opt, ",index=3D%d", idx); - } else { - if (busid !=3D -1) - virBufferAsprintf(&opt, ",bus=3D%d", busid); - if (unitid !=3D -1) - virBufferAsprintf(&opt, ",unit=3D%d", unitid); - } + virBufferAsprintf(&opt, ",index=3D%d", idx); } if (bootable && virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_BOOT) && --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list