On 1/12/25 03:10, Laine Stump wrote: > Since we previously only supported vlan tagging for interfaces > connected to an OVS bridge [*], the code in qemuChangeNet() (used by > the update-device API) assumed an interface with modified vlan config > was on an OVS bridge, and would call the OVS-specific > virNetDevOpenvswitchUpdateVlan(). > > Now that we support vlan tagging for interfaces connected to a > standard Linux host bridge, we must check the type of connection and > only call the OVS function when connected to an OVS bridge *both > before and after the update*. Otherwise we just set the flag to > re-connect to the bridge, which has the side effect of redoing the > vlan setup. > > ([*] or an SRIOV VF assigned using VFIO, but we don't support *any > runtime changes to that type of netdev so it's irrelevant here.) > > Signed-off-by: Laine Stump <laine@xxxxxxxxxx> > --- > > I'm fine with this going in either before or after the 11.0.0 release > (would prefer before since it is a bugfix), but if it's going into the > release I'd rather it be included with RC2 rather than only in the > final release. For that reason, if someone ACKs the patch and agrees > that it's safe to go in, please push it for me (since Jiri will almost > certainly tag RC2 before I'm conscious on Monday morning) > > src/qemu/qemu_hotplug.c | 32 ++++++++++++++++++++++++-------- > 1 file changed, 24 insertions(+), 8 deletions(-) Reviewed-by: Michal Privoznik <mprivozn@xxxxxxxxxx> and I agree this is safe for freeze. So I've merged it. Michal
