[libvirt] [PATCH 0/2] Fix regression with network type handling
Problems pointed out at https://www.redhat.com/archives/libvir-list/2019-April/msg01412.html It certainly isn't possible to fix these problems in time for release, and probably never. So reverting is best, probably only, option. Daniel P. Berrangé (2): Revert "virt drivers: don't handle type=network after resolving actual network type" Revert "network: use 'bridge' as actual type instead of 'network'" src/conf/domain_conf.c | 33 +++---------------- src/libxl/libxl_conf.c | 21 ++++++++++-- src/lxc/lxc_driver.c | 15 +++------ src/network/bridge_driver.c | 11 +++++-- src/qemu/qemu_command.c | 8 ++--- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_hotplug.c | 13 ++------ src/qemu/qemu_interface.c | 12 ++----- src/qemu/qemu_process.c | 5 +-- .../disk-secinfo-upgrade-out.xml | 2 +- .../migration-in-params-in.xml | 2 +- .../migration-out-nbd-out.xml | 2 +- .../migration-out-nbd-tls-out.xml | 2 +- .../migration-out-params-in.xml | 2 +- tests/qemustatusxml2xmldata/modern-in.xml | 2 +- 15 files changed, 49 insertions(+), 83 deletions(-) -- 2.20.1
This reverts commit 2f5e6502e34d9ddba596fa824b2f2f3504b34a99. --- src/libxl/libxl_conf.c | 21 ++++++++++++++++++--- src/lxc/lxc_driver.c | 15 ++++----------- src/qemu/qemu_command.c | 8 ++------ src/qemu/qemu_hotplug.c | 13 ++----------- src/qemu/qemu_interface.c | 12 ++---------- src/qemu/qemu_process.c | 5 +---- 6 files changed, 29 insertions(+), 45 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 315c14652b..766a726ebc 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1353,10 +1353,25 @@ libxlMakeNic(virDomainDefPtr def, } break; case VIR_DOMAIN_NET_TYPE_NETWORK: - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unexpectedly found type=network for actual NIC type")); - goto cleanup; + { + if (!(conn = virConnectOpen("xen:///system"))) + goto cleanup; + + if (!(network = + virNetworkLookupByName(conn, l_nic->data.network.name))) { + goto cleanup; + } + + if (l_nic->guestIP.nips > 0) { + x_nic->ip = xenMakeIPList(&l_nic->guestIP); + if (!x_nic->ip) + goto cleanup; + } + if (!(x_nic->bridge = virNetworkGetBridgeName(network))) + goto cleanup; + break; + } case VIR_DOMAIN_NET_TYPE_VHOSTUSER: case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_SERVER: diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index fbdd33156a..1980d0804e 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -3848,7 +3848,8 @@ lxcDomainAttachDeviceNetLive(virConnectPtr conn, actualType = virDomainNetGetActualType(net); switch (actualType) { - case VIR_DOMAIN_NET_TYPE_BRIDGE: { + case VIR_DOMAIN_NET_TYPE_BRIDGE: + case VIR_DOMAIN_NET_TYPE_NETWORK: { const char *brname = virDomainNetGetActualBridgeName(net); if (!brname) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -3866,10 +3867,6 @@ lxcDomainAttachDeviceNetLive(virConnectPtr conn, if (!(veth = virLXCProcessSetupInterfaceDirect(conn, vm->def, net))) goto cleanup; } break; - case VIR_DOMAIN_NET_TYPE_NETWORK: - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unexpectedly found type=network for actual NIC type")); - goto cleanup; case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_VHOSTUSER: case VIR_DOMAIN_NET_TYPE_SERVER: @@ -3915,6 +3912,7 @@ lxcDomainAttachDeviceNetLive(virConnectPtr conn, } else if (veth) { switch (actualType) { case VIR_DOMAIN_NET_TYPE_BRIDGE: + case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_ETHERNET: ignore_value(virNetDevVethDelete(veth)); break; @@ -3923,7 +3921,6 @@ lxcDomainAttachDeviceNetLive(virConnectPtr conn, ignore_value(virNetDevMacVLanDelete(veth)); break; - case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_VHOSTUSER: case VIR_DOMAIN_NET_TYPE_SERVER: @@ -4355,6 +4352,7 @@ lxcDomainDetachDeviceNetLive(virDomainObjPtr vm, switch (actualType) { case VIR_DOMAIN_NET_TYPE_BRIDGE: + case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_ETHERNET: if (virNetDevVethDelete(detach->ifname) < 0) { virDomainAuditNet(vm, detach, NULL, "detach", false); @@ -4362,11 +4360,6 @@ lxcDomainDetachDeviceNetLive(virDomainObjPtr vm, } break; - case VIR_DOMAIN_NET_TYPE_NETWORK: - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unexpectedly found type=network for actual NIC type")); - goto cleanup; - /* It'd be nice to support this, but with macvlan * once assigned to a container nothing exists on * the host side. Further the container can change diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index bf1fb539b1..50b4205267 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8797,6 +8797,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, } switch (actualType) { + case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_BRIDGE: tapfdSize = net->driver.virtio.queues; if (!tapfdSize) @@ -8874,11 +8875,6 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, break; - case VIR_DOMAIN_NET_TYPE_NETWORK: - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unexpectedly found type=network for actual NIC type")); - goto cleanup; - case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_SERVER: case VIR_DOMAIN_NET_TYPE_CLIENT: @@ -8895,6 +8891,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, */ switch ((virDomainNetType)actualType) { case VIR_DOMAIN_NET_TYPE_ETHERNET: + case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_BRIDGE: case VIR_DOMAIN_NET_TYPE_DIRECT: { @@ -8912,7 +8909,6 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, break; } - case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_VHOSTUSER: case VIR_DOMAIN_NET_TYPE_SERVER: diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 630be12d54..e199368e8a 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1450,6 +1450,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, switch (actualType) { case VIR_DOMAIN_NET_TYPE_BRIDGE: + case VIR_DOMAIN_NET_TYPE_NETWORK: tapfdSize = vhostfdSize = net->driver.virtio.queues; if (!tapfdSize) tapfdSize = vhostfdSize = 1; @@ -1541,11 +1542,6 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, /* No preparation needed. */ break; - case VIR_DOMAIN_NET_TYPE_NETWORK: - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unexpectedly found type=network for actual NIC type")); - goto cleanup; - case VIR_DOMAIN_NET_TYPE_SERVER: case VIR_DOMAIN_NET_TYPE_CLIENT: case VIR_DOMAIN_NET_TYPE_MCAST: @@ -3666,13 +3662,8 @@ qemuDomainChangeNetFilter(virDomainObjPtr vm, switch (virDomainNetGetActualType(newdev)) { case VIR_DOMAIN_NET_TYPE_ETHERNET: case VIR_DOMAIN_NET_TYPE_BRIDGE: - break; - case VIR_DOMAIN_NET_TYPE_NETWORK: - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unexpectedly found type=network for actual NIC type")); - return -1; - + break; case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_VHOSTUSER: case VIR_DOMAIN_NET_TYPE_SERVER: diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c index 9bb0d70986..c8effa68f4 100644 --- a/src/qemu/qemu_interface.c +++ b/src/qemu/qemu_interface.c @@ -58,6 +58,7 @@ qemuInterfaceStartDevice(virDomainNetDefPtr net) switch (actualType) { case VIR_DOMAIN_NET_TYPE_BRIDGE: + case VIR_DOMAIN_NET_TYPE_NETWORK: if (virDomainNetGetActualBridgeMACTableManager(net) == VIR_NETWORK_BRIDGE_MAC_TABLE_MANAGER_LIBVIRT) { /* libvirt is managing the FDB of the bridge this device @@ -110,11 +111,6 @@ qemuInterfaceStartDevice(virDomainNetDefPtr net) break; - case VIR_DOMAIN_NET_TYPE_NETWORK: - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unexpectedly found type=network for actual NIC type")); - goto cleanup; - case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_VHOSTUSER: case VIR_DOMAIN_NET_TYPE_SERVER: @@ -168,6 +164,7 @@ qemuInterfaceStopDevice(virDomainNetDefPtr net) switch (actualType) { case VIR_DOMAIN_NET_TYPE_BRIDGE: + case VIR_DOMAIN_NET_TYPE_NETWORK: if (virDomainNetGetActualBridgeMACTableManager(net) == VIR_NETWORK_BRIDGE_MAC_TABLE_MANAGER_LIBVIRT) { /* remove the FDB entries that were added during @@ -201,11 +198,6 @@ qemuInterfaceStopDevice(virDomainNetDefPtr net) break; } - case VIR_DOMAIN_NET_TYPE_NETWORK: - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unexpectedly found type=network for actual NIC type")); - goto cleanup; - case VIR_DOMAIN_NET_TYPE_ETHERNET: case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_VHOSTUSER: diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 688e27ab72..90466771cd 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7302,15 +7302,12 @@ void qemuProcessStop(virQEMUDriverPtr driver, } break; case VIR_DOMAIN_NET_TYPE_BRIDGE: + case VIR_DOMAIN_NET_TYPE_NETWORK: #ifdef VIR_NETDEV_TAP_REQUIRE_MANUAL_CLEANUP if (!(vport && vport->virtPortType == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH)) ignore_value(virNetDevTapDelete(net->ifname, net->backend.tap)); #endif break; - case VIR_DOMAIN_NET_TYPE_NETWORK: - VIR_WARN("Unexpectedly found type=network for actual NIC type"); - break; - case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_VHOSTUSER: case VIR_DOMAIN_NET_TYPE_SERVER: -- 2.20.1
This caused the live XML to report the 'bridge' type instead of the 'network' type, which is a behavioural regression. It also breaks 'virsh domif-setlink', 'virsh update-device' and 'virsh domiftune' This reverts commit 518026e15959ab0e19b659a9f2ff502a54946498. --- src/conf/domain_conf.c | 33 +++---------------- src/network/bridge_driver.c | 11 +++++-- src/qemu/qemu_driver.c | 2 +- .../disk-secinfo-upgrade-out.xml | 2 +- .../migration-in-params-in.xml | 2 +- .../migration-out-nbd-out.xml | 2 +- .../migration-out-nbd-tls-out.xml | 2 +- .../migration-out-params-in.xml | 2 +- tests/qemustatusxml2xmldata/modern-in.xml | 2 +- 9 files changed, 20 insertions(+), 38 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6331424635..b4fb6cf981 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5128,19 +5128,6 @@ virDomainNetDefPostParse(virDomainNetDefPtr net) return -1; } - /* Older libvirtd uses actualType==network, but we now - * just use actualType==bridge, as nothing needs to - * distinguish the two cases, and this simplifies virt - * drive code */ - if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK && - net->data.network.actual != NULL && - net->data.network.actual->type == VIR_DOMAIN_NET_TYPE_NETWORK) { - char mac[VIR_MAC_STRING_BUFLEN]; - virMacAddrFormat(&net->mac, mac); - VIR_DEBUG("Updating NIC %s actual type to bridge", mac); - net->data.network.actual->type = VIR_DOMAIN_NET_TYPE_BRIDGE; - } - return 0; } @@ -11281,21 +11268,11 @@ virDomainActualNetDefParseXML(xmlNodePtr node, } bandwidth_node = virXPathNode("./bandwidth", ctxt); - if (bandwidth_node) { - /* type == NETWORK is legacy config, converted to BRIDGE - * in post-parse function, but this code runs before - * post-parse logic, so we must account for configs still - * using legacy type == NETWORK - */ - bool allowFloor = - (actual->type == VIR_DOMAIN_NET_TYPE_NETWORK) || - (actual->type == VIR_DOMAIN_NET_TYPE_BRIDGE && - actual->data.bridge.brname != NULL); - if (virNetDevBandwidthParse(&actual->bandwidth, - bandwidth_node, - allowFloor) < 0) - goto error; - } + if (bandwidth_node && + virNetDevBandwidthParse(&actual->bandwidth, + bandwidth_node, + actual->type == VIR_DOMAIN_NET_TYPE_NETWORK) < 0) + goto error; vlanNode = virXPathNode("./vlan", ctxt); if (vlanNode && virNetDevVlanParse(vlanNode, ctxt, &actual->vlan) < 0) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 77206b4584..26f7f80418 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -4489,7 +4489,11 @@ networkAllocateActualDevice(virNetworkPtr net, case VIR_NETWORK_FORWARD_NAT: case VIR_NETWORK_FORWARD_ROUTE: case VIR_NETWORK_FORWARD_OPEN: - iface->data.network.actual->type = VIR_DOMAIN_NET_TYPE_BRIDGE; + /* for these forward types, the actual net type really *is* + * NETWORK; we just keep the info from the portgroup in + * iface->data.network.actual + */ + iface->data.network.actual->type = VIR_DOMAIN_NET_TYPE_NETWORK; /* we also store the bridge device and macTableManager settings * in iface->data.network.actual->data.bridge for later use @@ -5433,8 +5437,9 @@ networkBandwidthGenericChecks(virDomainNetDefPtr iface, virNetDevBandwidthPtr ifaceBand; unsigned long long old_floor, new_floor; - if (virDomainNetGetActualType(iface) != VIR_DOMAIN_NET_TYPE_BRIDGE || - iface->data.network.actual->data.bridge.brname == NULL) { + if (virDomainNetGetActualType(iface) != VIR_DOMAIN_NET_TYPE_NETWORK && + (virDomainNetGetActualType(iface) != VIR_DOMAIN_NET_TYPE_BRIDGE || + iface->data.network.actual->data.bridge.brname == NULL)) { /* This is not an interface that's plugged into a network. * We don't care. Thus from our POV bandwidth change is allowed. */ return false; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index c072bed1ce..b2ac737d1f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4567,7 +4567,7 @@ processNicRxFilterChangedEvent(virQEMUDriverPtr driver, syncNicRxFilterDeviceOptions(def->ifname, guestFilter, hostFilter); } - if (virDomainNetGetActualType(def) == VIR_DOMAIN_NET_TYPE_BRIDGE) { + if (virDomainNetGetActualType(def) == VIR_DOMAIN_NET_TYPE_NETWORK) { const char *brname = virDomainNetGetActualBridgeName(def); /* For libivrt network connections, set the following TUN/TAP network diff --git a/tests/qemustatusxml2xmldata/disk-secinfo-upgrade-out.xml b/tests/qemustatusxml2xmldata/disk-secinfo-upgrade-out.xml index 2ff4e5249c..7a26e93aa4 100644 --- a/tests/qemustatusxml2xmldata/disk-secinfo-upgrade-out.xml +++ b/tests/qemustatusxml2xmldata/disk-secinfo-upgrade-out.xml @@ -458,7 +458,7 @@ <interface type='network'> <mac address='52:54:00:36:bd:3b'/> <source network='default'/> - <actual type='bridge'> + <actual type='network'> <source bridge='virbr0'/> </actual> <target dev='vnet0'/> diff --git a/tests/qemustatusxml2xmldata/migration-in-params-in.xml b/tests/qemustatusxml2xmldata/migration-in-params-in.xml index 2d72050782..03f18b4f3d 100644 --- a/tests/qemustatusxml2xmldata/migration-in-params-in.xml +++ b/tests/qemustatusxml2xmldata/migration-in-params-in.xml @@ -329,7 +329,7 @@ <interface type='network'> <mac address='52:54:00:59:59:91'/> <source network='default'/> - <actual type='bridge'> + <actual type='network'> <source bridge='virbr0'/> </actual> <target dev='vnet0'/> diff --git a/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml b/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml index b7b03c380a..315d8e4c1a 100644 --- a/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml +++ b/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml @@ -370,7 +370,7 @@ <interface type='network'> <mac address='52:54:00:36:bd:3b'/> <source network='default'/> - <actual type='bridge'> + <actual type='network'> <source bridge='virbr0'/> </actual> <target dev='vnet0'/> diff --git a/tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml b/tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml index ec79ef7304..869f37d488 100644 --- a/tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml +++ b/tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml @@ -407,7 +407,7 @@ <interface type='network'> <mac address='52:54:00:36:bd:3b'/> <source network='default'/> - <actual type='bridge'> + <actual type='network'> <source bridge='virbr0'/> </actual> <target dev='vnet0'/> diff --git a/tests/qemustatusxml2xmldata/migration-out-params-in.xml b/tests/qemustatusxml2xmldata/migration-out-params-in.xml index cdcde09fe8..ae2064830a 100644 --- a/tests/qemustatusxml2xmldata/migration-out-params-in.xml +++ b/tests/qemustatusxml2xmldata/migration-out-params-in.xml @@ -343,7 +343,7 @@ <interface type='network'> <mac address='52:54:00:59:59:91'/> <source network='default'/> - <actual type='bridge'> + <actual type='network'> <source bridge='virbr0'/> </actual> <target dev='vnet0'/> diff --git a/tests/qemustatusxml2xmldata/modern-in.xml b/tests/qemustatusxml2xmldata/modern-in.xml index f0afbff3c4..08f7f40761 100644 --- a/tests/qemustatusxml2xmldata/modern-in.xml +++ b/tests/qemustatusxml2xmldata/modern-in.xml @@ -390,7 +390,7 @@ <interface type='network'> <mac address='52:54:00:36:bd:3b'/> <source network='default'/> - <actual type='bridge'> + <actual type='network'> <source bridge='virbr0'/> </actual> <target dev='vnet0'/> -- 2.20.1
On 4/30/19 2:36 PM, Daniel P. Berrangé wrote:
Problems pointed out at
https://www.redhat.com/archives/libvir-list/2019-April/msg01412.html
It certainly isn't possible to fix these problems in time for release, and probably never. So reverting is best, probably only, option.
Daniel P. Berrangé (2): Revert "virt drivers: don't handle type=network after resolving actual network type" Revert "network: use 'bridge' as actual type instead of 'network'"
src/conf/domain_conf.c | 33 +++---------------- src/libxl/libxl_conf.c | 21 ++++++++++-- src/lxc/lxc_driver.c | 15 +++------ src/network/bridge_driver.c | 11 +++++-- src/qemu/qemu_command.c | 8 ++--- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_hotplug.c | 13 ++------ src/qemu/qemu_interface.c | 12 ++----- src/qemu/qemu_process.c | 5 +-- .../disk-secinfo-upgrade-out.xml | 2 +- .../migration-in-params-in.xml | 2 +- .../migration-out-nbd-out.xml | 2 +- .../migration-out-nbd-tls-out.xml | 2 +- .../migration-out-params-in.xml | 2 +- tests/qemustatusxml2xmldata/modern-in.xml | 2 +- 15 files changed, 49 insertions(+), 83 deletions(-)
ACK and safe for freeze. Michal
participants (2)
-
Daniel P. Berrangé -
Michal Privoznik