From cfddf59cee42a74f327b358a78c9663cd21364f0 Mon Sep 17 00:00:00 2001 From: Laine Stump Date: Tue, 23 Sep 2014 14:54:16 -0400 Subject: [PATCH] network: set interface actual trustGuestRxFilters from network/portgroup As is done with other items such as vlan, virtualport, and bandwidth, set the actual trustGuestRxFilters value to be used by a domain interface according to a merge of the same attribute in the interface, portgroup, and network in use. the interface setting always takes precedence (if specified), followed by portgroup, and finally the setting in the network is used if it's not specified in the interface or portgroup. --- src/network/bridge_driver.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 979fb13247..5f2e7780bf 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -3794,6 +3794,16 @@ networkAllocateActualDevice(virDomainDefPtr dom, if (vlan && virNetDevVlanCopy(&iface->data.network.actual->vlan, vlan) < 0) goto error; + if (iface->trustGuestRxFilters) + iface->data.network.actual->trustGuestRxFilters + = iface->trustGuestRxFilters; + else if (portgroup && portgroup->trustGuestRxFilters) + iface->data.network.actual->trustGuestRxFilters + = portgroup->trustGuestRxFilters; + else if (netdef->trustGuestRxFilters) + iface->data.network.actual->trustGuestRxFilters + = netdef->trustGuestRxFilters; + if ((netdef->forward.type == VIR_NETWORK_FORWARD_NONE) || (netdef->forward.type == VIR_NETWORK_FORWARD_NAT) || (netdef->forward.type == VIR_NETWORK_FORWARD_ROUTE)) { -- 2.39.5