NuKVM/vagrant-libvirt
3
0
Fork 0
mirror of https://github.com/vagrant-libvirt/vagrant-libvirt.git synced 2025-02-25 18:55:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Ensure iommu XML is only set for virtio nics (#1690)

Browse Source 
Skip setting iommu option on the drive unless it's for virtio model type
nics.

Fixes: #1688
This commit is contained in:
Darragh Bailey
2022-12-04 16:19:43 +00:00
committed by GitHub
parent 5f324e9cf3
commit e0b17b34f5
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/vagrant-libvirt/action/create_network_interfaces.rb
View File

@@ -146,7 +146,7 @@ module VagrantPlugins
# FIXME: all options for network driver should be hash from Vagrantfile # FIXME: all options for network driver should be hash from Vagrantfile
driver_options = {} driver_options = {}
driver_options[:name] = @driver_name if @driver_name driver_options[:name] = @driver_name if @driver_name
driver_options[:iommu] = @driver_iommu ? "on" : "off" driver_options[:iommu] = @driver_iommu ? "on" : "off" if @nic_model_type == 'virtio'
driver_options[:queues] = @driver_queues if @driver_queues driver_options[:queues] = @driver_queues if @driver_queues
@udp_tunnel ||= {} @udp_tunnel ||= {}
@@ -271,10 +271,9 @@ module VagrantPlugins
xml.mac(address: mac) if mac xml.mac(address: mac) if mac
xml.target(dev: target_dev_name(device_name, type, iface_number)) xml.target(dev: target_dev_name(device_name, type, iface_number))
xml.alias(name: "net#{iface_number}")
xml.model(type: model_type.to_s) xml.model(type: model_type.to_s)
xml.mtu(size: Integer(mtu)) if mtu xml.mtu(size: Integer(mtu)) if mtu
xml.driver(**driver_options) xml.driver(**driver_options) if driver_options
xml.address(type: 'pci', bus: pci_bus, slot: pci_slot) if pci_bus and pci_slot xml.address(type: 'pci', bus: pci_bus, slot: pci_slot) if pci_bus and pci_slot
end end
end.to_xml( end.to_xml(