openstack/nova
Code Issues Proposed changes

Merge "libvirt: fix wrong driver name for vhostuser interface"

Browse Source
This commit is contained in:
Zuul
2018-04-23 17:22:46 +00:00
committed by Gerrit Code Review
parent 94062041c9 8ea168d641
commit e88e6340d0
4 changed files with 50 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
nova/virt/libvirt/config.py
View File

@@ -1339,11 +1339,21 @@ class LibvirtConfigGuestInterface(LibvirtConfigGuestDevice):
if self.model:
dev.append(etree.Element("model", type=self.model))
drv_elem = None
if self.driver_name:
drv_elem = etree.Element("driver", name=self.driver_name)
if self.net_type == "vhostuser":
# For vhostuser interface we should not set the driver
# name.
drv_elem = etree.Element("driver")
if drv_elem is not None:
if self.vhost_queues is not None:
drv_elem.set('queues', str(self.vhost_queues))
dev.append(drv_elem)
if drv_elem.get('name') or drv_elem.get('queues'):
# Append the driver element into the dom only if name
# or queues attributes are set.
dev.append(drv_elem)
if self.net_type == "ethernet":
if self.script is not None:

14
nova/virt/libvirt/vif.py
View File

@@ -431,13 +431,18 @@ class LibvirtGenericVIFDriver(object):
conf = self.get_base_config(instance, vif['address'], image_meta,
inst_type, virt_type, vif['vnic_type'],
host)
# TODO(sahid): We should never configure a driver backend for
# vhostuser interface. Specifically override driver to use
# None. This can be removed when get_base_config will be fixed
# and rewrite to set the correct backend.
conf.driver_name = None
mode, sock_path = self._get_vhostuser_settings(vif)
designer.set_vif_host_backend_vhostuser_config(conf, mode, sock_path)
# (vladikr) Not setting up driver and queues for vhostuser
# as queues are not supported in Libvirt until version 1.2.17
if not host.has_min_version(MIN_LIBVIRT_VHOSTUSER_MQ):
LOG.debug('Queues are not a vhostuser supported feature.')
conf.driver_name = None
conf.vhost_queues = None
return conf
@@ -474,11 +479,16 @@ class LibvirtGenericVIFDriver(object):
self._set_config_VIFPortProfile(instance, vif, conf)
def _set_config_VIFVHostUser(self, instance, vif, conf, host=None):
# TODO(sahid): We should never configure a driver backend for
# vhostuser interface. Specifically override driver to use
# None. This can be removed when get_base_config will be fixed
# and rewrite to set the correct backend.
conf.driver_name = None
designer.set_vif_host_backend_vhostuser_config(
conf, vif.mode, vif.path)
if not host.has_min_version(MIN_LIBVIRT_VHOSTUSER_MQ):
LOG.debug('Queues are not a vhostuser supported feature.')
conf.driver_name = None
conf.vhost_queues = None
def _set_config_VIFHostDevice(self, instance, vif, conf, host=None):