From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id AC60BB306 for ; Wed, 9 Aug 2023 10:38:06 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D4D1911D67 for ; Wed, 9 Aug 2023 10:38:05 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 9 Aug 2023 10:38:05 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 3620343BEE for ; Wed, 9 Aug 2023 10:38:05 +0200 (CEST) From: Markus Frank To: pve-devel@lists.proxmox.com Date: Wed, 9 Aug 2023 10:37:34 +0200 Message-Id: <20230809083739.100024-7-m.frank@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230809083739.100024-1-m.frank@proxmox.com> References: <20230809083739.100024-1-m.frank@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.056 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH qemu-server v7 6/11] check_local_resources: virtiofs 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: , X-List-Received-Date: Wed, 09 Aug 2023 08:38:06 -0000 add dir mapping checks to check_local_resources Signed-off-by: Markus Frank --- PVE/QemuServer.pm | 10 +++++++++- test/MigrationTest/Shared.pm | 7 +++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index d547dd6..e74d867 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -2723,6 +2723,7 @@ sub check_local_resources { my $nodelist = PVE::Cluster::get_nodelist(); my $pci_map = PVE::Mapping::PCI::config(); my $usb_map = PVE::Mapping::USB::config(); + my $dir_map = PVE::Mapping::Dir::config(); my $missing_mappings_by_node = { map { $_ => [] } @$nodelist }; @@ -2734,6 +2735,8 @@ sub check_local_resources { $entry = PVE::Mapping::PCI::get_node_mapping($pci_map, $id, $node); } elsif ($type eq 'usb') { $entry = PVE::Mapping::USB::get_node_mapping($usb_map, $id, $node); + } elsif ($type eq 'dir') { + $entry = PVE::Mapping::Dir::get_node_mapping($dir_map, $id, $node); } if (!scalar($entry->@*)) { push @{$missing_mappings_by_node->{$node}}, $key; @@ -2762,9 +2765,14 @@ sub check_local_resources { push @$mapped_res, $k; } } + if ($k =~ m/^virtiofs/) { + my $entry = parse_property_string('pve-qm-virtiofs', $conf->{$k}); + $add_missing_mapping->('dir', $k, $entry->{dirid}); + push @$mapped_res, $k; + } # sockets are safe: they will recreated be on the target side post-migrate next if $k =~ m/^serial/ && ($conf->{$k} eq 'socket'); - push @loc_res, $k if $k =~ m/^(usb|hostpci|serial|parallel)\d+$/; + push @loc_res, $k if $k =~ m/^(usb|hostpci|serial|parallel|virtiofs)\d+$/; } die "VM uses local resources\n" if scalar @loc_res && !$noerr; diff --git a/test/MigrationTest/Shared.pm b/test/MigrationTest/Shared.pm index aa7203d..c5d0722 100644 --- a/test/MigrationTest/Shared.pm +++ b/test/MigrationTest/Shared.pm @@ -90,6 +90,13 @@ $mapping_pci_module->mock( }, ); +our $mapping_dir_module = Test::MockModule->new("PVE::Mapping::Dir"); +$mapping_dir_module->mock( + config => sub { + return {}; + }, +); + our $ha_config_module = Test::MockModule->new("PVE::HA::Config"); $ha_config_module->mock( vm_is_ha_managed => sub { -- 2.39.2