vagrant-libvirt 0.3.0 → 0.5.2

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

@@ -13,24 +13,40 @@ module VagrantPlugins
         def call(env)
           env[:ui].info(I18n.t('vagrant_libvirt.halt_domain'))
 
+          timeout = env[:machine].config.vm.graceful_halt_timeout
           domain = env[:machine].provider.driver.connection.servers.get(env[:machine].id.to_s)
           raise Errors::NoDomainError if domain.nil?
 
-          begin
-            env[:machine].guest.capability(:halt)
-          rescue
-            @logger.info('Trying Libvirt graceful shutdown.')
-            domain.shutdown
+          if env[:force_halt]
+            domain.poweroff
+            return @app.call(env)
           end
 
-
           begin
-            domain.wait_for(30) do
-              !ready?
+            Timeout.timeout(timeout) do
+              begin
+                env[:machine].guest.capability(:halt)
+              rescue Timeout::Error
+                raise
+              rescue
+                @logger.info('Trying Libvirt graceful shutdown.')
+                # Read domain object again
+                dom = env[:machine].provider.driver.connection.servers.get(env[:machine].id.to_s)
+                if dom.state.to_s == 'running'
+                  dom.shutdown
+                end
+              end
+
+              domain.wait_for(timeout) do
+                !ready?
+              end
             end
-          rescue Fog::Errors::TimeoutError
+          rescue Timeout::Error
             @logger.info('VM is still running. Calling force poweroff.')
             domain.poweroff
+          rescue
+            @logger.error('Failed to shutdown cleanly. Calling force poweroff.')
+            domain.poweroff
           end
 
           @app.call(env)

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

@@ -1,4 +1,5 @@
 require 'log4r'
+require 'open3'
 
 module VagrantPlugins
   module ProviderLibvirt
@@ -16,33 +17,69 @@ module VagrantPlugins
         end
 
         def call(env)
-          # Verify box metadata for mandatory values.
-          #
-          # Virtual size has to be set for allocating space in storage pool.
-          box_virtual_size = env[:machine].box.metadata['virtual_size']
-          raise Errors::NoBoxVirtualSizeSet if box_virtual_size.nil?
+          # Handle box formats converting between v1 => v2 and ensuring
+          # any obsolete settings are rejected.
 
-          # Support qcow2 format only for now, but other formats with backing
-          # store capability should be usable.
-          box_format = env[:machine].box.metadata['format']
-          if box_format.nil?
-            raise Errors::NoBoxFormatSet
-          elsif box_format != 'qcow2'
-            raise Errors::WrongBoxFormatSet
+          disks = env[:machine].box.metadata.fetch('disks', [])
+          if disks.empty?
+            # Handle box v1 format
+
+            # Only qcow2 format is supported in v1, but other formats with backing
+            # store capability should be usable.
+            box_format = env[:machine].box.metadata['format']
+            HandleBoxImage.verify_box_format(box_format)
+
+            env[:box_volume_number] = 1
+            env[:box_volumes] = [{
+              :path => HandleBoxImage.get_box_image_path(env[:machine].box, 'box.img'),
+              :name => HandleBoxImage.get_volume_name(env[:machine].box, 'box'),
+              :virtual_size => HandleBoxImage.get_virtual_size(env),
+              :format => box_format,
+            }]
+          else
+            # Handle box v2 format
+            # {
+            #   'path': '<path-of-file-box>',
+            #   'name': '<name-to-use-in-storage>' # optional, will use index
+            # }
+            #
+            env[:box_volume_number] = disks.length()
+            target_volumes = Hash[]
+            env[:box_volumes] = Array.new(env[:box_volume_number]) { |i|
+              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)
+              volume_name = HandleBoxImage.get_volume_name(
+                env[:machine].box,
+                disks[i].fetch('name', disks[i]['path'].sub(/#{File.extname(disks[i]['path'])}$/, '')),
+              )
+
+              # allowing name means needing to check that it doesn't cause a clash
+              existing = target_volumes[volume_name]
+              if !existing.nil?
+                raise Errors::BoxFormatDuplicateVolume, volume: volume_name, new_disk: "disks[#{i}]", orig_disk: "disks[#{existing}]"
+              end
+              target_volumes[volume_name] = i
+
+              {
+                :path => image_path,
+                :name => volume_name,
+                :virtual_size => virtual_size.to_i,
+                :format => HandleBoxImage.verify_box_format(format)
+              }
+            }
           end
 
           # Get config options
           config = env[:machine].provider_config
-          box_image_file = env[:machine].box.directory.join('box.img').to_s
-          env[:box_volume_name] = env[:machine].box.name.to_s.dup.gsub('/', '-VAGRANTSLASH-')
-          env[:box_volume_name] << "_vagrant_box_image_#{
-          begin
-            env[:machine].box.version.to_s
-          rescue
-            ''
-          end}.img"
+          box_image_files = []
+          env[:box_volumes].each do |d|
+            box_image_files.push(d[:path])
+          end
 
           # Override box_virtual_size
