[pve-devel] [PATCH v3 qemu-server 2/2] fix #4957: add vendor and product information passthrough for SCSI-Disks

[Fiona Ebner]

Am 10.11.23 um 10:33 schrieb Hannes Duerr:
> adds vendor and product information for SCSI devices to the json schema and
> checks in the VM create/update API call if it is possible to add these to QEMU as a device option
> 
> Signed-off-by: Hannes Duerr <h.duerr at proxmox.com>
> ---
>  PVE/API2/Qemu.pm        | 12 ++++++++++++
>  PVE/QemuServer.pm       | 28 ++++++++++++++++++++++++++++
>  PVE/QemuServer/Drive.pm | 24 ++++++++++++++++++++++++
>  3 files changed, 64 insertions(+)
> 
> diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
> index 38bdaab..9d8171a 100644
> --- a/PVE/API2/Qemu.pm
> +++ b/PVE/API2/Qemu.pm
> @@ -1013,6 +1013,13 @@ __PACKAGE__->register_method({
>  		my $conf = $param;
>  		my $arch = PVE::QemuServer::get_vm_arch($conf);
>  
> +		for my $opt (sort keys $param->%*) {
> +		    if ($opt =~ m/scsi/) {

Should be anchored and best to even match for the number too, i.e.
^scsi(\d)+$ to make it future-proof. E.g. there could be a
'scsi-defaults' option at some point

> +			PVE::QemuServer::assert_scsi_feature_compatibility(
> +			    $opt, $conf, $storecfg, $param->{$opt});
> +		    }
> +		}
> +
>  		$conf->{meta} = PVE::QemuServer::new_meta_info_string();
>  
>  		my $vollist = [];
> @@ -1828,6 +1835,11 @@ my $update_vm_api  = sub {
>  		    PVE::QemuServer::vmconfig_register_unused_drive($storecfg, $vmid, $conf, PVE::QemuServer::parse_drive($opt, $conf->{pending}->{$opt}))
>  			if defined($conf->{pending}->{$opt});
>  
> +		    if ($opt =~ m/scsi/) {
> +			PVE::QemuServer::assert_scsi_feature_compatibility(
> +			    $opt, $conf, $storecfg, $param->{$opt});
> +		    }
> +
>  		    my (undef, $created_opts) = $create_disks->(
>  			$rpcenv,
>  			$authuser,
> diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
> index 9a83021..9c998d6 100644
> --- a/PVE/QemuServer.pm
> +++ b/PVE/QemuServer.pm
> @@ -1368,6 +1368,24 @@ my sub get_drive_id {
>      return "$drive->{interface}$drive->{index}";
>  }
>  
> +sub assert_scsi_feature_compatibility {
> +    my ($opt, $conf, $storecfg, $drive_attributes) = @_;
> +

Since it's only used in API2/Qemu.pm, should it live there?

> +    my $drive = parse_drive($opt, $drive_attributes);
> +
> +    my $machine_type = get_vm_machine($conf, undef, $conf->{arch});
> +    my $machine_version = extract_version($machine_type, kvm_user_version());
> +    my $drivetype = PVE::QemuServer::Drive::get_scsi_devicetype(
> +	$drive, $storecfg, $machine_version);
> +
> +    if ($drivetype ne 'hd' && $drivetype ne 'cd') {
> +	if ($drive_attributes =~ m/vendor/ || $drive_attributes =~ m/product/) {

Please check $drive->{vendor} and $drive->{product} here. These regexes
are brittle and not future-proof.

> +	    die "only 'scsi-hd' and 'scsi-cd' devices".
> +		"support passing vendor and product information\n";

Could be a raise_param_exc and maybe give a hint about pass-through? For
example:

only 'scsi-hd' and 'scsi-cd' devices (e.g. not pass-through)

Like that users will know in most situations what the issue is.