From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 174301FF164 for ; Fri, 17 Jan 2025 13:08:44 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3B488CA20; Fri, 17 Jan 2025 13:08:31 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Fri, 17 Jan 2025 13:08:01 +0100 Message-Id: <20250117120817.41443-3-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250117120817.41443-1-f.ebner@proxmox.com> References: <20250117120817.41443-1-f.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.051 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [qemu.pm, machine.pm, qemuserver.pm] Subject: [pve-devel] [PATCH qemu-server v3 02/18] machine: drop unused parameter from assert_valid_machine_property() helper X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" 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"; -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel