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 8B71F9A5BF for ; Fri, 17 Nov 2023 12:54:08 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6E3EC31EBB for ; Fri, 17 Nov 2023 12:53:38 +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 ; Fri, 17 Nov 2023 12:53:37 +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 A858943DCE for ; Fri, 17 Nov 2023 12:53:37 +0100 (CET) From: Hannes Duerr To: pve-devel@lists.proxmox.com Date: Fri, 17 Nov 2023 12:53:11 +0100 Message-Id: <20231117115311.111320-5-h.duerr@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231117115311.111320-1-h.duerr@proxmox.com> References: <20231117115311.111320-1-h.duerr@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.002 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: [pve-devel] [PATCH v4 qemu-server 4/4] fix #4957: add vendor and product information passthrough for SCSI-Disks 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: Fri, 17 Nov 2023 11:54:08 -0000 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 --- PVE/API2/Qemu.pm | 39 +++++++++++++++++++++++++++++++++++++++ PVE/QemuServer.pm | 13 ++++++++++++- PVE/QemuServer/Drive.pm | 24 ++++++++++++++++++++++++ 3 files changed, 75 insertions(+), 1 deletion(-) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index b9c8f20..fc8c876 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -696,6 +696,33 @@ my $check_vm_modify_config_perm = sub { return 1; }; +sub assert_scsi_feature_compatibility { + my ($opt, $conf, $storecfg, $drive_attributes) = @_; + + my $drive = PVE::QemuServer::Drive::parse_drive($opt, $drive_attributes); + + my $machine_type = PVE::QemuServer::get_vm_machine($conf, undef, $conf->{arch}); + my $machine_version = PVE::QemuServer::extract_version( + $machine_type, PVE::QemuServer::kvm_user_version()); + my $drivetype = PVE::QemuServer::Drive::get_scsi_devicetype( + $drive, $storecfg, $machine_version); + + if ($drivetype ne 'hd' && $drivetype ne 'cd') { + if ($drive->{product}) { + raise_param_exc({ + product => "Passing of product information is only supported for". + "'scsi-hd' and 'scsi-cd' devices (e.g. not pass-through)." + }); + } + if ($drive->{vendor}) { + raise_param_exc({ + vendor => "Passing of vendor information is only supported for". + "'scsi-hd' and 'scsi-cd' devices (e.g. not pass-through)." + }); + } + } +} + __PACKAGE__->register_method({ name => 'vmlist', path => '', @@ -1011,6 +1038,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(\d)+$/) { + assert_scsi_feature_compatibility( + $opt, $conf, $storecfg, $param->{$opt}); + } + } + $conf->{meta} = PVE::QemuServer::new_meta_info_string(); my $vollist = []; @@ -1826,6 +1860,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(\d)+$/) { + 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 6090f91..4fbb9b2 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -1210,7 +1210,8 @@ sub kvm_user_version { return $kvm_user_version->{$binary}; } -my sub extract_version { + +our sub extract_version { my ($machine_type, $version) = @_; $version = kvm_user_version() if !defined($version); return PVE::QemuServer::Machine::extract_version($machine_type, $version) @@ -1404,6 +1405,16 @@ sub print_drivedevice_full { } $device .= ",wwn=$drive->{wwn}" if $drive->{wwn}; + # only scsi-hd and scsi-cd support passing vendor and product information + if ($devicetype eq 'hd' || $devicetype eq 'cd') { + if (my $vendor = $drive->{vendor}) { + $device .= ",vendor=$vendor"; + } + if (my $product = $drive->{product}) { + $device .= ",product=$product"; + } + } + } elsif ($drive->{interface} eq 'ide' || $drive->{interface} eq 'sata') { my $maxdev = ($drive->{interface} eq 'sata') ? $PVE::QemuServer::Drive::MAX_SATA_DISKS : 2; my $controller = int($drive->{index} / $maxdev); diff --git a/PVE/QemuServer/Drive.pm b/PVE/QemuServer/Drive.pm index de62d43..4e1646d 100644 --- a/PVE/QemuServer/Drive.pm +++ b/PVE/QemuServer/Drive.pm @@ -161,6 +161,26 @@ my %iothread_fmt = ( iothread => { optional => 1, }); +my %product_fmt = ( + product => { + type => 'string', + pattern => '[A-Za-z0-9\-_]{,40}', + format_description => 'product', + description => "The drive's product name, up to 40 bytes long.", + optional => 1, + }, +); + +my %vendor_fmt = ( + vendor => { + type => 'string', + pattern => '[A-Za-z0-9\-_]{,40}', + format_description => 'vendor', + description => "The drive's vendor name, up to 40 bytes long.", + optional => 1, + }, +); + my %model_fmt = ( model => { type => 'string', @@ -278,10 +298,12 @@ PVE::JSONSchema::register_standard_option("pve-qm-ide", $idedesc); my $scsi_fmt = { %drivedesc_base, %iothread_fmt, + %product_fmt, %queues_fmt, %readonly_fmt, %scsiblock_fmt, %ssd_fmt, + %vendor_fmt, %wwn_fmt, }; my $scsidesc = { @@ -402,10 +424,12 @@ my $alldrive_fmt = { %drivedesc_base, %iothread_fmt, %model_fmt, + %product_fmt, %queues_fmt, %readonly_fmt, %scsiblock_fmt, %ssd_fmt, + %vendor_fmt, %wwn_fmt, %tpmversion_fmt, %efitype_fmt, -- 2.39.2