+          box_virtual_size = env[:box_volumes][0][:virtual_size]
           if config.machine_virtual_size
             if config.machine_virtual_size < box_virtual_size
               # Warn that a virtual size less than the box metadata size
@@ -57,77 +94,129 @@ module VagrantPlugins
             end
           end
           # save for use by later actions
-          env[:box_virtual_size] = box_virtual_size
+          env[:box_volumes][0][:virtual_size] = box_virtual_size
 
           # while inside the synchronize block take care not to call the next
           # action in the chain, as must exit this block first to prevent
           # locking all subsequent actions as well.
           @@lock.synchronize do
-            # Don't continue if image already exists in storage pool.
-            box_volume = env[:machine].provider.driver.connection.volumes.all(
-              name: env[:box_volume_name]
-            ).first
-            break if box_volume && box_volume.id
-
-            # Box is not available as a storage pool volume. Create and upload
-            # it as a copy of local box image.
-            env[:ui].info(I18n.t('vagrant_libvirt.uploading_volume'))
-
-            # Create new volume in storage pool
-            unless File.exist?(box_image_file)
-              raise Vagrant::Errors::BoxNotFound, name: env[:machine].box.name
+            env[:box_volumes].each_index do |i|
+              # Don't continue if image already exists in storage pool.
+              box_volume = env[:machine].provider.driver.connection.volumes.all(
+                name: env[:box_volumes][i][:name]
+              ).first
+              next if box_volume && box_volume.id
+
+              send_box_image(env, config, box_image_files[i], env[:box_volumes][i])
             end
-            box_image_size = File.size(box_image_file) # B
-            message = "Creating volume #{env[:box_volume_name]}"
-            message << " in storage pool #{config.storage_pool_name}."
-            @logger.info(message)
+          end
+
+          @app.call(env)
+        end
 
-            @storage_volume_uid = storage_uid env
-            @storage_volume_gid = storage_gid env
+        protected
 
+        def self.get_volume_name(box, name)
+          vol_name = box.name.to_s.dup.gsub('/', '-VAGRANTSLASH-')
+          vol_name << "_vagrant_box_image_#{
             begin
-              fog_volume = env[:machine].provider.driver.connection.volumes.create(
-                name: env[:box_volume_name],
-                allocation: "#{box_image_size / 1024 / 1024}M",
-                capacity: "#{box_virtual_size}G",
-                format_type: box_format,
-                owner: @storage_volume_uid,
-                group: @storage_volume_gid,
-                pool_name: config.storage_pool_name
-              )
-            rescue Fog::Errors::Error => e
-              raise Errors::FogCreateVolumeError,
-                    error_message: e.message
+              box.version.to_s
+            rescue
+              ''
             end
+          }_#{name.dup.gsub('/', '-SLASH-')}.img"
+        end
 
-            # Upload box image to storage pool
-            ret = upload_image(box_image_file, config.storage_pool_name,
-                               env[:box_volume_name], env) do |progress|
-              rewriting(env[:ui]) do |ui|
-                ui.clear_line
-                ui.report_progress(progress, box_image_size, false)
-              end
-            end
+        def self.get_virtual_size(env)
+          # Virtual size has to be set for allocating space in storage pool.
+          box_virtual_size = env[:machine].box.metadata['virtual_size']
+          raise Errors::NoBoxVirtualSizeSet if box_virtual_size.nil?
+          return box_virtual_size
+        end
 
-            # Clear the line one last time since the progress meter doesn't
-            # disappear immediately.
-            rewriting(env[:ui]) {|ui| ui.clear_line}
-
-            # If upload failed or was interrupted, remove created volume from
-            # storage pool.
-            if env[:interrupted] || !ret
-              begin
-                fog_volume.destroy
-              rescue
-                nil
-              end
+        def self.get_box_image_path(box, box_name)
+          return box.directory.join(box_name).to_s
+        end
+
+        def self.verify_box_format(box_format, disk_index=nil)
+          if box_format.nil?
+            raise Errors::NoBoxFormatSet
+          elsif box_format != 'qcow2'
+            if disk_index.nil?
+              raise Errors::WrongBoxFormatSet
+            else
+              raise Errors::WrongDiskFormatSet,
+                disk_index: disk_index
             end
           end
+          return box_format
+        end
 
-          @app.call(env)
+        def self.get_box_disk_settings(image_path)
+          stdout, stderr, status = Open3.capture3('qemu-img', 'info', image_path)
+          if !status.success?
+            raise Errors::BadBoxImage, image: image_path, out: stdout, err: stderr
+          end
+
+          image_info_lines = stdout.split("\n")
+          format = image_info_lines.find { |l| l.start_with?('file format:') }.split(' ')[2]
+          virtual_size = image_info_lines.find { |l| l.start_with?('virtual size:') }.split(' ')[2]
+
+          return format, virtual_size
         end
 
-        protected
+        def send_box_image(env, config, box_image_file, box_volume)
+          # Box is not available as a storage pool volume. Create and upload
+          # it as a copy of local box image.
+          env[:ui].info(I18n.t('vagrant_libvirt.uploading_volume'))
+
+          # Create new volume in storage pool
+          unless File.exist?(box_image_file)
+            raise Vagrant::Errors::BoxNotFound, name: env[:machine].box.name
+          end
+          box_image_size = File.size(box_image_file) # B
+          message = "Creating volume #{box_volume[:name]}"
+          message << " in storage pool #{config.storage_pool_name}."
+          @logger.info(message)
+
+          begin
+            fog_volume = env[:machine].provider.driver.connection.volumes.create(
+              name: box_volume[:name],
+              allocation: "#{box_image_size / 1024 / 1024}M",
+              capacity: "#{box_volume[:virtual_size]}G",
+              format_type: box_volume[:format],
+              owner: storage_uid(env),
+              group: storage_gid(env),
+              pool_name: config.storage_pool_name
+            )
+          rescue Fog::Errors::Error => e
+            raise Errors::FogCreateVolumeError,
+                  error_message: e.message
+          end
+
+          # Upload box image to storage pool
+          ret = upload_image(box_image_file, config.storage_pool_name,
+                            box_volume[:name], env) do |progress|
+            rewriting(env[:ui]) do |ui|
+              ui.clear_line
+              ui.report_progress(progress, box_image_size, false)
+            end
+          end
+
+          # Clear the line one last time since the progress meter doesn't
+          # disappear immediately.
+          rewriting(env[:ui]) {|ui| ui.clear_line}
+
+          # If upload failed or was interrupted, remove created volume from
+          # storage pool.
+          if env[:interrupted] || !ret
+            begin
+              fog_volume.destroy
+            rescue
+              nil
+            end
+          end
+        end
 
         # Fog Libvirt currently doesn't support uploading images to storage
         # pool volumes. Use ruby-libvirt client instead.

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

@@ -9,9 +9,7 @@ module VagrantPlugins
         end
 
         def call(env)
-          domain = env[:machine].provider.driver.connection.servers.get(env[:machine].id.to_s)
-          raise Errors::NoDomainError if domain.nil?
-          env[:result] = domain.state.to_s == 'running'
+          env[:result] = env[:machine].state.id == :running
 
           @app.call(env)
         end

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

