From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 133DC1FF2CA for ; Tue, 23 Jul 2024 16:23:39 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1646E518A; Tue, 23 Jul 2024 16:24:12 +0200 (CEST) From: Stefan Hanreich To: pve-devel@lists.proxmox.com Date: Tue, 23 Jul 2024 16:24:07 +0200 Message-Id: <20240723142407.159280-1-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.266 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [qemuserver.pm] Subject: [pve-devel] [PATCH qemu-server v2 1/1] fix #5619: honor link_down setting when hot-plugging nic 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" When detaching and attaching the network device on update, the link_down setting is not considered and the network device always gets attached to the guest - even if link_down is set. Fixes: 3f14f206 ("nic online bridge/vlan change: link disconnect/reconnect") Signed-off-by: Stefan Hanreich Reviewed-by: Fiona Ebner --- Changes from v1 -> v2: * Fixed trailers in commit message * Re-added comment describing the reason for setting link_down on changed bridge/tag Thanks @Fiona for your suggestions! PVE/QemuServer.pm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 88c274d..39d729c 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -5339,20 +5339,18 @@ sub vmconfig_update_net { PVE::Network::tap_plug($iface, $newnet->{bridge}, $newnet->{tag}, $newnet->{firewall}, $newnet->{trunks}, $newnet->{rate}); } - #set link_up in guest if bridge or vlan change to notify guest (dhcp renew for example) - if (safe_string_ne($oldnet->{bridge}, $newnet->{bridge}) || - safe_num_ne($oldnet->{tag}, $newnet->{tag}) - ) { - qemu_set_link_status($vmid, $opt, 1); - } - } elsif (safe_num_ne($oldnet->{rate}, $newnet->{rate})) { # Rate can be applied on its own but any change above needs to # include the rate in tap_plug since OVS resets everything. PVE::Network::tap_rate_limit($iface, $newnet->{rate}); } - if (safe_string_ne($oldnet->{link_down}, $newnet->{link_down})) { + # set link_down on changed bridge/tag as well, because we detach the + # network device in the section above if the bridge or tag changed + if (safe_string_ne($oldnet->{link_down}, $newnet->{link_down}) + || safe_string_ne($oldnet->{bridge}, $newnet->{bridge}) + || safe_num_ne($oldnet->{tag}, $newnet->{tag}) + ) { qemu_set_link_status($vmid, $opt, !$newnet->{link_down}); } -- 2.39.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel