vagrant-libvirt 0.11.2 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40dbf1a78ed383e5c289059d869c281c778fee7414a0a1711849d9dcba16df52
-  data.tar.gz: 2bf17eb2166d56a0386d6bbd70d6548d89def585aaf6f10c929f8afc546496bc
+  metadata.gz: 8ea176b68227366ddb6ac763a2e66c55cffaa58e9d4cc188f3f8b6c62bb3cd06
+  data.tar.gz: a8cfb80de7f57fbcd2e4bec2fdf7f7043a81f410da00606a5f88897374535baf
 SHA512:
-  metadata.gz: e9fa89d429ae04d5375930e3bfec06d3cf2c152803e8dc6a3fcb9c4a8ac4e81e1bafe08639fe689e9535cf3889bb1fd548c196ebe064abbad1edbfd85619ce0f
-  data.tar.gz: 4713ea077cc23984256c1a0ed55a67ec44c0a687f3a7c72916762a65807995c4fd5e1206f0ed86cc69008f8bf51a7cfff07b36f6947cd90bd29e136c2649c9f7
+  metadata.gz: 9b005c6323cee5bfe5facbe14d5b3f7acddd9076b428d126acd220080b5946107795eee6726893bdfc7e9e67b08534a8c475b9f1d6c8de79f79dcf8c125564e8
+  data.tar.gz: 257c7b4bf7c7390c0013101eb6541d43e2d60d871309053201376b5cfff5439610f5aacb05775b24b37ddc374b2d8dff4deab0a8163c4821a5f34c7c5d76ed35

data/lib/vagrant-libvirt/action/create_domain.rb

@@ -36,7 +36,11 @@ module VagrantPlugins
           @nodeset = config.nodeset
           @features = config.features
           @features_hyperv = config.features_hyperv
+          @clock_absolute = config.clock_absolute
+          @clock_adjustment = config.clock_adjustment
+          @clock_basis = config.clock_basis
           @clock_offset = config.clock_offset
+          @clock_timezone = config.clock_timezone
           @clock_timers = config.clock_timers
           @launchsecurity_data = config.launchsecurity_data
           @shares = config.shares
@@ -198,6 +202,8 @@ module VagrantPlugins
             dir = File.dirname(serial[:source][:path])
             begin
               FileUtils.mkdir_p(dir)
+              FileUtils.touch(serial[:source][:path])
+              File.truncate(serial[:source][:path], 0) unless serial[:source].fetch(:append, false)
             rescue ::Errno::EACCES
               raise Errors::SerialCannotCreatePathError,
                     path: dir
@@ -234,7 +240,15 @@ module VagrantPlugins
               env[:ui].info(" -- Feature (HyperV):  name=#{feature[:name]}, state=#{feature[:state]}")
             end
           end
