[pve-devel] [PATCH qemu-server v14 6/12] migration: check_local_resources for virtiofs

[Fabian Grünbichler]

On March 4, 2025 12:57 pm, Markus Frank wrote:
> add dir mapping checks to check_local_resources
> 
> Since the VM needs to be powered off for migration, migration should
> work with a directory on shared storage with all caching settings.
> 
> Signed-off-by: Markus Frank <m.frank at proxmox.com>
> Reviewed-by: Fiona Ebner <f.ebner at proxmox.com>
> ---
> v14:
> * nothing changed
> 
>  PVE/QemuServer.pm            | 12 +++++++++++-
>  test/MigrationTest/Shared.pm |  7 +++++++
>  2 files changed, 18 insertions(+), 1 deletion(-)
> 
> diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
> index 748b0acf..648b28cd 100644
> --- a/PVE/QemuServer.pm
> +++ b/PVE/QemuServer.pm
> @@ -2486,6 +2486,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 };
>  
> @@ -2497,6 +2498,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;
> @@ -2525,9 +2528,16 @@ sub check_local_resources {
>  		push @$mapped_res, $k;
>  	    }
>  	}
> +	if ($k =~ m/^virtiofs/) {
> +	    my $entry = parse_property_string('pve-qm-virtiofs', $conf->{$k});
> +	    if ($entry->{dirid}) {

dirid is not optional?

> +		$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 aa7203d1..c5d07222 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.5
> 
> 
> 
> _______________________________________________
> pve-devel mailing list
> pve-devel at lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
> 
> 
>