vagrant-libvirt 0.10.7 → 0.11.1

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

@@ -87,79 +87,83 @@ module VagrantPlugins
           end
 
           # 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}'"
+          if !config.cpu_mode.nil?
+            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
-            end
-          end
-
-          if config.cpu_mode != 'host-passthrough'
-            cpu_model = REXML::XPath.first(xml_descr, '/domain/cpu/model')
-            if cpu_model.nil?
-              if config.cpu_model.strip != ''
-                @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
-              end
             else
-              if (cpu_model.text or '').strip != config.cpu_model.strip
-                @logger.debug "cpu_model text updated from #{cpu_model.text} to '#{config.cpu_model}'"
+              if cpu.attributes['mode'] != config.cpu_mode
+                @logger.debug "cpu_mode updated from '#{cpu.attributes['mode']}' to '#{config.cpu_mode}'"
                 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
+                cpu.attributes['mode'] = config.cpu_mode
               end
             end
-            vmx_feature = REXML::XPath.first(xml_descr, '/domain/cpu/feature[@name="vmx"]')
-            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'
-                svm_feature.attributes['name'] = 'svm'
+
+            if config.cpu_mode != 'host-passthrough'
+              cpu_model = REXML::XPath.first(xml_descr, '/domain/cpu/model')
+              if cpu_model.nil?
+                if config.cpu_model.strip != ''
+                  @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'] = config.cpu_fallback
+                  cpu_model.text = config.cpu_model
+                end
+              else
+                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
               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)
+              vmx_feature = REXML::XPath.first(xml_descr, '/domain/cpu/feature[@name="vmx"]')
+              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'
+                  svm_feature.attributes['name'] = 'svm'
+                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
-              unless svm_feature.nil?
-                @logger.debug "nested mode disabled for cpu by removing svm feature"
+            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.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)
+                cpu.elements.each do |elem|
+                  cpu.delete_element(elem)
+                end
               end
             end
+          else
+            xml_descr.delete_element('/domain/cpu')
           end
 
           # Clock
@@ -190,6 +194,68 @@ module VagrantPlugins
             end
           end
 
+          # Launch security
+          launchSecurity = REXML::XPath.first(xml_descr, '/domain/launchSecurity')
+          unless config.launchsecurity_data.nil?
+            if launchSecurity.nil?
+              @logger.debug "Launch security has been added"
+              launchSecurity = REXML::Element.new('launchSecurity', REXML::XPath.first(xml_descr, '/domain'))
+              descr_changed = true
+            end
+
+            if launchSecurity.attributes['type'] != config.launchsecurity_data[:type]
+              launchSecurity.attributes['type'] = config.launchsecurity_data[:type]
+              descr_changed = true
+            end
+
+            [:cbitpos, :policy, :reducedPhysBits].each do |setting|
+              setting_value = config.launchsecurity_data[setting]
+              element = REXML::XPath.first(launchSecurity, setting.to_s)
+              if !setting_value.nil?
+                if element.nil?
+                  element = launchSecurity.add_element(setting.to_s)
+                  descr_changed = true
+                end
+
+                if element.text != setting_value
+                  @logger.debug "launchSecurity #{setting.to_s} config changed"
+                  element.text = setting_value
+                  descr_changed = true
+                end
+              else
+                if !element.nil?
+                  launchSecurity.delete_element(setting.to_s)
+                  descr_changed = true
+                end
+              end
+            end
+
+            controllers = REXML::XPath.each( xml_descr, '/domain/devices/controller')
+            memballoon = REXML::XPath.each( xml_descr, '/domain/devices/memballoon')
+            [controllers, memballoon].lazy.flat_map(&:lazy).each do |controller|
+              driver_node = REXML::XPath.first(controller, 'driver')
+              driver_node = controller.add_element('driver') if driver_node.nil?
+              descr_changed = true if driver_node.attributes['iommu'] != 'on'
+              driver_node.attributes['iommu'] = 'on'
+            end
+          else
+            unless launchSecurity.nil?
+              @logger.debug "Launch security to be deleted"
+
+              descr_changed = true
+
+              launchSecurity.parent.delete_element(launchSecurity)
+            end
+
+            REXML::XPath.each( xml_descr, '/domain/devices/controller') do | controller |
+              driver_node = REXML::XPath.first(controller, 'driver')
+              if !driver_node.nil?
+                descr_changed = true if driver_node.attributes['iommu']
+                driver_node.attributes.delete('iommu')
+              end
+            end
+          end
+
           # Graphics
           graphics = REXML::XPath.first(xml_descr, '/domain/devices/graphics')
           if config.graphics_type != 'none'
@@ -214,6 +280,10 @@ module VagrantPlugins
                 graphics.attributes['port'] = config.graphics_port
               end
             end
+            if graphics.attributes['websocket'] != config.graphics_websocket.to_s
+              descr_changed = true
+              graphics.attributes['websocket'] = config.graphics_websocket
+            end
             if graphics.attributes['keymap'] != config.keymap
               descr_changed = true
               graphics.attributes['keymap'] = config.keymap
@@ -429,9 +499,20 @@ module VagrantPlugins
               raise Errors::UpdateServerError, error_message: e.message
             end
 
+            # this normalises the attribute order to be the same as what was sent in the above
+            # request to update the domain XML. Without this, if the XML documents are not
+            # equivalent, many more differences will be reported than there actually are.
+            applied_xml = String.new
+            REXML::Document.new(libvirt_domain.xml_desc(1)).write(applied_xml)
+
             # need to check whether the updated XML contains all the changes requested
             proposed = VagrantPlugins::ProviderLibvirt::Util::Xml.new(new_xml)
-            applied = VagrantPlugins::ProviderLibvirt::Util::Xml.new(libvirt_domain.xml_desc(1))
+            applied = VagrantPlugins::ProviderLibvirt::Util::Xml.new(applied_xml)
+
+            # perform some sorting to allow comparison otherwise order of devices differing
+            # even if they are equivalent will be reported as being different.
+            proposed.xml['devices'][0].each { |_, v| next unless v.is_a?(Array); v.sort_by! { |e| [e['type'], e['index']]} }
+            applied.xml['devices'][0].each { |_, v| next unless v.is_a?(Array); v.sort_by! { |e| [e['type'], e['index']]} }
 
             if proposed != applied
               require 'diffy'
@@ -467,6 +548,23 @@ module VagrantPlugins
             raise Errors::DomainStartError, error_message: e.message
           end
 
+          #libvirt_domain = env[:machine].provider.driver.connection.client.lookup_domain_by_uuid(env[:machine].id)
+          xmldoc = REXML::Document.new(libvirt_domain.xml_desc)
+          graphics = REXML::XPath.first(xmldoc, '/domain/devices/graphics')
+
+          if !graphics.nil?
+            if config.graphics_autoport
+              env[:ui].info(I18n.t('vagrant_libvirt.starting_domain_with_graphics'))
+              env[:ui].info(" -- Graphics Port:      #{graphics.attributes['port']}")
+              env[:ui].info(" -- Graphics IP:        #{graphics.attributes['listen']}")
+              env[:ui].info(" -- Graphics Password:  #{config.graphics_passwd.nil? ? 'Not defined' : 'Defined'}")
+            end
+
+            if config.graphics_websocket == -1
+              env[:ui].info(" -- Graphics Websocket: #{graphics.attributes['websocket']}")
+            end
+          end
+
           @app.call(env)
         end
       end

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

@@ -23,7 +23,7 @@ module VagrantPlugins
           env[:metrics] ||= {}
 
           driver = env[:machine].provider.driver
-          domain = driver.get_domain(env[:machine])
+          domain = driver.get_domain
 
           if domain.nil?
             raise Errors::NoDomainError,
@@ -42,7 +42,7 @@ module VagrantPlugins
               return if env[:interrupted]
 
               # Wait for domain to obtain an ip address
-              env[:ip_address] = driver.get_domain_ipaddress(env[:machine], domain)
+              env[:ip_address] = driver.get_ipaddress(domain)
             end
           end
           @logger.info("Got IP address #{env[:ip_address]}")

data/lib/vagrant-libvirt/action.rb

@@ -52,7 +52,6 @@ module VagrantPlugins
       autoload :StartDomain, action_root.join('start_domain')
       autoload :StartShutdownTimer, action_root.join('shutdown_domain')
       autoload :SuspendDomain, action_root.join('suspend_domain')
-      autoload :TimedProvision, action_root.join('timed_provision')
       autoload :WaitTillUp, action_root.join('wait_till_up')
 
       autoload :Package, 'vagrant/action/general/package'
@@ -94,8 +93,6 @@ module VagrantPlugins
                 b2.use CreateNetworkInterfaces
 
                 b2.use action_start