-          env[:ui].info(" -- Clock offset:      #{@clock_offset}")
+          if not @clock_absolute.nil?
+            env[:ui].info(" -- Clock absolute:    #{@clock_absolute}")
+          elsif not @clock_adjustment.nil?
+            env[:ui].info(" -- Clock adjustment:  #{@clock_adjustment}")
+          elsif not @clock_timezone.nil?
+            env[:ui].info(" -- Clock timezone:    #{@clock_timezone}")
+          else
+            env[:ui].info(" -- Clock offset:      #{@clock_offset}")
+          end
           @clock_timers.each do |timer|
             env[:ui].info(" -- Clock timer:       #{timer.map { |k,v| "#{k}=#{v}"}.join(', ')}")
           end

data/lib/vagrant-libvirt/action/create_domain_volume.rb

@@ -60,6 +60,7 @@ module VagrantPlugins
                       xml.group storage_gid(env)
                       xml.label 'virt_image_t'
                     end
+                    xml.compat '1.1'
                   end
                   xml.backingStore do
                     xml.path(@backing_file)

data/lib/vagrant-libvirt/action/create_network_interfaces.rb

@@ -4,6 +4,9 @@ require 'log4r'
 require 'vagrant/util/network_ip'
 require 'vagrant/util/scoped_hash_override'
 
+require 'vagrant-libvirt/util/erb_template'
+require 'vagrant-libvirt/util/network_util'
+
 module VagrantPlugins
   module ProviderLibvirt
     module Action
@@ -40,7 +43,7 @@ module VagrantPlugins
 
           # Vagrant gives you adapter 0 by default
           # Assign interfaces to slots.
-          configured_networks(env, @logger).each do |options|
+          configured_networks(env[:machine], @logger).each do |options|
             # don't need to create interface for this type
             next if options[:iface_type] == :forwarded_port
 
@@ -78,7 +81,7 @@ module VagrantPlugins
             @driver_name = iface_configuration.fetch(:driver_name, false)
             @driver_iommu = iface_configuration.fetch(:driver_iommu, false )
             @driver_queues = iface_configuration.fetch(:driver_queues, false)
-            @device_name = iface_configuration.fetch(:iface_name, false)
+            @device_name = iface_configuration.fetch(:iface_name, nil)
             @mtu = iface_configuration.fetch(:mtu, nil)
             @pci_bus = iface_configuration.fetch(:bus, nil)
             @pci_slot = iface_configuration.fetch(:slot, nil)
@@ -96,6 +99,7 @@ module VagrantPlugins
               @driver_iommu = iface_configuration.fetch(:driver_iommu, false )
               @driver_name = iface_configuration.fetch(:driver_name, false)
               @driver_queues = iface_configuration.fetch(:driver_queues, false)
+              @device_name = iface_configuration.fetch(:iface_name, nil)
               @portgroup = iface_configuration.fetch(:portgroup, nil)
               @network_name = iface_configuration.fetch(:network_name, @network_name)
               template_name = 'public_interface'
@@ -146,7 +150,7 @@ module VagrantPlugins
               # FIXME: all options for network driver should be hash from Vagrantfile
               driver_options = {}
               driver_options[:name] = @driver_name if @driver_name
-              driver_options[:iommu] = @driver_iommu ? "on" : "off" if @nic_model_type == 'virtio'
+              driver_options[:iommu] = @driver_iommu ? "on" : "off" if @model_type == 'virtio'
               driver_options[:queues] = @driver_queues if @driver_queues
 
               @udp_tunnel ||= {}
@@ -169,7 +173,7 @@ module VagrantPlugins
               @logger.debug {
                 "Attaching Network Device with XML:\n#{xml}"
               }
-              domain.attach_device(xml)
+              env[:machine].provider.driver.attach_device(xml)
             rescue => e
               raise Errors::AttachDeviceError,
                     error_message: e.message

data/lib/vagrant-libvirt/action/create_networks.rb

@@ -47,7 +47,7 @@ module VagrantPlugins
           @@lock.synchronize do
             # Iterate over networks If some network is not
             # available, create it if possible. Otherwise raise an error.
-            configured_networks(env, @logger).each do |options|
+            configured_networks(env[:machine], @logger).each do |options|
               # Only need to create private networks
               next if options[:iface_type] != :private_network ||
                       options.fetch(:tunnel_type, nil)

data/lib/vagrant-libvirt/action/destroy_domain_confirm.rb

@@ -0,0 +1,22 @@
+
+require "vagrant/action/builtin/confirm"
+
+module VagrantPlugins
+  module VagrantLibvirt
+    module Action
+      class DestroyDomainConfirm < Vagrant::Action::Builtin::Confirm
+        def initialize(app, env)
+          force_key = :force_confirm_destroy
+          message   = I18n.t("vagrant_libvirt.destroy_domain.confirmation",
+                             name: env[:machine].name)
+
+          super(app, env, message, force_key, allowed: ["y", "n", "Y", "N"])
+        end
+
+        def call(env)
+
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-libvirt/action/forward_ports.rb

@@ -93,7 +93,7 @@ module VagrantPlugins
             -N
             #{ssh_info[:host]}
           )
-          params += '-g' if gateway_ports
+          params <<= '-g' if gateway_ports
 
           options = (%W(
             User=#{ssh_info[:username]}

data/lib/vagrant-libvirt/action/handle_box_image.rb

@@ -43,6 +43,7 @@ module VagrantPlugins
               :name => HandleBoxImage.get_volume_name(env[:machine].box, 'box', image_path, env[:ui]),
               :virtual_size => HandleBoxImage.get_virtual_size(env),
               :format => box_format,
+              :compat => "1.1",
             }]
           else
             # Handle box v2 format
@@ -57,7 +58,7 @@ module VagrantPlugins
               raise Errors::BoxFormatMissingAttribute, attribute: "disks[#{i}]['path']" if disks[i]['path'].nil?
 
               image_path = HandleBoxImage.get_box_image_path(env[:machine].box, disks[i]['path'])
-              format, virtual_size = HandleBoxImage.get_box_disk_settings(image_path)
+              format, virtual_size, compat = HandleBoxImage.get_box_disk_settings(image_path)
               volume_name = HandleBoxImage.get_volume_name(
                 env[:machine].box,
                 disks[i].fetch('name', disks[i]['path'].sub(/#{File.extname(disks[i]['path'])}$/, '')),
@@ -76,7 +77,8 @@ module VagrantPlugins
                 :path => image_path,
                 :name => volume_name,
                 :virtual_size => virtual_size,
-                :format => HandleBoxImage.verify_box_format(format)
+                :format => HandleBoxImage.verify_box_format(format),
+                :compat => compat,
               }
             }
           end
@@ -180,8 +182,9 @@ module VagrantPlugins
           image_info = JSON.parse(stdout)
           format = image_info['format']
           virtual_size = ByteNumber.new(image_info['virtual-size'])
+          compat = image_info.fetch("format-specific", {}).fetch("data", {}).fetch("compat", "0.10")
 
-          return format, virtual_size
+          return format, virtual_size, compat
         end
 
         def send_box_image(env, config, box_image_file, box_volume)

data/lib/vagrant-libvirt/action/start_domain.rb

@@ -166,12 +166,29 @@ module VagrantPlugins
             xml_descr.delete_element('/domain/cpu')
           end
 
-          # Clock
+          # Clock - can change in complicated ways, so just build a new clock and compare
+          newclock = REXML::Element.new('newclock')
+          if not config.clock_absolute.nil?
+            newclock.add_attribute('offset', 'absolute')
+            newclock.add_attribute('start', config.clock_absolute)
+          elsif not config.clock_adjustment.nil?
+            newclock.add_attribute('offset', 'variable')
+            newclock.add_attribute('basis', config.clock_basis)
+            newclock.add_attribute('adjustment', config.clock_adjustment)
+          elsif not config.clock_timezone.nil?
+            newclock.add_attribute('offset', 'timezone')
+            newclock.add_attribute('timezone', config.clock_timezone)
+          else
+            newclock.add_attribute('offset', config.clock_offset)
+          end
           clock = REXML::XPath.first(xml_descr, '/domain/clock')
-          if clock.attributes['offset'] != config.clock_offset
-            @logger.debug "clock offset changed"
+          if clock.attributes != newclock.attributes
+            @logger.debug "clock definition changed"
             descr_changed = true
-            clock.attributes['offset'] = config.clock_offset
+            clock.attributes.clear
+            newclock.attributes.each do |attr, value|
+              clock.add_attribute(attr, value)
+            end
           end
 
           # clock timers - because timers can be added/removed, just rebuild and then compare
@@ -272,13 +289,25 @@ module VagrantPlugins
               graphics.attributes['listen'] = config.graphics_ip
               graphics.delete_element('//listen')
             end
-            if graphics.attributes['autoport'] != config.graphics_autoport
-              descr_changed = true
-              graphics.attributes['autoport'] = config.graphics_autoport
-              if config.graphics_autoport == 'no'
-                graphics.attributes.delete('autoport')
+            unless config.graphics_port.nil? or config.graphics_port == -1
+              if graphics.attributes['autoport'] != 'no'
+                descr_changed = true
+                graphics.attributes['autoport'] = 'no'
+              end
+              if graphics.attributes['port'] != config.graphics_port
+                descr_changed = true
                 graphics.attributes['port'] = config.graphics_port
               end
+            else
+              if graphics.attributes['autoport'] != config.graphics_autoport
+                descr_changed = true
+                graphics.attributes['autoport'] = config.graphics_autoport
+                if config.graphics_autoport == 'no'
+                  graphics.attributes['port'] = config.graphics_port
+                else
+                  graphics.attributes['port'] = '-1'
+                end
+              end
             end
             if graphics.attributes['websocket'] != config.graphics_websocket.to_s
               descr_changed = true

data/lib/vagrant-libvirt/action.rb

@@ -128,9 +128,7 @@ module VagrantPlugins
       private_class_method def self.action_start
         Vagrant::Action::Builder.new.tap do |b|
           b.use Call, IsRunning do |env, b2|
-            # If the VM is running, run the necessary provisioners
             if env[:result]
-              b2.use action_provision
               next
             end
 

data/lib/vagrant-libvirt/config.rb

@@ -7,11 +7,13 @@ require 'vagrant/action/builtin/mixin_synced_folders'
 
 require 'vagrant-libvirt/errors'
 require 'vagrant-libvirt/util/resolvers'
+require 'vagrant-libvirt/util/network_util'
 
 module VagrantPlugins
   module ProviderLibvirt
     class Config < Vagrant.plugin('2', :config)
       include Vagrant::Action::Builtin::MixinSyncedFolders
+      include VagrantPlugins::ProviderLibvirt::Util::NetworkUtil
 
       # manually specify URI
       # will supersede most other options if provided
@@ -68,6 +70,8 @@ module VagrantPlugins
       attr_accessor :management_network_mtu
       attr_accessor :management_network_keep
       attr_accessor :management_network_driver_iommu
+      attr_accessor :management_network_iface_name
+      attr_accessor :management_network_model_type
 
       # System connection information
       attr_accessor :system_uri
@@ -95,7 +99,11 @@ module VagrantPlugins
       attr_accessor :shares
       attr_accessor :features
       attr_accessor :features_hyperv
+      attr_accessor :clock_absolute
+      attr_accessor :clock_adjustment
+      attr_accessor :clock_basis
       attr_accessor :clock_offset
+      attr_accessor :clock_timezone
       attr_accessor :clock_timers
       attr_accessor :launchsecurity_data
       attr_accessor :numa_nodes
@@ -222,6 +230,8 @@ module VagrantPlugins
       ]
 
       def initialize
