From: Fiona Ebner <f.ebner@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
Stefan Hanreich <s.hanreich@proxmox.com>
Subject: Re: [pve-devel] [PATCH qemu-server 1/1] fix #5619: honor link_down setting when hot-plugging nic
Date: Tue, 23 Jul 2024 16:00:35 +0200 [thread overview]
Message-ID: <6201e0b2-4712-4ad0-8561-a33e970cd427@proxmox.com> (raw)
In-Reply-To: <20240723131409.132792-1-s.hanreich@proxmox.com>
Am 23.07.24 um 15:14 schrieb Stefan Hanreich:
> 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")
>
Please don't use newlines between trailers.
> Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
Reviewed-by: Fiona Ebner <f.ebner@proxmox.com>
> ---
> PVE/QemuServer.pm | 12 ++++--------
> 1 file changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
> index 88c274d..19e59a8 100644
> --- a/PVE/QemuServer.pm
> +++ b/PVE/QemuServer.pm
> @@ -5339,20 +5339,16 @@ 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)
I'd prefer to not remove the comment completely, but adapt and move it
to below. Then nobody needs to wonder why link status is set if only
bridge or tag changes 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})) {
> + 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});
> }
>
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
next prev parent reply other threads:[~2024-07-23 14:00 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-23 13:14 Stefan Hanreich
2024-07-23 14:00 ` Fiona Ebner [this message]
2024-07-23 14:14 ` Stefan Hanreich
2024-07-23 14:25 ` Stefan Hanreich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6201e0b2-4712-4ad0-8561-a33e970cd427@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
--cc=s.hanreich@proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox