diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index e8de4eac..bef83df7 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -3568,14 +3568,9 @@ __PACKAGE__->register_method({ my $repl_conf = PVE::ReplicationConfig->new(); my $is_replicated = $repl_conf->check_for_existing_jobs($vmid, 1); my $is_replicated_to_target = defined($repl_conf->find_local_replication_job($vmid, $target)); - if ($is_replicated && !$is_replicated_to_target) { - if ($param->{force}) { - warn "WARNING: Node '$target' is not a replication target. Existing replication " . - "jobs will fail after migration!\n"; - } else { - die "Cannot live-migrate replicated VM to node '$target' - not a replication target." . - " Use 'force' to override.\n"; - } + if (!$param->{force} && $is_replicated && !$is_replicated_to_target) { + die "Cannot live-migrate replicated VM to node '$target' - not a replication " . + "target. Use 'force' to override.\n"; } } else { warn "VM isn't running. Doing offline migration instead.\n" if $param->{online}; diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm index 2f4eec33..a8bcd15f 100644 --- a/PVE/QemuMigrate.pm +++ b/PVE/QemuMigrate.pm @@ -227,6 +227,19 @@ sub prepare { die "can't migrate running VM without --online\n" if !$online; $running = $pid; + my $repl_conf = PVE::ReplicationConfig->new(); + my $is_replicated = $repl_conf->check_for_existing_jobs($vmid, 1); + my $is_replicated_to_target = defined($repl_conf->find_local_replication_job($vmid, $self->{node})); + if ($is_replicated && !$is_replicated_to_target) { + if ($self->{opts}->{force}) { + $self->log('warn', "WARNING: Node '$self->{node}' is not a replication target. Existing " . + "replication jobs will fail after migration!\n"); + } else { + die "Cannot live-migrate replicated VM to node '$self->{node}' - not a replication " . + "target. Use 'force' to override.\n"; + } + } + $self->{forcemachine} = PVE::QemuServer::Machine::qemu_machine_pxe($vmid, $conf); # To support custom CPU types, we keep QEMU's "-cpu" parameter intact.