-
-                b2.use SetupComplete
               else
                 b2.use HandleStoragePool
                 require 'vagrant/action/builtin/handle_box'
@@ -112,6 +109,7 @@ module VagrantPlugins
                 b2.use SetHostname
               end
             else
+              # start VM if halted
               env[:halt_on_error] = true
               b2.use ResolveDiskSettings
               b2.use CreateNetworks
@@ -129,7 +127,6 @@ module VagrantPlugins
       # poweroff state.
       private_class_method def self.action_start
         Vagrant::Action::Builder.new.tap do |b|
-          b.use ConfigValidate
           b.use Call, IsRunning do |env, b2|
             # If the VM is running, run the necessary provisioners
             if env[:result]
@@ -138,16 +135,19 @@ module VagrantPlugins
             end
 
             b2.use Call, IsSuspended do |env2, b3|
-              # if vm is suspended resume it then exit
+              # if vm is suspended resume it
               if env2[:result]
                 b3.use ResumeDomain
-                next
-              end
 
-              if !env[:machine].config.vm.box
+                # if there was a box, want to wait until the communicator is
+                # available and then forward ports
+                next if !env[:machine].config.vm.box
+              elsif !env[:machine].config.vm.box
                 # With no box, we just care about network creation and starting it
                 b3.use SetBootOrder
                 b3.use StartDomain
+
+                next
               else
                 # VM is not running or suspended.
                 b3.use PrepareNFSValidIds
@@ -165,11 +165,12 @@ module VagrantPlugins
                 # Machine should gain IP address when coming up,
                 # so wait for dhcp lease and store IP into machines data_dir.
                 b3.use WaitTillUp
-                require 'vagrant/action/builtin/wait_for_communicator'
-                b3.use WaitForCommunicator, [:running]
-
-                b3.use ForwardPorts
               end
+
+              require 'vagrant/action/builtin/wait_for_communicator'
+              b3.use WaitForCommunicator, [:running]
+
+              b3.use ForwardPorts
             end
           end
         end
@@ -216,15 +217,17 @@ module VagrantPlugins
       # It uses the halt and start actions
       def self.action_reload
         Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
           b.use Call, IsCreated do |env, b2|
             unless env[:result]
               b2.use MessageNotCreated
               next
             end
 
-            b2.use ConfigValidate
             b2.use Provision
             b2.use action_halt
+
+            b2.use ResolveDiskSettings
             b2.use action_start
           end
         end
@@ -339,6 +342,7 @@ module VagrantPlugins
                 b3.use MessageNotRunning
                 next
               end
+              b3.use ClearForwardedPorts
               b3.use SuspendDomain
             end
           end
@@ -366,6 +370,7 @@ module VagrantPlugins
               b3.use Provision
               require 'vagrant/action/builtin/wait_for_communicator'
               b3.use WaitForCommunicator, [:running]
+              b3.use ForwardPorts
             end
           end
         end

data/lib/vagrant-libvirt/cap/mount_9p.rb

@@ -23,7 +23,15 @@ module VagrantPlugins
             mount_tag = Digest::MD5.new.update(opts[:hostpath]).to_s[0, 31]
 
             mount_opts = '-o trans=virtio'
-            mount_opts += ",access=#{opts[:owner]}" if opts[:owner]
+            mount_opts += ",access=#{opts[:access]}" if opts[:access]
+            if opts[:owner]
+              if opts[:access]
+                machine.ui.warn('deprecated `:owner` option ignored as replacement `:access` option already set, please update your Vagrantfile and remove the `:owner` option to prevent this warning.')
+              else
+                machine.ui.warn('`:owner` option for 9p mount options deprecated in favour of `:access`, please update your Vagrantfile and replace `:owner` with `:access`')
+                mount_opts += ",access=#{opts[:owner]}"
+              end
+            end
             mount_opts += ",version=#{opts[:version]}" if opts[:version]
             mount_opts += ",#{opts[:mount_opts]}" if opts[:mount_opts]
 

data/lib/vagrant-libvirt/cap/snapshots.rb

@@ -4,7 +4,7 @@ module VagrantPlugins
       class Snapshots
         def self.snapshot_list(machine)
           return if machine.state.id == :not_created
-          machine.provider.driver.list_snapshots(machine)
+          machine.provider.driver.list_snapshots
         end
       end
     end