diff --git a/kvmagent/kvmagent/plugins/tf_net_userdata_plugin.py b/kvmagent/kvmagent/plugins/tf_net_userdata_plugin.py index 31858929471096b28fdc9b9e142eaa0ff35dc02b..efe7433e3f9b5ab30897c1ca4f4197ff3babb74c 100644 --- a/kvmagent/kvmagent/plugins/tf_net_userdata_plugin.py +++ b/kvmagent/kvmagent/plugins/tf_net_userdata_plugin.py @@ -238,7 +238,7 @@ class TfNetProviderUserdata(kvmagent.KvmAgent): conf_path = os.path.join(self.TF_USERDATA_ROOT, 'lighttpd.conf') pid = linux.find_process_by_cmdline([conf_path]) if pid: - linux.kill_process(pid) + linux.kill_process(pid, timeout=10) linux.mkdir('/var/log/lighttpd', 0o750) # restart lighttpd to load new configuration diff --git a/kvmagent/kvmagent/plugins/vm_plugin.py b/kvmagent/kvmagent/plugins/vm_plugin.py index 053089a5ca44824571ec67f663039347d7a8e740..3b69796f1d6eeb6d4282a87c1e256d631a3155d0 100644 --- a/kvmagent/kvmagent/plugins/vm_plugin.py +++ b/kvmagent/kvmagent/plugins/vm_plugin.py @@ -4659,6 +4659,8 @@ class Vm(object): e(interface, 'driver', None, attrib={'queues': '8'}) elif nic.type == 'TFVNIC': e(interface, 'target', None, attrib={'dev': nic.nicInternalName}) + driver = e(interface, 'driver', None, attrib={'name': 'vhost'}) + e(driver, 'host', None, attrib={'csum': 'off'}) else: e(interface, 'source', None, attrib={'bridge': nic.bridgeName}) e(interface, 'target', None, attrib={'dev': nic.nicInternalName})