Proxmox/qemu-server
5
0
Fork 0
mirror of git://git.proxmox.com/git/qemu-server.git synced 2025-01-07 17:17:57 +03:00
Code Releases Activity

fix #4957: add vendor and product information passthrough for SCSI-Disks

Browse Source 
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@proxmox.com>
[FE: add missing space to exception message
     use config option for exception e.g. scsi0 rather than 'product'
     style fixes]
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
This commit is contained in:
Hannes Duerr 2024-01-10 13:45:49 +01:00 committed by Fiona Ebner
parent c1b2092d5e
commit d1feab4aa2
3 changed files with 72 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
PVE/API2/Qemu.pm
View File

@ -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::Machine::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({
$opt => "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({
$opt => "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 => '',
@ -1013,6 +1040,12 @@ __PACKAGE__->register_method({
my $conf = $param;
my $arch = PVE::QemuServer::get_vm_arch($conf);
for my $opt (sort keys $param->%*) {
next if $opt !~ m/^scsi\d+$/;
assert_scsi_feature_compatibility($opt, $conf, $storecfg, $param->{$opt});
}
$conf->{meta} = PVE::QemuServer::new_meta_info_string();
my $vollist = [];
@ -1833,6 +1866,9 @@ 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});
assert_scsi_feature_compatibility($opt, $conf, $storecfg, $param->{$opt})
if $opt =~ m/^scsi\d+$/;
my (undef, $created_opts) = $create_disks->(
$rpcenv,
$authuser,

12
PVE/QemuServer.pm
View File

@ -1427,6 +1427,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);
@ -5364,8 +5374,10 @@ sub vmconfig_update_disk {
safe_string_ne($drive->{discard}, $old_drive->{discard}) ||
safe_string_ne($drive->{iothread}, $old_drive->{iothread}) ||
safe_string_ne($drive->{queues}, $old_drive->{queues}) ||
safe_string_ne($drive->{product}, $old_drive->{product}) ||
safe_string_ne($drive->{cache}, $old_drive->{cache}) ||
safe_string_ne($drive->{ssd}, $old_drive->{ssd}) ||
safe_string_ne($drive->{vendor}, $old_drive->{vendor}) ||
safe_string_ne($drive->{ro}, $old_drive->{ro})) {
die "skip\n";
}

24
PVE/QemuServer/Drive.pm
View File

@ -163,6 +163,26 @@ my %iothread_fmt = ( iothread => {
optional => 1,
});
my %product_fmt = (
product => {
type => 'string',
pattern => '[A-Za-z0-9\-_\s]{,16}',
format_description => 'product',
description => "The drive's product name, up to 16 bytes long.",
optional => 1,
},
);
my %vendor_fmt = (
vendor => {
type => 'string',
pattern => '[A-Za-z0-9\-_\s]{,8}',
format_description => 'vendor',
description => "The drive's vendor name, up to 8 bytes long.",
optional => 1,
},
);
my %model_fmt = (
model => {
type => 'string',
@ -280,10 +300,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 = {
@ -404,10 +426,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,