@@ -16,9 +16,9 @@ module VagrantPlugins
           libvirt_domain = env[:machine].provider.driver.connection.client.lookup_domain_by_uuid(env[:machine].id)
           if config.suspend_mode == 'managedsave'
             if libvirt_domain.has_managed_save?
-              env[:result] = libvirt_domain.has_managed_save?
+              env[:result] = env[:machine].state.id == :shutoff
             else
-              env[:result] = domain.state.to_s == 'paused'
+              env[:result] = env[:machine].state.id == :paused
               if env[:result]
                 env[:ui].warn('One time switching to pause suspend mode, found a paused VM.')
                 config.suspend_mode = 'pause'
@@ -27,10 +27,10 @@ module VagrantPlugins
           else
             if libvirt_domain.has_managed_save?
               env[:ui].warn('One time switching to managedsave suspend mode, state found.')
-              env[:result] = true
+              env[:result] = [:shutoff, :paused].include?(env[:machine].state.id)
               config.suspend_mode = 'managedsave'
             else
-              env[:result] = domain.state.to_s == 'paused'
+              env[:result] = env[:machine].state.id == :paused
             end
           end
 

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

@@ -50,8 +50,9 @@ module VagrantPlugins
           # remove hw association with interface
           # working for centos with lvs default disks
           options = ENV.fetch('VAGRANT_LIBVIRT_VIRT_SYSPREP_OPTIONS', '')
-          operations = ENV.fetch('VAGRANT_LIBVIRT_VIRT_SYSPREP_OPERATIONS', 'defaults,-ssh-userdir')
+          operations = ENV.fetch('VAGRANT_LIBVIRT_VIRT_SYSPREP_OPERATIONS', 'defaults,-ssh-userdir,-customize')
           `virt-sysprep --no-logfile --operations #{operations} -a #{@tmp_img} #{options}`
+          `virt-sparsify --in-place #{@tmp_img}`
           # add any user provided file
           extra = ''
           @tmp_include = @tmp_dir + '/_include'

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

@@ -86,9 +86,13 @@ module VagrantPlugins
 
         def search_network(nets, xml)
           str = '/domain/devices/interface'
-          str += "[(@type='network' or @type='udp' or @type='bridge')"
+          str += "[(@type='network' or @type='udp' or @type='bridge' or @type='direct')"
           unless nets.empty?
-            str += " and source[@network='#{nets.first['network']}']"
+            net = nets.first
+            network = net['network']
+            dev = net['dev']
+            str += " and source[@network='#{network}']" if network
+            str += " and source[@dev='#{dev}']" if dev
           end
           str += ']'
           @logger.debug(str)

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

@@ -37,12 +37,16 @@ module VagrantPlugins
               xml_descr = REXML::Document.new descr
               descr_changed = false
 
+              # For outputting XML for comparison
+              formatter = REXML::Formatters::Pretty.new
+
               # additional disk bus
               config.disks.each do |disk|
                 device = disk[:device]
                 bus = disk[:bus]
                 REXML::XPath.each(xml_descr, '/domain/devices/disk[@device="disk"]/target[@dev="' + device + '"]') do |disk_target|
                   next unless disk_target.attributes['bus'] != bus
+                  @logger.debug "disk #{device} bus updated from '#{disk_target.attributes['bus']}' to '#{bus}'"
                   descr_changed = true
                   disk_target.attributes['bus'] = bus
                   disk_target.parent.delete_element("#{disk_target.parent.xpath}/address")
@@ -52,6 +56,7 @@ module VagrantPlugins
               # disk_bus
               REXML::XPath.each(xml_descr, '/domain/devices/disk[@device="disk"]/target[@dev="vda"]') do |disk_target|
                 next unless disk_target.attributes['bus'] != config.disk_bus
+                @logger.debug "domain disk bus updated from '#{disk_target.attributes['bus']}' to '#{bus}'"
                 descr_changed = true
                 disk_target.attributes['bus'] = config.disk_bus
                 disk_target.parent.delete_element("#{disk_target.parent.xpath}/address")