+        @logger = Log4r::Logger.new("vagrant_libvirt::config")
+
         @uri               = UNSET_VALUE
         @driver            = UNSET_VALUE
         @host              = UNSET_VALUE
@@ -249,6 +259,8 @@ module VagrantPlugins
         @management_network_mtu = UNSET_VALUE
         @management_network_keep = UNSET_VALUE
         @management_network_driver_iommu = UNSET_VALUE
+        @management_network_iface_name = UNSET_VALUE
+        @management_network_model_type = UNSET_VALUE
 
         # System connection information
         @system_uri      = UNSET_VALUE
@@ -272,7 +284,11 @@ module VagrantPlugins
         @shares            = UNSET_VALUE
         @features          = UNSET_VALUE
         @features_hyperv   = UNSET_VALUE
+        @clock_absolute    = UNSET_VALUE
+        @clock_adjustment  = UNSET_VALUE
+        @clock_basis       = UNSET_VALUE
         @clock_offset      = UNSET_VALUE
+        @clock_timezone    = UNSET_VALUE
         @clock_timers      = []
         @launchsecurity_data = UNSET_VALUE
         @numa_nodes        = UNSET_VALUE
@@ -720,7 +736,7 @@ module VagrantPlugins
 
       # Disk driver options for primary disk
       def disk_driver(options = {})
-        supported_opts = [:cache, :io, :copy_on_read, :discard, :detect_zeroes]
+        supported_opts = [:cache, :io, :copy_on_read, :discard, :detect_zeroes, :type]
         @disk_driver_opts = options.select { |k,_| supported_opts.include? k }
       end
 
@@ -959,6 +975,8 @@ module VagrantPlugins
         @management_network_mtu = nil if @management_network_mtu == UNSET_VALUE
         @management_network_keep = false if @management_network_keep == UNSET_VALUE
         @management_network_driver_iommu = false if @management_network_driver_iommu == UNSET_VALUE
