From e039ebe6dc8a2562bfb2c228812f4bc555c862e3e4cc9a59b978f9bad3ef3c80 Mon Sep 17 00:00:00 2001 From: James Fehlig Date: Thu, 15 Aug 2019 23:07:23 +0000 Subject: [PATCH] Accepting request 723837 from home:mwilck:branches:Virtualization - network: fix ability to use openvswitch with vlans (bsc#1145651) - Added patch: 93c1d5fe-network-fix-ability-to-use-openvswitch-with-vlans.patch OBS-URL: https://build.opensuse.org/request/show/723837 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=771 --- ...bility-to-use-openvswitch-with-vlans.patch | 39 +++++++++++++++++++ libvirt.changes | 7 ++++ libvirt.spec | 2 + 3 files changed, 48 insertions(+) create mode 100644 93c1d5fe-network-fix-ability-to-use-openvswitch-with-vlans.patch diff --git a/93c1d5fe-network-fix-ability-to-use-openvswitch-with-vlans.patch b/93c1d5fe-network-fix-ability-to-use-openvswitch-with-vlans.patch new file mode 100644 index 0000000..47a1115 --- /dev/null +++ b/93c1d5fe-network-fix-ability-to-use-openvswitch-with-vlans.patch @@ -0,0 +1,39 @@ +From 93c1d5fe7bb7a62ef884eb41b505b2809d1704b6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= +Date: Thu, 8 Aug 2019 13:42:24 +0100 +Subject: [PATCH] network: fix ability to use openvswitch with vlans +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Use the correct enum constant when validating vlan usage. +This fixes a merge error in + + commit 6cb0ec48bd95c95489a987e05a88e8bcf1f9109c + Author: Daniel P. Berrangé + Date: Mon Sep 3 17:34:22 2018 +0100 + + network: convert networkAllocateActualDevice to virNetworkPortDef + +Reviewed-by: Michal Privoznik +Signed-off-by: Daniel P. Berrangé +--- + src/network/bridge_driver.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c +index 41fa89a..72e1186 100644 +--- a/src/network/bridge_driver.c ++++ b/src/network/bridge_driver.c +@@ -4814,7 +4814,7 @@ networkAllocatePort(virNetworkObjPtr obj, + if (!(port->plugtype == VIR_NETWORK_PORT_PLUG_TYPE_HOSTDEV_PCI || + (port->plugtype == VIR_NETWORK_PORT_PLUG_TYPE_DIRECT && + port->plug.direct.mode == VIR_NETDEV_MACVLAN_MODE_PASSTHRU) || +- (port->plugtype == VIR_DOMAIN_NET_TYPE_BRIDGE && ++ (port->plugtype == VIR_NETWORK_PORT_PLUG_TYPE_BRIDGE && + port->virtPortProfile && + port->virtPortProfile->virtPortType == VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH))) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, +-- +2.22.0 + diff --git a/libvirt.changes b/libvirt.changes index e31a8f1..6c89d43 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Aug 15 19:54:20 UTC 2019 - Martin Wilck + +- network: fix ability to use openvswitch with vlans (bsc#1145651) + - Added patch: + 93c1d5fe-network-fix-ability-to-use-openvswitch-with-vlans.patch + ------------------------------------------------------------------- Mon Aug 5 19:24:35 UTC 2019 - James Fehlig diff --git a/libvirt.spec b/libvirt.spec index 6c45116..f565ece 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -337,6 +337,7 @@ Source6: libvirtd-relocation-server.xml Source99: baselibs.conf Source100: %{name}-rpmlintrc # Upstream patches +Patch0: 93c1d5fe-network-fix-ability-to-use-openvswitch-with-vlans.patch # Patches pending upstream review Patch100: libxl-dom-reset.patch Patch101: network-don-t-use-dhcp-authoritative-on-static-netwo.patch @@ -869,6 +870,7 @@ libvirt plugin for NSS for translating domain names into IP addresses. %prep %setup -q +%patch0 -p1 %patch100 -p1 %patch101 -p1 %patch150 -p1