From 1cb9f2cb898cd20f913c1cca4fd570058159121d Mon Sep 17 00:00:00 2001 From: Fiona Ebner Date: Fri, 17 Jan 2025 15:24:15 +0100 Subject: [PATCH] machine: drop unused parameter from assert_valid_machine_property() helper Signed-off-by: Fiona Ebner --- PVE/API2/Qemu.pm | 4 ++-- PVE/QemuServer.pm | 2 +- PVE/QemuServer/Machine.pm | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index 8392400e..52425ee8 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -1250,7 +1250,7 @@ __PACKAGE__->register_method({ $conf->{machine} = PVE::QemuServer::Machine::print_machine($machine_conf); } } - PVE::QemuServer::Machine::assert_valid_machine_property($conf, $machine_conf); + PVE::QemuServer::Machine::assert_valid_machine_property($machine_conf); $conf->{lock} = 'import' if $live_import_mapping; @@ -2113,7 +2113,7 @@ my $update_vm_api = sub { $conf->{pending}->{$opt} = $param->{$opt}; } elsif ($opt eq 'machine') { my $machine_conf = PVE::QemuServer::Machine::parse_machine($param->{$opt}); - PVE::QemuServer::Machine::assert_valid_machine_property($conf, $machine_conf); + PVE::QemuServer::Machine::assert_valid_machine_property($machine_conf); $conf->{pending}->{$opt} = $param->{$opt}; } elsif ($opt eq 'cipassword') { if (!PVE::QemuServer::Helpers::windows_version($conf->{ostype})) { diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 5cde94a1..bc38fb1b 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -4193,7 +4193,7 @@ sub config_to_command { $machine_type_min .= "+pve$required_pve_version"; push @$machineFlags, "type=${machine_type_min}"; - PVE::QemuServer::Machine::assert_valid_machine_property($conf, $machine_conf); + PVE::QemuServer::Machine::assert_valid_machine_property($machine_conf); if (my $viommu = $machine_conf->{viommu}) { if ($viommu eq 'intel') { diff --git a/PVE/QemuServer/Machine.pm b/PVE/QemuServer/Machine.pm index a072ac29..7f03ef20 100644 --- a/PVE/QemuServer/Machine.pm +++ b/PVE/QemuServer/Machine.pm @@ -56,7 +56,7 @@ sub print_machine { } sub assert_valid_machine_property { - my ($conf, $machine_conf) = @_; + my ($machine_conf) = @_; my $q35 = $machine_conf->{type} && ($machine_conf->{type} =~ m/q35/) ? 1 : 0; if ($machine_conf->{viommu} && $machine_conf->{viommu} eq "intel" && !$q35) { die "to use Intel vIOMMU please set the machine type to q35\n";