+        @management_network_iface_name = nil if @management_network_iface_name == UNSET_VALUE
+        @management_network_model_type = 'virtio' if @management_network_model_type == UNSET_VALUE
 
         # Domain specific settings.
         @title = '' if @title == UNSET_VALUE
@@ -995,7 +1013,11 @@ module VagrantPlugins
         @shares = nil if @shares == UNSET_VALUE
         @features = ['acpi','apic','pae'] if @features == UNSET_VALUE
         @features_hyperv = [] if @features_hyperv == UNSET_VALUE
+        @clock_absolute = nil if @clock_absolute == UNSET_VALUE
+        @clock_adjustment = nil if @clock_adjustment == UNSET_VALUE
+        @clock_basis = 'utc' if @clock_basis == UNSET_VALUE
         @clock_offset = 'utc' if @clock_offset == UNSET_VALUE
+        @clock_timezone = nil if @clock_timezone == UNSET_VALUE
         @clock_timers = [] if @clock_timers == UNSET_VALUE
         @launchsecurity_data = nil if @launchsecurity_data == UNSET_VALUE
         @numa_nodes = @numa_nodes == UNSET_VALUE ? nil : _generate_numa
@@ -1206,27 +1228,7 @@ module VagrantPlugins
           errors << "#{e}"
         end
 
-        machine.config.vm.networks.each_with_index do |network, index|
-          type, opts = network
-
-          if opts[:mac]
-            if opts[:mac] =~ /\A([0-9a-fA-F]{12})\z/
-              opts[:mac] = opts[:mac].scan(/../).join(':')
-            end
-            unless opts[:mac] =~ /\A([0-9a-fA-F]{2}:){5}([0-9a-fA-F]{2})\z/
-              errors << "Configured NIC MAC '#{opts[:mac]}' is not in 'xx:xx:xx:xx:xx:xx' or 'xxxxxxxxxxxx' format"
-            end
-          end
-
-          # only interested in public networks where portgroup is nil, as then source will be a host device
-          if type == :public_network && opts[:portgroup] == nil
-            devices = host_devices(machine)
-            hostdev = opts.fetch(:dev, 'eth0')
-            if !devices.include?(hostdev)
-              errors << "network configuration #{index} for machine #{machine.name} is a public_network referencing host device '#{hostdev}' which does not exist, consider adding ':dev => ....' referencing one of #{devices.join(", ")}"
-            end
-          end
-        end
+        errors = validate_networks(machine, errors)
 
         if !machine.provider_config.volume_cache.nil? and machine.provider_config.volume_cache != UNSET_VALUE
           machine.ui.warn("Libvirt Provider: volume_cache is deprecated. Use disk_driver :cache => '#{machine.provider_config.volume_cache}' instead.")
@@ -1250,6 +1252,10 @@ module VagrantPlugins
           end
         end
 
+        if [@clock_absolute, @clock_adjustment, @clock_timezone].count {|clock| !clock.nil?} > 1
+          errors << "At most, only one of [clock_absolute, clock_adjustment, clock_timezone] may be set."
+        end
+
         errors = validate_sysinfo(machine, errors)
 
         { 'Libvirt Provider' => errors }
@@ -1320,8 +1326,8 @@ module VagrantPlugins
           end
         end
 
-        # Extract host values from uri if provided, otherwise nil
-        @host = uri.host
+        # Extract host values from uri if provided, otherwise set empty string
+        @host = uri.host || ""
         @port = uri.port
         # only override username if there is a value provided
         @username = nil if @username == UNSET_VALUE
@@ -1389,11 +1395,55 @@ module VagrantPlugins
         end
       end
 
-      def host_devices(machine)
-        machine.provider.driver.host_devices.select do |dev|
-          next if dev.empty?
-          dev != "lo" && !@host_device_exclude_prefixes.any? { |exclude| dev.start_with?(exclude) }
+      def validate_networks(machine, errors)
+        begin
+          networks = configured_networks(machine, @logger)
+        rescue Errors::VagrantLibvirtError => e
+          errors << "#{e}"
+
+          return
         end
