Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F163EE40F for ; Thu, 14 Feb 2013 19:57:57 +0000 (UTC) Received: (qmail 70371 invoked by uid 500); 14 Feb 2013 19:57:52 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 70275 invoked by uid 500); 14 Feb 2013 19:57:52 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 69330 invoked by uid 99); 14 Feb 2013 19:57:51 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Feb 2013 19:57:51 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 6405D325E4A; Thu, 14 Feb 2013 19:57:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: widodh@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [32/50] [abbrv] git commit: refs/heads/qemu-img - Summary: KVM - Fix physical net parsing when traffic label points to tagged dev Message-Id: <20130214195751.6405D325E4A@tyr.zones.apache.org> Date: Thu, 14 Feb 2013 19:57:51 +0000 (UTC) Summary: KVM - Fix physical net parsing when traffic label points to tagged dev Detail: If your traffic label points to a bridge that is on a tagged interface rather than a real physical interface, cloudstack may not parse the physical interface correctly, bringing up tagged interfaces on the tagged interface. Signed-off-by: Marcus Sorensen 1360798665 -0700 Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/35cf5686 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/35cf5686 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/35cf5686 Branch: refs/heads/qemu-img Commit: 35cf56862f603309d1778c0f9be0ee3d7e92f3c7 Parents: f542c32 Author: Marcus Sorensen Authored: Wed Feb 13 16:37:45 2013 -0700 Committer: Marcus Sorensen Committed: Wed Feb 13 16:45:18 2013 -0700 ---------------------------------------------------------------------- .../kvm/resource/LibvirtComputingResource.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/35cf5686/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java index 552afb1..5d17fd0 100755 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java @@ -858,7 +858,7 @@ ServerResource { private String getPif(String bridge) { String pif = matchPifFileInDirectory(bridge); - File vlanfile = new File("/proc/net/vlan" + pif); + File vlanfile = new File("/proc/net/vlan/" + pif); if (vlanfile.isFile()) { pif = Script.runSimpleBashScript("grep ^Device\\: /proc/net/vlan/"