From nobody Sun May 5 18:24:07 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1556627958; cv=none; d=zoho.com; s=zohoarc; b=HUIqbiAAvMXfElIG1HAq+YVTSqEdv4gQ9C6SB/qBrY6CTAhof3zdvvVqy+lDofwEUrFwMgXRql/NH4yldzCFzqs3IMYPMsAXm6ZOIoxZfV8qp4P+wMgyaOXQmF+W9hqWkUBGDz/HT4gheou8WiKlN6ftC4DpqE/vUOLZBmBf5bw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556627958; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=tsEajHKGIyc93svCTfYyJ6Mq2vninMZKNeBNO3h8+4Q=; b=iNRv9L4OVOnVXHMythUECpZQItb/jISJW7WgeDu1ONSOCLSXtZhsKi1kDa8cuBFk8FFkckgjtPYvzkX/x+zNBCd1Urdysjs4MHb+g+8ttqV+2eZBbgMdtPzus0i6kv1q4VcPBJ4oevDv8t3ewHwRoGnLBolZloTCrbFJaRPK/54= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1556627958713790.1031245937495; Tue, 30 Apr 2019 05:39:18 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2C3C43082163; Tue, 30 Apr 2019 12:39:16 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 03F202B3AB; Tue, 30 Apr 2019 12:39:16 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 6346165D14; Tue, 30 Apr 2019 12:39:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x3UCavJk001359 for ; Tue, 30 Apr 2019 08:36:57 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7119F6D81B; Tue, 30 Apr 2019 12:36:57 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.42.22.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id 83E586D0BE; Tue, 30 Apr 2019 12:36:56 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Tue, 30 Apr 2019 13:36:46 +0100 Message-Id: <20190430123647.31155-2-berrange@redhat.com> In-Reply-To: <20190430123647.31155-1-berrange@redhat.com> References: <20190430123647.31155-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/2] Revert "virt drivers: don't handle type=network after resolving actual network type" X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Tue, 30 Apr 2019 12:39:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" 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=3Dnetwork for actual= NIC type")); - goto cleanup; + { + if (!(conn =3D virConnectOpen("xen:///system"))) + goto cleanup; + + if (!(network =3D + virNetworkLookupByName(conn, l_nic->data.network.name)))= { + goto cleanup; + } + + if (l_nic->guestIP.nips > 0) { + x_nic->ip =3D xenMakeIPList(&l_nic->guestIP); + if (!x_nic->ip) + goto cleanup; + } =20 + if (!(x_nic->bridge =3D 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 =3D virDomainNetGetActualType(net); =20 switch (actualType) { - case VIR_DOMAIN_NET_TYPE_BRIDGE: { + case VIR_DOMAIN_NET_TYPE_BRIDGE: + case VIR_DOMAIN_NET_TYPE_NETWORK: { const char *brname =3D virDomainNetGetActualBridgeName(net); if (!brname) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -3866,10 +3867,6 @@ lxcDomainAttachDeviceNetLive(virConnectPtr conn, if (!(veth =3D virLXCProcessSetupInterfaceDirect(conn, vm->def, ne= t))) goto cleanup; } break; - case VIR_DOMAIN_NET_TYPE_NETWORK: - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unexpectedly found type=3Dnetwork 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; =20 - 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, =20 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; =20 - case VIR_DOMAIN_NET_TYPE_NETWORK: - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unexpectedly found type=3Dnetwork 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, } =20 switch (actualType) { + case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_BRIDGE: tapfdSize =3D net->driver.virtio.queues; if (!tapfdSize) @@ -8874,11 +8875,6 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr drive= r, =20 break; =20 - case VIR_DOMAIN_NET_TYPE_NETWORK: - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unexpectedly found type=3Dnetwork 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; } =20 - 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, =20 switch (actualType) { case VIR_DOMAIN_NET_TYPE_BRIDGE: + case VIR_DOMAIN_NET_TYPE_NETWORK: tapfdSize =3D vhostfdSize =3D net->driver.virtio.queues; if (!tapfdSize) tapfdSize =3D vhostfdSize =3D 1; @@ -1541,11 +1542,6 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, /* No preparation needed. */ break; =20 - case VIR_DOMAIN_NET_TYPE_NETWORK: - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unexpectedly found type=3Dnetwork 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=3Dnetwork 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) =20 switch (actualType) { case VIR_DOMAIN_NET_TYPE_BRIDGE: + case VIR_DOMAIN_NET_TYPE_NETWORK: if (virDomainNetGetActualBridgeMACTableManager(net) =3D=3D VIR_NETWORK_BRIDGE_MAC_TABLE_MANAGER_LIBVIRT) { /* libvirt is managing the FDB of the bridge this device @@ -110,11 +111,6 @@ qemuInterfaceStartDevice(virDomainNetDefPtr net) =20 break; =20 - case VIR_DOMAIN_NET_TYPE_NETWORK: - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unexpectedly found type=3Dnetwork 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) =20 switch (actualType) { case VIR_DOMAIN_NET_TYPE_BRIDGE: + case VIR_DOMAIN_NET_TYPE_NETWORK: if (virDomainNetGetActualBridgeMACTableManager(net) =3D=3D VIR_NETWORK_BRIDGE_MAC_TABLE_MANAGER_LIBVIRT) { /* remove the FDB entries that were added during @@ -201,11 +198,6 @@ qemuInterfaceStopDevice(virDomainNetDefPtr net) break; } =20 - case VIR_DOMAIN_NET_TYPE_NETWORK: - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unexpectedly found type=3Dnetwork 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 =3D=3D VIR_NETDEV_VPORT_PRO= FILE_OPENVSWITCH)) ignore_value(virNetDevTapDelete(net->ifname, net->backend.= tap)); #endif break; - case VIR_DOMAIN_NET_TYPE_NETWORK: - VIR_WARN("Unexpectedly found type=3Dnetwork for actual NIC typ= e"); - break; - case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_VHOSTUSER: case VIR_DOMAIN_NET_TYPE_SERVER: --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 18:24:07 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1556627966; cv=none; d=zoho.com; s=zohoarc; b=dwck4Evo1uPiFVpvlF4eFW/CznQRL1NOFzFZXE2k/xh6/TdVb9xalLXozZR138XksAIai0b1r2bGZ8mie3Pm2RcPQ2dAapeRZdi447iUI7CKRWHBpBveXQeLfqnxQxLMxMxj5w+qKOr842t4qA0PxsgXCJV6x8EYCsbobvKAIBA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556627966; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=qSwXFu8a5TxWI/fosn/2G4G6iQ0vePqOsfVyzEg0MKE=; b=K/VbWC7BCCzYkmra/v4DaRL0Bl3ZyGRhUIbr23IsmUABtFMdzOxvOi/A6OBxcZbUJBnTGdnmU7FuNF1Lr4I6eeCZ+L3f2BGEE3KcDGGAroX9Uxysc4FwcEQCIJh0ANmCR11gGl2OmkTA0G5TaC4ahyux9XBAN0V4DeSEUho8xqA= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1556627966734670.6008197071451; Tue, 30 Apr 2019 05:39:26 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8F2B181E14; Tue, 30 Apr 2019 12:39:24 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 694CF78DEC; Tue, 30 Apr 2019 12:39:24 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 2B1D918089D3; Tue, 30 Apr 2019 12:39:24 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x3UCaxXC001375 for ; Tue, 30 Apr 2019 08:36:59 -0400 Received: by smtp.corp.redhat.com (Postfix) id CD5066D0BE; Tue, 30 Apr 2019 12:36:59 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.42.22.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5F5006DA87; Tue, 30 Apr 2019 12:36:57 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Tue, 30 Apr 2019 13:36:47 +0100 Message-Id: <20190430123647.31155-3-berrange@redhat.com> In-Reply-To: <20190430123647.31155-1-berrange@redhat.com> References: <20190430123647.31155-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/2] Revert "network: use 'bridge' as actual type instead of 'network'" X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 30 Apr 2019 12:39:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" 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; } =20 - /* Older libvirtd uses actualType=3D=3Dnetwork, but we now - * just use actualType=3D=3Dbridge, as nothing needs to - * distinguish the two cases, and this simplifies virt - * drive code */ - if (net->type =3D=3D VIR_DOMAIN_NET_TYPE_NETWORK && - net->data.network.actual !=3D NULL && - net->data.network.actual->type =3D=3D 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 =3D VIR_DOMAIN_NET_TYPE_BRIDGE; - } - return 0; } =20 @@ -11281,21 +11268,11 @@ virDomainActualNetDefParseXML(xmlNodePtr node, } =20 bandwidth_node =3D virXPathNode("./bandwidth", ctxt); - if (bandwidth_node) { - /* type =3D=3D 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 =3D=3D NETWORK - */ - bool allowFloor =3D - (actual->type =3D=3D VIR_DOMAIN_NET_TYPE_NETWORK) || - (actual->type =3D=3D VIR_DOMAIN_NET_TYPE_BRIDGE && - actual->data.bridge.brname !=3D NULL); - if (virNetDevBandwidthParse(&actual->bandwidth, - bandwidth_node, - allowFloor) < 0) - goto error; - } + if (bandwidth_node && + virNetDevBandwidthParse(&actual->bandwidth, + bandwidth_node, + actual->type =3D=3D VIR_DOMAIN_NET_TYPE_NE= TWORK) < 0) + goto error; =20 vlanNode =3D 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 =3D 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 =3D VIR_DOMAIN_NET_TYPE_NETWORK; =20 /* 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 ifac= e, virNetDevBandwidthPtr ifaceBand; unsigned long long old_floor, new_floor; =20 - if (virDomainNetGetActualType(iface) !=3D VIR_DOMAIN_NET_TYPE_BRIDGE || - iface->data.network.actual->data.bridge.brname =3D=3D NULL) { + if (virDomainNetGetActualType(iface) !=3D VIR_DOMAIN_NET_TYPE_NETWORK = && + (virDomainNetGetActualType(iface) !=3D VIR_DOMAIN_NET_TYPE_BRIDGE = || + iface->data.network.actual->data.bridge.brname =3D=3D 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 drive= r, syncNicRxFilterDeviceOptions(def->ifname, guestFilter, hostFilter); } =20 - if (virDomainNetGetActualType(def) =3D=3D VIR_DOMAIN_NET_TYPE_BRIDGE) { + if (virDomainNetGetActualType(def) =3D=3D VIR_DOMAIN_NET_TYPE_NETWORK)= { const char *brname =3D virDomainNetGetActualBridgeName(def); =20 /* For libivrt network connections, set the following TUN/TAP netw= ork diff --git a/tests/qemustatusxml2xmldata/disk-secinfo-upgrade-out.xml b/tes= ts/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 @@ - + 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 @@ - + 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 @@ - + diff --git a/tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml b/te= sts/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 @@ - + diff --git a/tests/qemustatusxml2xmldata/migration-out-params-in.xml b/test= s/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 @@ - + diff --git a/tests/qemustatusxml2xmldata/modern-in.xml b/tests/qemustatusxm= l2xmldata/modern-in.xml index f0afbff3c4..08f7f40761 100644 --- a/tests/qemustatusxml2xmldata/modern-in.xml +++ b/tests/qemustatusxml2xmldata/modern-in.xml @@ -390,7 +390,7 @@ - + --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list