If no smbios options are given on creation, default to generate a serial number. This is required for Windows Autopilot to identify a user device. Use the already generated smbios uuid as serial number, it should be unique enough for our purposes.
The base64 here is needed since all configuration options are stored as a base64 encoded string, which is ensured by the format. This ensures that the values are properly decoded in the gui, for example. Since all fields are forced to be stored in base64 format it might make sense for a future patch to a) remove the flag or b) allow values different than base64 encoded data in the other fields. Tested by creating a new vm via the gui and command line. Signed-off-by: Manuel Federanko <[email protected]> --- Changes since v1: * switch serial to be the same uuid * use print_smbios1 over manually constructing strings * remove the dedicated generate_smbios1_uuid subroutine src/PVE/API2/Qemu.pm | 9 ++++++++- src/PVE/CLI/qm.pm | 10 +++++++++- src/PVE/QemuServer.pm | 4 ---- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/PVE/API2/Qemu.pm b/src/PVE/API2/Qemu.pm index c2e185a6..bbf534e4 100644 --- a/src/PVE/API2/Qemu.pm +++ b/src/PVE/API2/Qemu.pm @@ -1471,7 +1471,14 @@ __PACKAGE__->register_method({ # auto generate uuid if user did not specify smbios1 option if (!$conf->{smbios1}) { - $conf->{smbios1} = PVE::QemuServer::generate_smbios1_uuid(); + my $smbios1_uuid = PVE::QemuServer::generate_uuid(); + my $smbios1_serial = MIME::Base64::encode_base64($smbios1_uuid, ""); + my %smbios1 = ( + uuid => $smbios1_uuid, + serial => $smbios1_serial, + base64 => 1, + ); + $conf->{smbios1} = PVE::QemuServer::print_smbios1(\%smbios1); } if ( diff --git a/src/PVE/CLI/qm.pm b/src/PVE/CLI/qm.pm index bdae9641..0daf402d 100755 --- a/src/PVE/CLI/qm.pm +++ b/src/PVE/CLI/qm.pm @@ -912,7 +912,15 @@ __PACKAGE__->register_method({ eval { # order matters, as do_import() will load_config() internally $conf->{vmgenid} = PVE::QemuServer::generate_uuid(); - $conf->{smbios1} = PVE::QemuServer::generate_smbios1_uuid(); + my $smbios1_uuid = PVE::QemuServer::generate_uuid(); + my $smbios1_serial = MIME::Base64::encode_base64($smbios1_uuid, ""); + my %smbios1 = ( + uuid => $smbios1_uuid, + serial => $smbios1_serial, + base64 => 1, + ); + $conf->{smbios1} = PVE::QemuServer::print_smbios1(\%smbios1); + PVE::QemuConfig->write_config($vmid, $conf); foreach my $disk (@{ $parsed->{disks} }) { diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm index 545758dc..b371d00b 100644 --- a/src/PVE/QemuServer.pm +++ b/src/PVE/QemuServer.pm @@ -8082,10 +8082,6 @@ sub generate_uuid { return $uuid_str; } -sub generate_smbios1_uuid { - return "uuid=" . generate_uuid(); -} - sub create_reboot_request { my ($vmid) = @_; open(my $fh, '>', "/run/qemu-server/$vmid.reboot") -- 2.47.3
