qemu: fix semantic error to fetch a specified virtual nic
git-svn-id: https://svn.apache.org/repos/asf/incubator/tashi/branches/stroucki-tashi11@1294415 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/tashi/nodemanager/vmcontrol/qemu.py b/src/tashi/nodemanager/vmcontrol/qemu.py
index 854538a..76f2b56 100644
--- a/src/tashi/nodemanager/vmcontrol/qemu.py
+++ b/src/tashi/nodemanager/vmcontrol/qemu.py
@@ -132,7 +132,10 @@
def __getHostPids(self):
"""Utility function to get a list of system PIDs that match the QEMU_BIN specified (/proc/nnn/exe)"""
pids = []
- real_bin = os.readlink(self.QEMU_BIN)
+ real_bin = self.QEMU_BIN
+ while os.path.islink(real_bin):
+ real_bin = os.readlink(self.QEMU_BIN)
+
for f in os.listdir("/proc"):
try:
bin = os.readlink("/proc/%s/exe" % (f))
@@ -504,11 +507,11 @@
nicNetworks = {}
for i in range(0, len(instance.nics)):
# Don't allow more than one interface per vlan
+ nic = instance.nics[i]
if nicNetworks.has_key(nic.network):
continue
nicNetworks[nic.network] = True
- nic = instance.nics[i]
nicString = nicString + "-net nic,macaddr=%s,model=%s,vlan=%d -net tap,ifname=%s%d.%d,vlan=%d,script=/etc/qemu-ifup.%d " % (nic.mac, nicModel, nic.network, self.ifPrefix, instance.id, i, nic.network, nic.network)
# ACPI
