From 6f4070cd32d7bf651d86cdac886162e1353a9d91 Mon Sep 17 00:00:00 2001
From: Guido Trotter <ultrotter@google.com>
Date: Fri, 18 Jan 2013 15:06:33 +0100
Subject: [PATCH] kvm: extract a regexp matching out of a for loop
Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
---
lib/hypervisor/hv_kvm.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/hypervisor/hv_kvm.py b/lib/hypervisor/hv_kvm.py
index bcb2db08b..a25c32dd8 100644
--- a/lib/hypervisor/hv_kvm.py
+++ b/lib/hypervisor/hv_kvm.py
@@ -1515,11 +1515,13 @@ class KVMHypervisor(hv_base.BaseHypervisor):
else:
nic_model = nic_type
+ kvm_supports_netdev = self._NETDEV_RE.search(kvmhelp)
+
for nic_seq, nic in enumerate(kvm_nics):
tapname, tapfd = _OpenTap(vnet_hdr)
tapfds.append(tapfd)
taps.append(tapname)
- if self._NETDEV_RE.search(kvmhelp):
+ if kvm_supports_netdev:
nic_val = "%s,mac=%s,netdev=netdev%s" % (nic_model, nic.mac, nic_seq)
tap_val = "type=tap,id=netdev%s,fd=%d%s" % (nic_seq, tapfd, tap_extra)
kvm_cmd.extend(["-netdev", tap_val, "-device", nic_val])
--
GitLab