proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-05-11 14:27:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

new option smbios1: specify SMBIOS type 1 fields (uuid, ...)

Browse Source
This commit is contained in:
Dietmar Maurer 2014-06-26 11:12:25 +02:00
parent a29f410963
commit 2796e7d542
1 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
PVE/QemuServer.pm
View File

@ -437,6 +437,13 @@ EODESCR
maxLength => 40, maxLength => 40,
optional => 1, optional => 1,
}, },
smbios1 => {
description => "Specify SMBIOS type 1 fields.",
type => 'string', format => 'pve-qm-smbios1',
typetext => "[manufacturer=str][,product=str][,version=str][,serial=str] [,uuid=uuid][,sku=str][,family=str]",
maxLength => 256,
optional => 1,
},
}; };
# what about other qemu settings ? # what about other qemu settings ?
@ -1372,6 +1379,45 @@ sub add_unused_volume {
return $key; return $key;
} }
my $valid_smbios1_options = {
manufacturer => '\S+',
product => '\S+',
version => '\S+',
serial => '\S+',
uuid => '[a-fA-F0-9]{8}(?:-[a-fA-F0-9]{4}){3}-[a-fA-F0-9]{12}',
sku => '\S+',
family => '\S+',
};
# smbios: [manufacturer=str][,product=str][,version=str][,serial=str][,uuid=uuid][,sku=str][,family=str]
sub parse_smbios1 {
my ($data) = @_;
my $res = {};
foreach my $kvp (split(/,/, $data)) {
return undef if $kvp !~ m/^(\S+)=(.+)$/;
my ($k, $v) = split(/=/, $kvp);
return undef if !defined($k) || !defined($v);
return undef if !$valid_smbios1_options->{$k};
return undef if $v !~ m/^$valid_smbios1_options->{$k}$/;
$res->{$k} = $v;
}
return $res;
}
PVE::JSONSchema::register_format('pve-qm-smbios1', \&verify_smbios1);
sub verify_smbios1 {
my ($value, $noerr) = @_;
return $value if parse_smbios1($value);
return undef if $noerr;
die "unable to parse smbios (type 1) options\n";
}
PVE::JSONSchema::register_format('pve-qm-bootdisk', \&verify_bootdisk); PVE::JSONSchema::register_format('pve-qm-bootdisk', \&verify_bootdisk);
sub verify_bootdisk { sub verify_bootdisk {
my ($value, $noerr) = @_; my ($value, $noerr) = @_;
@ -2375,6 +2421,10 @@ sub config_to_command {
push @$cmd, '-daemonize'; push @$cmd, '-daemonize';
if ($conf->{smbios1}) {
push @$cmd, '-smbios', "type=1,$conf->{smbios1}";
}
if ($q35) { if ($q35) {
# the q35 chipset support native usb2, so we enable usb controller # the q35 chipset support native usb2, so we enable usb controller
# by default for this machine type # by default for this machine type