proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-08-13 01:04:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix #5619: honor link-down setting when hot-plugging NIC

Browse Source 
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 <s.hanreich@proxmox.com>
Reviewed-by: Fiona Ebner <f.ebner@proxmox.com>
This commit is contained in:
Stefan Hanreich 2024-07-23 16:24:07 +02:00 committed by Thomas Lamprecht
parent a38204c14b
commit feedc2f48e
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
PVE/QemuServer.pm
View File

@ -5340,20 +5340,18 @@ sub vmconfig_update_net {
PVE::Network::tap_plug($iface, $newnet->{bridge}, $newnet->{tag}, $newnet->{firewall}, $newnet->{trunks}, $newnet->{rate}); 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})) { } elsif (safe_num_ne($oldnet->{rate}, $newnet->{rate})) {
# Rate can be applied on its own but any change above needs to # Rate can be applied on its own but any change above needs to
# include the rate in tap_plug since OVS resets everything. # include the rate in tap_plug since OVS resets everything.
PVE::Network::tap_rate_limit($iface, $newnet->{rate}); 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}); qemu_set_link_status($vmid, $opt, !$newnet->{link_down});
} }