You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by wi...@apache.org on 2013/02/14 20:57:51 UTC
[32/50] [abbrv] git commit: refs/heads/qemu-img - Summary: KVM - Fix
physical net parsing when traffic label points to tagged dev
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 <ma...@betterservers.com> 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 <ma...@betterservers.com>
Authored: Wed Feb 13 16:37:45 2013 -0700
Committer: Marcus Sorensen <ma...@betterservers.com>
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/"