External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu: don't reject interface update when switching to/from bridged network

Browse Source 
If virDomainUpdateDeviceFlags() was used to update an <interface>, and
the interface type changed from type='network' where the network was
an unmanaged bridge (so actualType == bridge) to type='bridge'
(i.e. actualType *also* == bridge), the update would fail due to the
perceived change in type.

In practice it is okay to switch between any interface types that end
up using a tap device, since libvirt just needs to attach the device
to a new bridge. But in this case we were erroneously rejecting it due
to a conditional that was too restrictive. This is what the code was doing:

  if (old->type != new->type)
     [allow update]
  else
     if ((oldActual == bridge and newActual == network)
         || (oldActual == network and newActual == bridge)) {
         [allow update]
     else
         [error]

In the case described above though, old->type and new->type don't match,
but oldActual and newActual are both 'bridge', so we get an error.

This patch changes the inner conditional so that any combination of
'network' and 'bridge' for oldActual and newActual, since they both
use a tap device connected to a bridge.

Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Laine Stump 2020-05-28 18:04:24 -04:00
parent dc9692dcdc
commit bc85c34ea9
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/qemu/qemu_hotplug.c
View File

@ -3770,15 +3770,15 @@ qemuDomainChangeNet(virQEMUDriverPtr driver,
* where this can only require a minor (or even no) change, * where this can only require a minor (or even no) change,
* but in most cases we need to do a full reconnection. * but in most cases we need to do a full reconnection.
* *
* If we switch (in either direction) between type='bridge' * As long as both the new and old types use a tap device
* and type='network' (for a traditional managed virtual * connected to a host bridge (ie VIR_DOMAIN_NET_TYPE_NETWORK
* network that uses a host bridge, i.e. forward * or VIR_DOMAIN_NET_TYPE_BRIDGE), we just need to connect to
* mode='route|nat'), we just need to change the bridge. * the new bridge.
*/ */
if ((oldType == VIR_DOMAIN_NET_TYPE_NETWORK && if ((oldType == VIR_DOMAIN_NET_TYPE_NETWORK ||
newType == VIR_DOMAIN_NET_TYPE_BRIDGE) || oldType == VIR_DOMAIN_NET_TYPE_BRIDGE) &&
(oldType == VIR_DOMAIN_NET_TYPE_BRIDGE && (newType == VIR_DOMAIN_NET_TYPE_NETWORK ||
newType == VIR_DOMAIN_NET_TYPE_NETWORK)) { newType == VIR_DOMAIN_NET_TYPE_BRIDGE)) {
needBridgeChange = true; needBridgeChange = true;