+
+        return if networks.empty?
+
+        networks.each_with_index do |network, index|
+          if network[:mac]
+            if network[:mac] =~ /\A([0-9a-fA-F]{12})\z/
+              network[:mac] = network[:mac].scan(/../).join(':')
+            end
+            unless network[:mac] =~ /\A([0-9a-fA-F]{2}:){5}([0-9a-fA-F]{2})\z/
+              errors << "Configured NIC MAC '#{network[:mac]}' is not in 'xx:xx:xx:xx:xx:xx' or 'xxxxxxxxxxxx' format"
+            end
+          end
+
+          # only interested in public networks where portgroup is nil, as then source will be a host device
+          if network[:iface_type] == :public_network && network[:portgroup] == nil
+            exclude_prefixes = @host_device_exclude_prefixes
+            # for qemu sessions the management network injected will be a public_network trying to use a libvirt managed device
+            if index == 0 and machine.provider_config.mgmt_attach and machine.provider_config.qemu_use_session == true
+              exclude_prefixes.delete('virbr')
+            end
+
+            devices = machine.provider.driver.host_devices.select do |dev|
+              next if dev.empty?
+              dev != "lo" && !exclude_prefixes.any? { |exclude| dev.start_with?(exclude) }
+            end
+            hostdev = network.fetch(:dev, 'eth0')
+
+            if !devices.include?(hostdev)
+              errors << "network configuration #{index} for machine #{machine.name} is a public_network referencing host device '#{hostdev}' which does not exist, consider adding ':dev => ....' referencing one of #{devices.join(", ")}"
+            end
+          end
+
+          unless network[:iface_name].nil?
+            restricted_devnames = ['vnet', 'vif', 'macvtap', 'macvlan']
+            if restricted_devnames.any? { |restricted| network[:iface_name].start_with?(restricted) }
+              errors << "network configuration for machine #{machine.name} with setting :libvirt__iface_name => '#{network[:iface_name]}' starts with a restricted prefix according to libvirt docs https://libvirt.org/formatdomain.html#overriding-the-target-element, please use a device name that does not start with one of #{restricted_devnames.join(", ")}"
+            end
+          end
+        end
+
+        errors
       end
 
       def validate_sysinfo(machine, errors)

data/lib/vagrant-libvirt/templates/domain.xml.erb

@@ -132,7 +132,15 @@
     </hyperv>
 <%- end -%>
   </features>
+<%- if not @clock_absolute.nil? -%>
+  <clock offset='absolute' start='<%= @clock_absolute %>'>
+<%- elsif not @clock_adjustment.nil? -%>
+  <clock offset='variable' basis='<%= @clock_basis %>' adjustment='<%= @clock_adjustment %>'>
+<%- elsif not @clock_timezone.nil? -%>
+  <clock offset='timezone' timezone='<%= @clock_timezone %>'>
+<%- else -%>
   <clock offset='<%= @clock_offset %>'>
+<%- end -%>
 <%- @clock_timers.each do |clock_timer| -%>
     <timer<% clock_timer.each do |attr, value| %> <%= attr %>='<%= value %>'<% end %>/>
 <%- end -%>
@@ -144,11 +152,11 @@
 <%- @domain_volumes.each_with_index do |volume, index| -%>
     <disk type='file' device='disk'>
       <alias name='ua-box-volume-<%= index -%>'/>
-      <driver name='qemu' type='qcow2' <%=
-        @disk_driver_opts.empty? ? "cache='#{volume[:cache]}'" :
-            @disk_driver_opts.reject { |k,v| v.nil? }
-                             .map { |k,v| "#{k}='#{v}'"}
-                             .join(' ') -%>/>
+      <driver name='qemu' <%=
+        {:type => 'qcow2', :cache => "#{volume[:cache]}"}.merge(@disk_driver_opts)
+          .reject { |k,v| v.nil? }
+          .map { |k,v| "#{k}='#{v}'"}
+          .join(' ') -%>/>
       <source file='<%= volume[:absolute_path] %>'/>
       <%# we need to ensure a unique target dev -%>
       <target dev='<%= volume[:device] %>' bus='<%= volume[:bus] %>'/>
@@ -167,12 +175,12 @@
 <%- @disks.each_with_index do |d, index| -%>
     <disk type='file' device='disk'>
       <alias name='ua-disk-volume-<%= index -%>'/>