@@ -61,6 +66,7 @@ module VagrantPlugins
               unless config.nic_model_type.nil?
                 REXML::XPath.each(xml_descr, '/domain/devices/interface/model') do |iface_model|
                   if iface_model.attributes['type'] != config.nic_model_type
+                    @logger.debug "network type updated from '#{iface_model.attributes['type']}' to '#{config.nic_model_type}'"
                     descr_changed = true
                     iface_model.attributes['type'] = config.nic_model_type
                   end
@@ -68,7 +74,9 @@ module VagrantPlugins
               end
 
               # vCpu count
-              if config.cpus.to_i != libvirt_domain.num_vcpus(0)
+              vcpus_count = libvirt_domain.num_vcpus(0)
+              if config.cpus.to_i != vcpus_count
+                @logger.debug "cpu count updated from '#{vcpus_count}' to '#{config.cpus}'"
                 descr_changed = true
                 REXML::XPath.first(xml_descr, '/domain/vcpu').text = config.cpus
               end
@@ -76,11 +84,13 @@ module VagrantPlugins
               # cpu_mode
               cpu = REXML::XPath.first(xml_descr, '/domain/cpu')
               if cpu.nil?
+                @logger.debug "cpu_mode updated from not set to '#{config.cpu_mode}'"
                 descr_changed = true
                 cpu = REXML::Element.new('cpu', REXML::XPath.first(xml_descr, '/domain'))
                 cpu.attributes['mode'] = config.cpu_mode
               else
                 if cpu.attributes['mode'] != config.cpu_mode
+                  @logger.debug "cpu_mode updated from '#{cpu.attributes['mode']}' to '#{config.cpu_mode}'"
                   descr_changed = true
                   cpu.attributes['mode'] = config.cpu_mode
                 end
@@ -89,16 +99,19 @@ module VagrantPlugins
               if config.cpu_mode != 'host-passthrough'
                 cpu_model = REXML::XPath.first(xml_descr, '/domain/cpu/model')
                 if cpu_model.nil?
+                  @logger.debug "cpu_model updated from not set to '#{config.cpu_model}'"
                   descr_changed = true
                   cpu_model = REXML::Element.new('model', REXML::XPath.first(xml_descr, '/domain/cpu'))
                   cpu_model.attributes['fallback'] = 'allow'
                   cpu_model.text = config.cpu_model
                 else
-                  if cpu_model.text.strip != config.cpu_model.strip
+                  if (cpu_model.text or '').strip != config.cpu_model.strip
+                    @logger.debug "cpu_model text updated from #{cpu_model.text} to '#{config.cpu_model}'"
                     descr_changed = true
                     cpu_model.text = config.cpu_model
                   end
                   if cpu_model.attributes['fallback'] != config.cpu_fallback
+                    @logger.debug "cpu_model fallback attribute updated from #{cpu_model.attributes['fallback']} to '#{config.cpu_fallback}'"
                     descr_changed = true
                     cpu_model.attributes['fallback'] = config.cpu_fallback
                   end
@@ -107,12 +120,14 @@ module VagrantPlugins
                 svm_feature = REXML::XPath.first(xml_descr, '/domain/cpu/feature[@name="svm"]')
                 if config.nested
                   if vmx_feature.nil?
+                    @logger.debug "nested mode enabled from unset by setting cpu vmx feature"
                     descr_changed = true
                     vmx_feature = REXML::Element.new('feature', REXML::XPath.first(xml_descr, '/domain/cpu'))
                     vmx_feature.attributes['policy'] = 'optional'
                     vmx_feature.attributes['name'] = 'vmx'
                   end
                   if svm_feature.nil?
+                    @logger.debug "nested mode enabled from unset by setting cpu svm feature"
                     descr_changed = true
                     svm_feature = REXML::Element.new('feature', REXML::XPath.first(xml_descr, '/domain/cpu'))
                     svm_feature.attributes['policy'] = 'optional'
@@ -120,16 +135,19 @@ module VagrantPlugins
                   end
                 else
                   unless vmx_feature.nil?
