The live-migration feature now works with qemu's upstream commit:
5d56bff11e ("ui/vdagent: add migration support")Signed-off-by: Markus Frank <[email protected]> --- src/PVE/API2/Qemu.pm | 5 ----- src/PVE/QemuMigrate.pm | 5 ----- src/PVE/QemuServer.pm | 2 +- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/PVE/API2/Qemu.pm b/src/PVE/API2/Qemu.pm index 02f5caec..314b6a48 100644 --- a/src/PVE/API2/Qemu.pm +++ b/src/PVE/API2/Qemu.pm @@ -5267,11 +5267,6 @@ __PACKAGE__->register_method({ my ($local_resources, $mapped_resources, $missing_mappings_by_node) = PVE::QemuMigrate::Helpers::check_local_resources($vmconf, $res->{running}, 1); - my $vga = PVE::QemuServer::parse_vga($vmconf->{vga}); - if ($res->{running} && $vga->{'clipboard'} && $vga->{'clipboard'} eq 'vnc') { - push $local_resources->@*, "clipboard=vnc"; - } - $res->{allowed_nodes} = []; $res->{not_allowed_nodes} = {}; diff --git a/src/PVE/QemuMigrate.pm b/src/PVE/QemuMigrate.pm index 6f7fd9f1..4f613ffb 100644 --- a/src/PVE/QemuMigrate.pm +++ b/src/PVE/QemuMigrate.pm @@ -293,11 +293,6 @@ sub prepare { } } - my $vga = PVE::QemuServer::parse_vga($conf->{vga}); - if ($running && $vga->{'clipboard'} && $vga->{'clipboard'} eq 'vnc') { - die "VMs with 'clipboard' set to 'vnc' are not live migratable!\n"; - } - my $vollist = PVE::QemuServer::get_vm_volumes($conf); my $storages = {}; diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm index 1b9257ef..6d33bec0 100644 --- a/src/PVE/QemuServer.pm +++ b/src/PVE/QemuServer.pm @@ -184,7 +184,7 @@ my $vga_fmt = { clipboard => { description => 'Enable a specific clipboard. If not set, depending on the display type the' - . ' SPICE one will be added. Migration with VNC clipboard is not yet supported!', + . ' SPICE one will be added.', type => 'string', enum => ['vnc'], optional => 1, -- 2.47.3 _______________________________________________ pve-devel mailing list [email protected] https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
