Am 19.04.24 um 14:45 schrieb Dominik Csapak:
> They have to be marked as 'live-migration-capable' in the mapping
> config, and the driver and qemu must support it.
>
> For the gui checks, we now return the whole object of the mapped
> resources, which includes info like the name and if it's marked as
> live-migration capable. (while deprecating the old 'mapped-resource'
> return value, since that returns strictly less information)
>
> Signed-off-by: Dominik Csapak <d.csa...@proxmox.com>
> ---
> PVE/API2/Qemu.pm | 7 ++++++-
> PVE/QemuMigrate.pm | 13 +++++++++----
> 2 files changed, 15 insertions(+), 5 deletions(-)
>
> diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
> index f2fa345d..f95d8d95 100644
> --- a/PVE/API2/Qemu.pm
> +++ b/PVE/API2/Qemu.pm
> @@ -4473,7 +4473,11 @@ __PACKAGE__->register_method({
> },
> 'mapped-resources' => {
> type => 'array',
> - description => "List of mapped resources e.g. pci, usb"
> + description => "List of mapped resources e.g. pci, usb.
> Deprecated, use 'mapped-resource-info' instead."
> + },
Please add a comment to remind us to remove it in PVE 9
> + 'mapped-resource-info' => {
> + type => 'object',
> + description => "Object of mapped resources with additional
> information such if they're live migratable.",
> },
> },
> },
> @@ -4539,6 +4543,7 @@ __PACKAGE__->register_method({
>
> $res->{local_resources} = $local_resources;
> $res->{'mapped-resources'} = [ keys $mapped_resources->%* ];
> + $res->{'mapped-resource-info'} = $mapped_resources;
>
> return $res;
>
> diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm
> index a46eb2a3..89caefc7 100644
> --- a/PVE/QemuMigrate.pm
> +++ b/PVE/QemuMigrate.pm
> @@ -247,11 +247,16 @@ sub prepare {
>
> if (scalar(keys $mapped_res->%*)) {
> my $missing_mappings = $missing_mappings_by_node->{$self->{node}};
> - my $mapped_text = join(", ", keys $mapped_res->%*);
> - if ($running) {
> - die "can't migrate running VM which uses mapped devices:
> $mapped_text\n";
> - } elsif (scalar($missing_mappings->@*)) {
> + my $missing_live_mappings = [];
> + for my $key (keys $mapped_res->%*) {
Maybe sort
> + my $res = $mapped_res->{$key};
> + my $name = "$key:$res->{name}";
> + push $missing_live_mappings->@*, $name if !$res->{'live-migration'};
> + }
> + if (scalar($missing_mappings->@*)) {
> die "can't migrate to '$self->{node}': missing mapped devices " .
> join(", ", $missing_mappings->@*) . "\n";
> + } elsif ($running && scalar($missing_live_mappings->@*)) {
> + die "can't live migrate running VM which uses following mapped
> devices: " . join(", ", $missing_live_mappings->@*) . "\n";
Style nit: line too long
> } else {
> $self->log('info', "migrating VM which uses mapped local devices");
> }
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
