proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-07-09 11:02:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

machine: drop unused parameter from assert_valid_machine_property() helper

Browse Source 
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fiona Ebner 2025-01-17 15:24:15 +01:00 committed by Thomas Lamprecht
parent 3aa377c9fe
commit 1cb9f2cb89
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PVE/API2/Qemu.pm
View File

@ -1250,7 +1250,7 @@ __PACKAGE__->register_method({
$conf->{machine} = PVE::QemuServer::Machine::print_machine($machine_conf); $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; $conf->{lock} = 'import' if $live_import_mapping;
@ -2113,7 +2113,7 @@ my $update_vm_api = sub {
$conf->{pending}->{$opt} = $param->{$opt}; $conf->{pending}->{$opt} = $param->{$opt};
} elsif ($opt eq 'machine') { } elsif ($opt eq 'machine') {
my $machine_conf = PVE::QemuServer::Machine::parse_machine($param->{$opt}); 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}; $conf->{pending}->{$opt} = $param->{$opt};
} elsif ($opt eq 'cipassword') { } elsif ($opt eq 'cipassword') {
if (!PVE::QemuServer::Helpers::windows_version($conf->{ostype})) { if (!PVE::QemuServer::Helpers::windows_version($conf->{ostype})) {

2
PVE/QemuServer.pm
View File

@ -4193,7 +4193,7 @@ sub config_to_command {
$machine_type_min .= "+pve$required_pve_version"; $machine_type_min .= "+pve$required_pve_version";
push @$machineFlags, "type=${machine_type_min}"; 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 (my $viommu = $machine_conf->{viommu}) {
if ($viommu eq 'intel') { if ($viommu eq 'intel') {

2
PVE/QemuServer/Machine.pm
View File

@ -56,7 +56,7 @@ sub print_machine {
} }
sub assert_valid_machine_property { sub assert_valid_machine_property {
my ($conf, $machine_conf) = @_; my ($machine_conf) = @_;
my $q35 = $machine_conf->{type} && ($machine_conf->{type} =~ m/q35/) ? 1 : 0; my $q35 = $machine_conf->{type} && ($machine_conf->{type} =~ m/q35/) ? 1 : 0;
if ($machine_conf->{viommu} && $machine_conf->{viommu} eq "intel" && !$q35) { if ($machine_conf->{viommu} && $machine_conf->{viommu} eq "intel" && !$q35) {
die "to use Intel vIOMMU please set the machine type to q35\n"; die "to use Intel vIOMMU please set the machine type to q35\n";