From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id DE526992F0 for ; Thu, 16 Nov 2023 11:15:04 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C0565113D2 for ; Thu, 16 Nov 2023 11:15:04 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 16 Nov 2023 11:15:04 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id C15EC436AF for ; Thu, 16 Nov 2023 11:15:03 +0100 (CET) Message-ID: <4ca79a2c-0e0f-4a70-9f76-e3cc0f3757ea@proxmox.com> Date: Thu, 16 Nov 2023 11:15:03 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: Proxmox VE development discussion , Hannes Duerr References: <20231110093358.62006-1-h.duerr@proxmox.com> <20231110093358.62006-2-h.duerr@proxmox.com> From: Fiona Ebner In-Reply-To: <20231110093358.62006-2-h.duerr@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.079 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: Re: [pve-devel] [PATCH v3 qemu-server 1/2] Create get_scsi_devicetype and move it and its dependencies to QemuServer/Drive.pm X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Nov 2023 10:15:04 -0000 Nit: Like can be seen from the "and" in the commit title, it's actually two changes. Moving the dependencies first, and then introducing the new helper in a second patch would be even better. But no big deal :) Am 10.11.23 um 10:33 schrieb Hannes Duerr: > +sub get_scsi_devicetype { > + my ($drive, $storecfg, $machine_version) = @_; > + > + my $devicetype = 'hd'; > + my $path = ''; > + if (drive_is_cdrom($drive)) { > + $devicetype = 'cd'; > + } else { > + if ($drive->{file} =~ m|^/|) { > + $path = $drive->{file}; > + if (my $info = path_is_scsi($path)) { > + if ($info->{type} == 0 && $drive->{scsiblock}) { > + $devicetype = 'block'; > + } elsif ($info->{type} == 1) { # tape > + $devicetype = 'generic'; > + } > + } > + } elsif ($drive->{file} =~ m/local-lvm:/){ > + # special syntax cannot be parsed to path > + $path = "local-lvm"; What if the storage is called differently ;) Note, there also is a NEW_DISK_RE in API2/Qemu.pm you can use to compare (needs to be moved to the Drive.pm module first - make it our $NEW_DISK_RE = ...; to be able to reference it from API2/Qemu.pm afterwards) Why set the path to some fake value and not just return the device type early?