From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 9F8808B3A8 for ; Wed, 24 Aug 2022 18:26:47 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9D56B1C665 for ; Wed, 24 Aug 2022 18:26:47 +0200 (CEST) Received: from bastionodiso.odiso.net (bastionodiso.odiso.net [185.151.191.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 24 Aug 2022 18:26:45 +0200 (CEST) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id 45E3311437; Wed, 24 Aug 2022 18:26:45 +0200 (CEST) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 44E7018B087; Wed, 24 Aug 2022 18:26:45 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Wed, 24 Aug 2022 18:26:43 +0200 Message-Id: <20220824162644.1632804-5-aderumier@odiso.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220824162644.1632804-1-aderumier@odiso.com> References: <20220824162644.1632804-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.096 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% HEADER_FROM_DIFFERENT_DOMAINS 0.249 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods NO_DNS_FOR_FROM 0.001 Envelope sender has no MX or A DNS records SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH V3 qemu-server 2/3] vm_start/vm_resume : add_nets_bridge_fdb X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Aug 2022 16:26:47 -0000 on vm start (no live migration), we can simply add mac address in fdb. In case of a live migration, we add the mac address just before the resume. Signed-off-by: Alexandre Derumier --- PVE/QemuServer.pm | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 0114d06..6d71006 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -5797,6 +5797,7 @@ sub vm_start_nolock { my $nicconf = parse_net($conf->{$opt}); qemu_set_link_status($vmid, $opt, 0) if $nicconf->{link_down}; } + add_nets_bridge_fdb($conf, $vmid); } mon_cmd($vmid, 'qom-set', @@ -6155,6 +6156,7 @@ sub vm_resume { my $res = mon_cmd($vmid, 'query-status'); my $resume_cmd = 'cont'; my $reset = 0; + my $conf = PVE::QemuConfig->load_config($vmid); if ($res->{status}) { return if $res->{status} eq 'running'; # job done, go home @@ -6164,8 +6166,6 @@ sub vm_resume { if (!$nocheck) { - my $conf = PVE::QemuConfig->load_config($vmid); - PVE::QemuConfig->check_lock($conf) if !($skiplock || PVE::QemuConfig->has_lock($conf, 'backup')); } @@ -6175,6 +6175,9 @@ sub vm_resume { # request before the backup finishes for example mon_cmd($vmid, "system_reset"); } + + add_nets_bridge_fdb($conf, $vmid) if $resume_cmd eq 'cont'; + mon_cmd($vmid, $resume_cmd); }); } @@ -8237,4 +8240,22 @@ sub check_volume_storage_type { return 1; } +sub add_nets_bridge_fdb { + my ($conf, $vmid) = @_; + + foreach my $opt (keys %$conf) { + if ($opt =~ m/^net(\d+)$/) { + my $net = parse_net($conf->{$opt}); + next if !$net; + next if !$net->{macaddr}; + + my $iface = "tap${vmid}i$1"; + if ($have_sdn) { + PVE::Network::SDN::Zones::add_bridge_fdb($iface, $net->{macaddr}, $net->{bridge}, $net->{firewall}); + } else { + PVE::Network::add_bridge_fdb($iface, $net->{macaddr}, $net->{firewall}); + } + } + } +} 1; -- 2.30.2