-      <driver name='qemu' type='<%= d[:type] %>' <%=
-        d.select { |k,_| [:cache, :io, :copy_on_read, :discard, :detect_zeroes].include? k }
-         .reject { |k,v| v.nil? }
-         .map { |k,v| "#{k}='#{v}'"}
-         .join(' ')
-      -%>/>
+      <driver name='qemu' <%=
+        {:type => 'qcow2'}.merge(d)
+          .select { |k,_| [:type, :cache, :io, :copy_on_read, :discard, :detect_zeroes].include? k }
+          .reject { |k,v| v.nil? }
+          .map { |k,v| "#{k}='#{v}'"}
+          .join(' ') -%>/>
       <source file='<%= d[:absolute_path] %>'/>
       <target dev='<%= d[:device] %>' bus='<%= d[:bus] %>'/>
   <%- if d[:address_type] || @disk_address_type -%>
@@ -208,9 +216,12 @@
 <%- end -%>
 <%- @serials.each_with_index do |serial, port| -%>
     <serial type='<%= serial[:type] %>'>
-      <%- unless serial[:source].nil? -%>
-      <source path='<%= serial[:source][:path] %>'/>
-      <%- end -%>
+  <%- unless serial[:source].nil?
+    source = serial[:source]
+    seclabel = serial[:source][:seclabel]
+-%>
+      <source path='<%= source[:path] %>' append='<%= source.fetch(:append, 'on') %>'/>
+  <%- end -%>
       <target port='<%= port %>'/>
     </serial>
 <%- end -%>

data/lib/vagrant-libvirt/templates/public_interface.xml.erb

@@ -1,34 +1,39 @@
 <interface type='<%= @type %>'<% if @trust_guest_rx_filters %> trustGuestRxFilters='yes'<% end %>>
   <alias name='ua-net-<%= @iface_number %>'/>
-  <% if @mac %>
+  <%- if @mac %>
   <mac address='<%= @mac %>'/>
-  <% end %>
-  <%if @type == 'direct'%>
+  <%- end %>
+  <%- if @type == 'direct'%>
   <source dev='<%= @device %>' mode='<%= @mode %>'/>
-  <% elsif !@portgroup.nil? %>
+  <%- elsif !@portgroup.nil? %>
   <source network='<%=@network_name%>' portgroup='<%=@portgroup%>'/>
-  <% else %>
+  <%- else %>
   <source bridge='<%=@device%>'/>
-  <% end %>
+  <%- end %>
+  <%- unless @device_name.nil? %>
+  <target dev='<%= @device_name %>'/>
+  <%- end %>
   <model type='<%=@model_type%>'/>
-  <% if @driver_name and @driver_queues %>
+  <%- if @driver_name and @driver_queues %>
     <driver <% if @driver_iommu %> iommu="on" <% end %> name='<%=@driver_name%>' queues='<%=@driver_queues%>'/>
-  <% elsif @driver_queues %>
+  <%- elsif @driver_queues %>
     <driver <% if @driver_iommu %> iommu="on" <% end %> queues='<%=@driver_queues%>'/>
-  <% elsif @driver_name %>
+  <%- elsif @driver_name %>
     <driver <% if @driver_iommu %> iommu="on" <% end %> name='<%=@driver_name%>'/>
-  <% elsif @driver_iommu %>
+  <%- elsif @driver_iommu %>
     <driver iommu='on' />
+  <%- end %>
+  <% if @mtu %>
+  <mtu size="<%= @mtu %>" />
   <% end %>
-
-  <% if @ovs %>
+  <%- if @ovs %>
   <virtualport type='openvswitch'>
-    <% if @ovs_interfaceid %>
+    <%- if @ovs_interfaceid %>
       <parameters interfaceid='<%=@ovs_interfaceid%>'/>
-    <% end %>
+    <%- end %>
   </virtualport>
-  <% end %>
-  <% if @pci_bus and @pci_slot %>
+  <%- end %>
+  <%- if @pci_bus and @pci_slot %>
   <address type='pci' bus='<%=@pci_bus%>' slot='<%=@pci_slot%>' />
-  <% end %>
+  <%- end %>
 </interface>