From nobody Tue Oct 22 22:29:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1694699835; cv=none; d=zohomail.com; s=zohoarc; b=KEH6Ign6lOxYECn291VxALOLjQiokaD2PbdIg6tVyt5zYkZlfHPuLuTHqwBOAG4KLViA6HxSKsoH3CbSaxaZibVMQB/KGhzhUYjfBEmU9gx3UJQpUiSvCeboHYaF3bAhMsv6pB4FH+2MCH5D9mRAA5xJyn5qqhubonABbb4ZOHk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694699835; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=RxZBiLTkG4GtRX6dWhqm2o5RZ5fUQT711eP6RkXXzPI=; b=ZbNG7WYwXIYPLduqAQeZtl4JA6aNrTrm5tXIRbwwRn2xcdpiBmN3+ZccRUjMU1C+WWjM0EEamVIN8bajC+u2h3QVNITl/xii6q5kdFVfnVF9JG2gssg2y1w5VbZjRHEPgHvhtp9ksXgbdkkNNWY3ulQkzhJLrnZdpVoIzwPdyPE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1694699835043270.7195621269602; Thu, 14 Sep 2023 06:57:15 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-628-CxUBrQUPNtKNSI0VMHNvAw-1; Thu, 14 Sep 2023 09:57:07 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 65661935D44; Thu, 14 Sep 2023 13:57:04 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4FBBF20268CB; Thu, 14 Sep 2023 13:57:04 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id BF64219452CA; Thu, 14 Sep 2023 13:56:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 4EDB01946A62 for ; Thu, 14 Sep 2023 13:56:29 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 478FF40C6EC0; Thu, 14 Sep 2023 13:56:29 +0000 (UTC) Received: from maggie.brq.redhat.com (unknown [10.43.2.46]) by smtp.corp.redhat.com (Postfix) with ESMTP id E3E3340C6EBF for ; Thu, 14 Sep 2023 13:56:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1694699834; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=RxZBiLTkG4GtRX6dWhqm2o5RZ5fUQT711eP6RkXXzPI=; b=XxbHIQz2zTntj7i/uhilzMDrgoFEbIjbQ5Nxq2w5PgyOtF9mD0SHlQbNHVhFvCn+i7r9RK L9geUYcD9zssNtu1qgQ22azci4pGfPaMNlJjAO/4uvrs8rhskxwbsfAkOyq6Qoy9D/Jrh2 /Nm6zCHbAuFKTOfvipNAg5IChz2MePs= X-MC-Unique: CxUBrQUPNtKNSI0VMHNvAw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 07/20] src: Drop needless typecast to virDomainDiskBus Date: Thu, 14 Sep 2023 15:56:08 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1694699836264100001 Content-Type: text/plain; charset="utf-8"; x-default="true" The 'bus' member of _virDomainDiskDef is already declared of virDomainDiskModel type. Hence, there is no need to typecast the variable when passing to switch() statements. Signed-off-by: Michal Privoznik --- src/qemu/qemu_alias.c | 2 +- src/qemu/qemu_command.c | 4 ++-- src/qemu/qemu_domain_address.c | 2 +- src/qemu/qemu_hotplug.c | 4 ++-- src/qemu/qemu_validate.c | 4 ++-- src/vbox/vbox_common.c | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index 161d30cf72..e58c488f8a 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -244,7 +244,7 @@ qemuAssignDeviceDiskAlias(virDomainDef *def, * need the full path into /machine/peripheral as a historical artifac= t. */ if (!diskPriv->qomName) { - switch ((virDomainDiskBus) disk->bus) { + switch (disk->bus) { case VIR_DOMAIN_DISK_BUS_FDC: case VIR_DOMAIN_DISK_BUS_IDE: case VIR_DOMAIN_DISK_BUS_SATA: diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6de0bdf977..be5814663c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -409,7 +409,7 @@ qemuBuildDeviceAddresDriveProps(virJSONValue *props, virDomainControllerDef *controller =3D NULL; const char *controllerAlias =3D NULL; =20 - switch ((virDomainDiskBus) info->addr.drive.diskbus) { + switch (info->addr.drive.diskbus) { case VIR_DOMAIN_DISK_BUS_IDE: /* When domain has builtin IDE controller we don't put it onto cmd * line. Therefore we can't set its alias. In that case, use the @@ -1770,7 +1770,7 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, const char *wpolicy =3D NULL; const char *rpolicy =3D NULL; =20 - switch ((virDomainDiskBus) disk->bus) { + switch (disk->bus) { case VIR_DOMAIN_DISK_BUS_IDE: case VIR_DOMAIN_DISK_BUS_SATA: if (disk->device =3D=3D VIR_DOMAIN_DISK_DEVICE_CDROM) diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 0875ed0401..00742d3c0e 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -790,7 +790,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDevic= eDef *dev, break; =20 case VIR_DOMAIN_DEVICE_DISK: - switch ((virDomainDiskBus) dev->data.disk->bus) { + switch (dev->data.disk->bus) { case VIR_DOMAIN_DISK_BUS_VIRTIO: /* only virtio disks use PCI */ switch (dev->data.disk->model) { diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 0d5f253bb9..d4f01cfd93 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -926,7 +926,7 @@ qemuDomainAttachDeviceDiskLiveInternal(virQEMUDriver *d= river, goto cleanup; } =20 - switch ((virDomainDiskBus) disk->bus) { + switch (disk->bus) { case VIR_DOMAIN_DISK_BUS_USB: if (disk->device =3D=3D VIR_DOMAIN_DISK_DEVICE_LUN) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -5468,7 +5468,7 @@ qemuDomainDetachPrepDisk(virDomainObj *vm, case VIR_DOMAIN_DISK_DEVICE_DISK: case VIR_DOMAIN_DISK_DEVICE_LUN: =20 - switch ((virDomainDiskBus) disk->bus) { + switch (disk->bus) { case VIR_DOMAIN_DISK_BUS_VIRTIO: case VIR_DOMAIN_DISK_BUS_USB: case VIR_DOMAIN_DISK_BUS_SCSI: diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 3b57fa3c21..18d34e7f59 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -1371,7 +1371,7 @@ qemuValidateDomainDeviceDefAddressDrive(virDomainDevi= ceInfo *info, { virDomainControllerDef *controller =3D NULL; =20 - switch ((virDomainDiskBus) info->addr.drive.diskbus) { + switch (info->addr.drive.diskbus) { case VIR_DOMAIN_DISK_BUS_SCSI: /* Setting bus=3D attr for SCSI drives, causes a controller * to be created. Yes this is slightly odd. It is not possible @@ -2673,7 +2673,7 @@ static bool qemuValidateDomainDeviceDefDiskIOThreads(const virDomainDef *def, const virDomainDiskDef *disk) { - switch ((virDomainDiskBus)disk->bus) { + switch (disk->bus) { case VIR_DOMAIN_DISK_BUS_VIRTIO: break; =20 diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index dba4af1a44..490f337a56 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -1206,7 +1206,7 @@ vboxAttachDrives(virDomainDef *def, struct _vboxDrive= r *data, IMachine *machine) goto cleanup; } =20 - switch ((virDomainDiskBus) disk->bus) { + switch (disk->bus) { case VIR_DOMAIN_DISK_BUS_IDE: VBOX_UTF8_TO_UTF16(VBOX_CONTROLLER_IDE_NAME, &storageCtlName); devicePort =3D def->disks[i]->info.addr.drive.bus; --=20 2.41.0