[PATCH qemu-server v2 10/11] network: sdn: push the DHCP mappings of a guest when it resumes

[Hannes Laimer <h.laimer@proxmox.com>]

A mapping edit updates the reservation on the guest's node, taken
from the vmlist, which names the source of a live migration until
the config moves at its end. An edit in that window went to the
source, while the target kept the record it started with.

Every resume now pushes the current mapping of each NIC first. The
last step of a migration resumes the target after the config moved,
so the target catches up there, or at the later resume of a guest
the migration left paused.

Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
---
 src/PVE/QemuServer/Network.pm  | 14 ++++++++++++++
 src/PVE/QemuServer/RunState.pm |  2 ++
 2 files changed, 16 insertions(+)

diff --git a/src/PVE/QemuServer/Network.pm b/src/PVE/QemuServer/Network.pm
index b4893c015646..88a2290672e6 100644
--- a/src/PVE/QemuServer/Network.pm
+++ b/src/PVE/QemuServer/Network.pm
@@ -272,6 +272,20 @@ sub add_random_macs {
     }
 }
 
+# an edit made while the guest migrated went to the source, which the vmlist
+# still named. Every resume pushes the current mapping of each NIC, so the
+# target catches up
+sub add_nets_dhcp_mapping {
+    my ($conf) = @_;
+
+    for my $opt (keys %$conf) {
+        next if $opt !~ m/^net\d+$/;
+        my $net = parse_net($conf->{$opt}, 1) or next;
+        next if !$net->{bridge} || !$net->{macaddr};
+        PVE::Network::SDN::Dhcp::update_mapping($net->{bridge}, $net->{macaddr});
+    }
+}
+
 sub add_nets_bridge_fdb {
     my ($conf, $vmid) = @_;
 
diff --git a/src/PVE/QemuServer/RunState.pm b/src/PVE/QemuServer/RunState.pm
index 889ddd28287b..828d79159e90 100644
--- a/src/PVE/QemuServer/RunState.pm
+++ b/src/PVE/QemuServer/RunState.pm
@@ -181,6 +181,8 @@ sub vm_resume($vmid, $skiplock = undef, $nocheck = undef) {
 
             PVE::QemuServer::Network::add_nets_bridge_fdb($conf, $vmid)
                 if $resume_cmd eq 'cont';
+            PVE::QemuServer::Network::add_nets_dhcp_mapping($conf)
+                if $resume_cmd eq 'cont';
 
             mon_cmd($vmid, $resume_cmd);
         },
-- 
2.47.3