+                    @logger.debug "nested mode disabled for cpu by removing vmx feature"
                     descr_changed = true
                     cpu.delete_element(vmx_feature)
                   end
                   unless svm_feature.nil?
+                    @logger.debug "nested mode disabled for cpu by removing svm feature"
                     descr_changed = true
                     cpu.delete_element(svm_feature)
                   end
                 end
               elsif config.numa_nodes == nil
                 unless cpu.elements.to_a.empty?
+                  @logger.debug "switching cpu_mode to host-passthrough and removing emulated cpu features"
                   descr_changed = true
                   cpu.elements.each do |elem|
                     cpu.delete_element(elem)
@@ -137,6 +155,34 @@ module VagrantPlugins
                 end
               end
 
+              # Clock
+              clock = REXML::XPath.first(xml_descr, '/domain/clock')
+              if clock.attributes['offset'] != config.clock_offset
+                @logger.debug "clock offset changed"
+                descr_changed = true
+                clock.attributes['offset'] = config.clock_offset
+              end
+
+              # clock timers - because timers can be added/removed, just rebuild and then compare
+              if !config.clock_timers.empty? || clock.has_elements?
+                oldclock = ''
+                formatter.write(REXML::XPath.first(xml_descr, '/domain/clock'), oldclock)
+                clock.delete_element('//timer')
+                config.clock_timers.each do |clock_timer|
+                  timer = REXML::Element.new('timer', clock)
+                  clock_timer.each do |attr, value|
+                    timer.attributes[attr.to_s] = value
+                  end
+                end
+
+                newclock = ''
+                formatter.write(clock, newclock)
+                unless newclock.eql? oldclock
+                  @logger.debug "clock timers config changed"
+                  descr_changed = true
+                end
+              end
+
               # Graphics
               graphics = REXML::XPath.first(xml_descr, '/domain/devices/graphics')
               if config.graphics_type != 'none'
@@ -178,31 +224,31 @@ module VagrantPlugins
               end
 
               # TPM
-              if config.tpm_path
-                raise Errors::FogCreateServerError, 'The TPM Path must be fully qualified' unless config.tpm_path[0].chr == '/'
+              if [config.tpm_path, config.tpm_version].any?
+                if config.tpm_path
+                  raise Errors::FogCreateServerError, 'The TPM Path must be fully qualified' unless config.tpm_path[0].chr == '/'
+                end
 
-                tpm = REXML::XPath.first(xml_descr, '/domain/devices/tpm')
-                if tpm.nil?
+                # just build the tpm element every time
+                # check at the end if it is different
+                oldtpm = REXML::XPath.first(xml_descr, '/domain/devices/tpm')
+                REXML::XPath.first(xml_descr, '/domain/devices').delete_element("tpm")
+                newtpm = REXML::Element.new('tpm', REXML::XPath.first(xml_descr, '/domain/devices'))
+
+                newtpm.attributes['model'] = config.tpm_model
+                backend = newtpm.add_element('backend')
+                backend.attributes['type'] = config.tpm_type
+
+                case config.tpm_type
+                when 'emulator'
+                  backend.attributes['version'] = config.tpm_version
+                when 'passthrough'
+                  backend.add_element('device').attributes['path'] = config.tpm_path
+                end
+
+                unless "'#{newtpm}'".eql? "'#{oldtpm}'"
+                  @logger.debug "tpm config changed"
                   descr_changed = true
-                  tpm = REXML::Element.new('tpm', REXML::XPath.first(xml_descr, '/domain/devices/tpm/model'))
-                  tpm.attributes['model'] = config.tpm_model
-                  tpm_backend_type = tpm.add_element('backend')
-                  tpm_backend_type.attributes['type'] = config.tpm_type
-                  tpm_device_path = tpm_backend_type.add_element('device')
-                  tpm_device_path.attributes['path'] = config.tpm_path
-                else
-                  if tpm.attributes['model'] != config.tpm_model
-                    descr_changed = true
-                    tpm.attributes['model'] = config.tpm_model
-                  end
-                  if tpm.elements['backend'].attributes['type'] != config.tpm_type
-                    descr_changed = true
-                    tpm.elements['backend'].attributes['type'] = config.tpm_type
-                  end
-                  if tpm.elements['backend'].elements['device'].attributes['path'] != config.tpm_path
-                    descr_changed = true
-                    tpm.elements['backend'].elements['device'].attributes['path'] = config.tpm_path
-                  end
                 end
               end
 
