From nobody Fri Apr 19 20:30:17 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=1565268338; cv=none; d=zoho.com; s=zohoarc; b=LRXi7r7zntmX1K9KpNvyrM04OaYLPS1H664T/1UAHSBdvreugR9xVzUDAZ7Z+q620rlyyNWuLkwLn868WmmT1Cthwj19poQrI32AoRnQe9cdRzf2tfatuHQFNGNjed9AfqY/Lt/+MRGje+UqVeHtw1mIpe7RhrxN33b+te/FDQY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565268338; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=5XDWgbR7Q6NWlDkDIDIKKBhpCtWgSkemMAlMVgWF3bM=; b=GBrPHAoGbfZHJdoFlDKtiCb3x2uXQGe4qrThnXRVpxDYWG5kbuRIZLXxVgsvR74ivwtRLzYHCd/vdbhFWwBmMSEMwmvPsu6R5hwCmZXOWPH2ESGL5uVHJ+Jqp/ULqcnbKcQYh7aPpR9SJ/fyM4nOYuoKuhfAOnYUbNpIDy3Yzeg= 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 1565268338853451.5103857421042; Thu, 8 Aug 2019 05:45:38 -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 EA758ED24C; Thu, 8 Aug 2019 12:45:36 +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 067A460BE1; Thu, 8 Aug 2019 12:45:35 +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 7F42424F2F; Thu, 8 Aug 2019 12:45:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x78CjVnu030493 for ; Thu, 8 Aug 2019 08:45:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id D347F60BE1; Thu, 8 Aug 2019 12:45:31 +0000 (UTC) Received: from domokun.gsslab.fab.redhat.com (dhcp-94.gsslab.fab.redhat.com [10.33.9.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id 16C0360BEC; Thu, 8 Aug 2019 12:45:28 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Thu, 8 Aug 2019 13:45:24 +0100 Message-Id: <20190808124524.22545-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: Mathieu Bouillaguet Subject: [libvirt] [PATCH] network: fix ability to use openvswitch with vlans 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-Type: text/plain; charset="utf-8" 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.38]); Thu, 08 Aug 2019 12:45:37 +0000 (UTC) Use the correct enum constant when validating vlan usage. This fixes a merge error in commit 6cb0ec48bd95c95489a987e05a88e8bcf1f9109c Author: Daniel P. Berrang=C3=A9 Date: Mon Sep 3 17:34:22 2018 +0100 network: convert networkAllocateActualDevice to virNetworkPortDef Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Michal Privoznik --- 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 41fa89a4af..72e118643f 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -4814,7 +4814,7 @@ networkAllocatePort(virNetworkObjPtr obj, if (!(port->plugtype =3D=3D VIR_NETWORK_PORT_PLUG_TYPE_HOSTDEV_PCI= || (port->plugtype =3D=3D VIR_NETWORK_PORT_PLUG_TYPE_DIRECT && port->plug.direct.mode =3D=3D VIR_NETDEV_MACVLAN_MODE_PASST= HRU) || - (port->plugtype =3D=3D VIR_DOMAIN_NET_TYPE_BRIDGE && + (port->plugtype =3D=3D VIR_NETWORK_PORT_PLUG_TYPE_BRIDGE && port->virtPortProfile && port->virtPortProfile->virtPortType =3D=3D VIR_NETDEV_VPORT= _PROFILE_OPENVSWITCH))) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list