@@ -210,16 +256,21 @@ module VagrantPlugins
               video = REXML::XPath.first(xml_descr, '/domain/devices/video')
               if !video.nil? && (config.graphics_type == 'none')
                 # graphics_type = none, video devices are removed since there is no possible output
+                @logger.debug "deleting video elements as config.graphics_type is none"
                 descr_changed = true
                 video.parent.delete_element(video)
               else
                 video_model = REXML::XPath.first(xml_descr, '/domain/devices/video/model')
                 if video_model.nil?
+                  @logger.debug "video updated from not set to type '#{config.video_type}' and vram '#{config.video_vram}'"
+                  descr_changed = true
                   video_model = REXML::Element.new('model', REXML::XPath.first(xml_descr, '/domain/devices/video'))
                   video_model.attributes['type'] = config.video_type
                   video_model.attributes['vram'] = config.video_vram
                 else
-                  if video_model.attributes['type'] != config.video_type || video_model.attributes['vram'] != config.video_vram
+                  if video_model.attributes['type'] != config.video_type || video_model.attributes['vram'] != config.video_vram.to_s
+                    @logger.debug "video type updated from '#{video_model.attributes['type']}' to '#{config.video_type}'"
+                    @logger.debug "video vram updated from '#{video_model.attributes['vram']}' to '#{config.video_vram}'"
                     descr_changed = true
                     video_model.attributes['type'] = config.video_type
                     video_model.attributes['vram'] = config.video_vram
@@ -237,11 +288,13 @@ module VagrantPlugins
               if config.dtb
                 dtb = REXML::XPath.first(xml_descr, '/domain/os/dtb')
                 if dtb.nil?
+                  @logger.debug "dtb updated from not set to '#{config.dtb}'"
                   descr_changed = true
                   dtb = REXML::Element.new('dtb', REXML::XPath.first(xml_descr, '/domain/os'))
                   dtb.text = config.dtb
                 else
-                  if dtb.text != config.dtb
+                  if (dtb.text or '') != config.dtb
+                    @logger.debug "dtb updated from '#{dtb.text}' to '#{config.dtb}'"
                     descr_changed = true
                     dtb.text = config.dtb
                   end
@@ -252,11 +305,13 @@ module VagrantPlugins
               if config.kernel
                 kernel = REXML::XPath.first(xml_descr, '/domain/os/kernel')
                 if kernel.nil?
+                  @logger.debug "kernel updated from not set to '#{config.kernel}'"
                   descr_changed = true
                   kernel = REXML::Element.new('kernel', REXML::XPath.first(xml_descr, '/domain/os'))
                   kernel.text = config.kernel
                 else
-                  if kernel.text != config.kernel
+                  if (kernel.text or '').strip != config.kernel
+                    @logger.debug "kernel updated from '#{kernel.text}' to '#{config.kernel}'"
                     descr_changed = true
                     kernel.text = config.kernel
                   end
@@ -265,11 +320,13 @@ module VagrantPlugins
               if config.initrd
                 initrd = REXML::XPath.first(xml_descr, '/domain/os/initrd')
                 if initrd.nil?
+                  @logger.debug "initrd updated from not set to '#{config.initrd}'"
                   descr_changed = true
                   initrd = REXML::Element.new('initrd', REXML::XPath.first(xml_descr, '/domain/os'))
                   initrd.text = config.initrd
                 else
-                  if initrd.text != config.initrd
+                  if (initrd.text or '').strip != config.initrd
+                    @logger.debug "initrd updated from '#{initrd.text}' to '#{config.initrd}'"
                     descr_changed = true
                     initrd.text = config.initrd
                   end