vagrant-libvirt 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1bfaefd1dab7cbdb1293e867e29fef05a9eb101fae5226a38203593de84e717
-  data.tar.gz: d36d4f487ed2ad0b4f00ba09c263a5cd8deda6c268eef50974376e2796b7e64d
+  metadata.gz: 79027c1097a7e8136b8d56f74fd0b27932bf17c48387de84c57626c2bd348714
+  data.tar.gz: cd6acea3cf183191ea6bbee6e60d7a1fc76a5f0b556f273f60657238283841ce
 SHA512:
-  metadata.gz: 510c1b6ffd2fb4eea02ede8d7612c3a41a89e5c50b630370bec6fd70b79986caa222e6ce1cc0f4c2732b310f7c134866aa2283ee449441c92078b148c4734503
-  data.tar.gz: cb6ab754dcff508ec150c6ff67cf82b603243596b35ab6a5ef79d4dfe36042a933dde8eebc3630d5a2473c8fcd398111a98d12a64a66950ad0abe942c15bce40
+  metadata.gz: 6d6483a73ce398e6fd057b2fc0503392c628ad1fc228d9d954b9a5e31d9a65ab883c25f30cb9360ce5eff46554492dd010b68d741f3c8935e64228207bf2f210
+  data.tar.gz: 1a083a93899bb48d4d750aa8967bdcb8e6b1b0b9a8fb0d88c912097444cd202c52fe0330f81a1e4803dde184b06e035c8bd8d32397035c186653b978db790e12

data/README.md

@@ -353,11 +353,11 @@ into_srpm.sh -d c8s
 cd SRPMS
 
 # common commands (make sure to adjust verison accordingly)
-rpm2cpio libssh-0.9.0-5.fc30.src.rpm | cpio -imdV
-tar xf libssh-0.9.0.tar.xz
+rpm2cpio libssh-0.9.4-1c8s.src.rpm | cpio -imdV
+tar xf libssh-0.9.4.tar.xz
 mkdir build
 cd build
-cmake ../libssh-0.9.0 -DOPENSSL_ROOT_DIR=/opt/vagrant/embedded/
+cmake ../libssh-0.9.4 -DOPENSSL_ROOT_DIR=/opt/vagrant/embedded/
 make
 sudo cp lib/libssh* /opt/vagrant/embedded/lib64
 ```
@@ -376,18 +376,21 @@ dnf download --source krb5-libs
 
 # centos 8 stream, doesn't provide source RPMs, so you need to download like so
 git clone https://git.centos.org/centos-git-common
+# make get_sources.sh executable as it is needed in krb5
+chmod +x centos-git-common/get_sources.sh 
 # centos-git-common needs its tools in PATH
 export PATH=$(readlink -f ./centos-git-common):$PATH
 git clone https://git.centos.org/rpms/krb5
 cd krb5
 git checkout imports/c8s/krb5-1.18.2-8.el8
+get_sources.sh
 into_srpm.sh -d c8s
 cd SRPMS
 
 # common commands (make sure to adjust verison accordingly)
-rpm2cpio krb5-1.18-1.fc32.src.rpm | cpio -imdV
-tar xf krb5-1.18.tar.gz
-cd krb5-1.18/src
+rpm2cpio krb5-1.18.2-8c8s.src.rpm | cpio -imdV
+tar xf krb5-1.18.2.tar.gz
+cd krb5-1.18.2/src
 ./configure
 make
 sudo cp -P lib/crypto/libk5crypto.* /opt/vagrant/embedded/lib64/

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

@@ -16,20 +16,6 @@ module VagrantPlugins
           @app = app
         end
 
-        def _disk_name(name, disk)
-          "#{name}-#{disk[:device]}.#{disk[:type]}" # disk name
-        end
-
-        def _disks_print(disks)
-          disks.collect do |x|
-            "#{x[:device]}(#{x[:type]}, #{x[:bus]}, #{x[:size]})"
-          end.join(', ')
-        end
-
-        def _cdroms_print(cdroms)
-          cdroms.collect { |x| x[:dev] }.join(', ')
-        end
-
         def call(env)
           # Get config.
           config = env[:machine].provider_config
@@ -58,8 +44,6 @@ module VagrantPlugins
           @nvram = config.nvram
           @machine_type = config.machine_type
           @machine_arch = config.machine_arch
-          @disk_bus = config.disk_bus
-          @disk_device = config.disk_device
           @disk_driver_opts = config.disk_driver_opts
           @nested = config.nested
           @memory_size = config.memory.to_i * 1024
@@ -94,9 +78,8 @@ module VagrantPlugins
 
           # Storage
           @storage_pool_name = config.storage_pool_name
-          @snapshot_pool_name = config.snapshot_pool_name
-          @domain_volumes = []
-          @disks = config.disks
+          @domain_volumes = env[:domain_volumes] || []
+          @disks = env[:disks] || []
           @cdroms = config.cdroms
 
           # Input
@@ -139,77 +122,19 @@ module VagrantPlugins
           @memballoon_pci_bus = config.memballoon_pci_bus
           @memballoon_pci_slot = config.memballoon_pci_slot
 
-          config = env[:machine].provider_config
           @domain_type = config.driver
 
           @os_type = 'hvm'
 
-          resolver = ::VagrantPlugins::ProviderLibvirt::Util::DiskDeviceResolver.new(prefix=@disk_device[0..1])
-
-          # Get path to domain image from the storage pool selected if we have a box.
-          if env[:machine].config.vm.box
-            if @snapshot_pool_name != @storage_pool_name
-                pool_name = @snapshot_pool_name
-            else
-                pool_name = @storage_pool_name
-            end
-
-            # special handling for domain volume
-            env[:box_volumes][0][:device] = env[:box_volumes][0].fetch(:device, @disk_device)
-
-            resolver.resolve!(env[:box_volumes])
-
-            @logger.debug "Search for volumes in pool: #{pool_name}"
-            env[:box_volumes].each_index do |index|
-              suffix_index = index > 0 ? "_#{index}" : ''
-              domain_volume = env[:machine].provider.driver.connection.volumes.all(
-                name: "#{@name}#{suffix_index}.img"
-              ).find { |x| x.pool_name == pool_name }
-              raise Errors::DomainVolumeExists if domain_volume.nil?
-
-              @domain_volumes.push({
-                :dev => env[:box_volumes][index][:device],
-                :cache => @domain_volume_cache,
-                :bus => @disk_bus,
-                :path => domain_volume.path,
-                :virtual_size => env[:box_volumes][index][:virtual_size]
-              })
-            end
-
+          env[:domain_volumes].each_with_index do |vol, index|
+            suffix_index = index > 0 ? "_#{index}" : ''
+            domain_volume = env[:machine].provider.driver.connection.volumes.all(
+              name: "#{@name}#{suffix_index}.img"
+            ).find { |x| x.pool_name == vol[:pool] }
+            raise Errors::NoDomainVolume if domain_volume.nil?
           end
 
-          # If we have a box, take the path from the domain volume and set our storage_prefix.
-          # If not, we dump the storage pool xml to get its defined path.
-          # the default storage prefix is typically: /var/lib/libvirt/images/
-          if env[:machine].config.vm.box
-            storage_prefix = File.dirname(@domain_volumes[0][:path]) + '/' # steal
-          else
-            storage_prefix = get_disk_storage_prefix(env, @storage_pool_name)
-          end
-
-          resolver.resolve!(@disks)
-
           @disks.each do |disk|
-            disk[:path] ||= _disk_name(@name, disk)
-
-            # On volume creation, the <path> element inside <target>
-            # is oddly ignored; instead the path is taken from the
-            # <name> element:
-            # http://www.redhat.com/archives/libvir-list/2008-August/msg00329.html
-            disk[:name] = disk[:path]
-
-            disk[:absolute_path] = storage_prefix + disk[:path]
-
-            if not disk[:pool].nil?
-              disk_pool_name = disk[:pool]
-              @logger.debug "Overriding pool name with: #{disk_pool_name}"
-              disk_storage_prefix = get_disk_storage_prefix(env, disk_pool_name)
-              disk[:absolute_path] = disk_storage_prefix + disk[:path]
-              @logger.debug "Overriding disk path with: #{disk[:absolute_path]}"
-            else
-              disk_pool_name = @storage_pool_name
-            end
-
             # make the disk. equivalent to:
             # qemu-img create -f qcow2 <path> 5g
             begin
@@ -221,13 +146,13 @@ module VagrantPlugins
                 owner: storage_uid(env),
                 group: storage_gid(env),
                 #:allocation => ?,
-                pool_name: disk_pool_name
+                pool_name: disk[:pool],
               )
             rescue Libvirt::Error => e
               # It is hard to believe that e contains just a string
               # and no useful error code!
               msg = "Call to virStorageVolCreateXML failed: " +
-                    "storage volume '#{disk[:path]}' exists already"
+                    "storage volume '#{disk[:absolute_path]}' exists already"
               if e.message == msg and disk[:allow_existing]
                 disk[:preexisting] = true
               else
@@ -300,7 +225,7 @@ module VagrantPlugins
           end
           env[:ui].info(" -- Storage pool:      #{@storage_pool_name}")
           @domain_volumes.each do |volume|
-            env[:ui].info(" -- Image(#{volume[:dev]}):        #{volume[:path]}, #{volume[:bus]}, #{volume[:virtual_size].to_GB}G")
+            env[:ui].info(" -- Image(#{volume[:device]}):        #{volume[:absolute_path]}, #{volume[:bus]}, #{volume[:virtual_size].to_GB}G")
           end
 
           if not @disk_driver_opts.empty?
@@ -466,11 +391,14 @@ module VagrantPlugins
         end
 
         private
-        def get_disk_storage_prefix(env, disk_pool_name)
-          disk_storage_pool = env[:machine].provider.driver.connection.client.lookup_storage_pool_by_name(disk_pool_name)
-          raise Errors::NoStoragePool if disk_storage_pool.nil?
-          xml = Nokogiri::XML(disk_storage_pool.xml_desc)
-          disk_storage_prefix = xml.xpath('/pool/target/path').inner_text.to_s + '/'
+        def _disks_print(disks)
+          disks.collect do |x|
+            "#{x[:device]}(#{x[:type]}, #{x[:bus]}, #{x[:size]})"
+          end.join(', ')
+        end
+
+        def _cdroms_print(cdroms)
+          cdroms.collect { |x| x[:dev] }.join(', ')
         end
       end
     end

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

@@ -1,7 +1,12 @@
 # frozen_string_literal: true
 
 require 'log4r'
-require 'rexml'
+
+begin
+  require 'rexml'
+rescue LoadError
+  require 'rexml/rexml'
+end
 
 module VagrantPlugins
   module ProviderLibvirt
@@ -43,21 +48,24 @@ module VagrantPlugins
 
           domain = env[:machine].provider.driver.connection.servers.get(env[:machine].id.to_s)
 
+          undefine_flags = 0
+          undefine_flags |= ProviderLibvirt::Util::DomainFlags::VIR_DOMAIN_UNDEFINE_KEEP_NVRAM if env[:machine].provider_config.nvram
+
           if env[:machine].provider_config.disks.empty? &&
              env[:machine].provider_config.cdroms.empty?
             # if using default configuration of disks and cdroms
             # cdroms are consider volumes, but cannot be destroyed
-            domain.destroy(destroy_volumes: true)
+            destroy_domain(domain, destroy_volumes: true, flags: undefine_flags)
           else
             domain_xml = libvirt_domain.xml_desc(1)
             xml_descr = REXML::Document.new(domain_xml)
             disks_xml = REXML::XPath.match(xml_descr, '/domain/devices/disk[@device="disk"]')
             have_aliases = !(REXML::XPath.match(disks_xml, './alias[@name="ua-box-volume-0"]').first).nil?
             if !have_aliases
-              env[:ui].warn(I18n.t('vagrant_libvirt.destroy.obsolete_method'))
+              env[:ui].warn(I18n.t('vagrant_libvirt.domain_xml.obsolete_method'))
             end
 
-            domain.destroy(destroy_volumes: false)
+            destroy_domain(domain, destroy_volumes: false, flags: undefine_flags)
 
             volumes = domain.volumes
 
@@ -164,6 +172,14 @@ module VagrantPlugins
             libvirt_disk.destroy if libvirt_disk
           end
         end
+
+        def destroy_domain(domain, destroy_volumes:, flags:)
+          if domain.method(:destroy).parameters.first.include?(:flags)
+            domain.destroy(destroy_volumes: destroy_volumes, flags: flags)
+          else
+            domain.destroy(destroy_volumes: destroy_volumes)
+          end
+        end
       end
     end
   end

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

@@ -68,7 +68,7 @@ module VagrantPlugins
             # Shutdown network first.
             # Undefine network.
             begin
-              libvirt_network.destroy
+              libvirt_network.destroy if libvirt_network.active?
               libvirt_network.undefine
               @logger.info 'Undefined it'
             rescue => e

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

@@ -104,6 +104,8 @@ module VagrantPlugins
           end
           # save for use by later actions
           env[:box_volumes][0][:virtual_size] = box_virtual_size
+          # special handling for domain volume
+          env[:box_volumes][0][:device] ||= config.disk_device
 
           # while inside the synchronize block take care not to call the next
           # action in the chain, as must exit this block first to prevent

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

@@ -0,0 +1,174 @@
+# frozen_string_literal: true
+
+require 'log4r'
+require 'rexml'
+
+require 'vagrant-libvirt/util/resolvers'
+
+module VagrantPlugins
+  module ProviderLibvirt
+    module Action
+      class ResolveDiskSettings
+        def initialize(app, _env)
+          @logger = Log4r::Logger.new('vagrant_libvirt::action::resolve_disk_devices')
+          @app = app
+        end
+
+        def call(env)
+          # Get config.
+          config = env[:machine].provider_config
+
+          domain_name = env[:domain_name] # only set on create
+          disk_bus = config.disk_bus
+          disk_device = config.disk_device
+          domain_volume_cache = config.volume_cache || 'default'
+
+          # Storage
+          storage_pool_name = config.storage_pool_name
+          snapshot_pool_name = config.snapshot_pool_name
+          domain_volumes = []
+          disks = config.disks.dup
+
+          resolver = ::VagrantPlugins::ProviderLibvirt::Util::DiskDeviceResolver.new(disk_device[0..1])
+
+          # Get path to domain image from the storage pool selected if we have a box.
+          if env[:machine].config.vm.box
+            pool_name = if snapshot_pool_name == storage_pool_name
+                          storage_pool_name
+                        else
+                          snapshot_pool_name
+                        end
+
+            if env[:box_volumes].nil?
+              # domain must be already created, need to read domain volumes from domain XML
+              libvirt_domain = env[:machine].provider.driver.connection.client.lookup_domain_by_uuid(
+                env[:machine].id
+              )
+              domain_xml = libvirt_domain.xml_desc(1)
+              xml_descr = REXML::Document.new(domain_xml)
+              domain_name = xml_descr.elements['domain'].elements['name'].text
+              disks_xml = REXML::XPath.match(xml_descr, '/domain/devices/disk[@device="disk"]')
+              have_aliases = !REXML::XPath.match(disks_xml, './alias[@name="ua-box-volume-0"]').first.nil?
+              env[:ui].warn(I18n.t('vagrant_libvirt.domain_xml.obsolete_method')) unless have_aliases
+
+              if have_aliases
+                REXML::XPath.match(disks_xml,
+                                   './alias[contains(@name, "ua-box-volume-")]').each_with_index do |alias_xml, idx|
+                  domain_volumes.push(volume_from_xml(alias_xml.parent, domain_name, idx))
+                end
+              else
+                # fallback to try and infer which boxes are box images, as they are listed first
+                # as soon as there is no match, can exit
+                disks_xml.each_with_index do |box_disk_xml, idx|
+                  diskname = box_disk_xml.elements['source'].attributes['file'].rpartition('/').last
+
+                  break if volume_name(domain_name, idx) != diskname
+
+                  domain_volumes.push(volume_from_xml(box_disk_xml, domain_name, idx))
+                end
+              end
+            else
+
+              @logger.debug "Search for volumes in pool: #{pool_name}"
+              env[:box_volumes].each_index do |index|
+                domain_volume = env[:machine].provider.driver.connection.volumes.all(
+                  name: volume_name(domain_name, index)
+                ).find { |x| x.pool_name == pool_name }
+                raise Errors::NoDomainVolume if domain_volume.nil?
+
+                domain_volumes.push(
+                  {
+                    name: volume_name(domain_name, index),
+                    device: env[:box_volumes][index][:device],
+                    cache: domain_volume_cache,
+                    bus: disk_bus,
+                    absolute_path: domain_volume.path,
+                    virtual_size: env[:box_volumes][index][:virtual_size],
+                    pool: pool_name,
+                  }
+                )
+              end
+            end
+
+            resolver.resolve!(domain_volumes)
+
+            # If we have a box, take the path from the domain volume and set our storage_prefix.
+            # If not, we dump the storage pool xml to get its defined path.
+            # the default storage prefix is typically: /var/lib/libvirt/images/
+            storage_prefix = "#{File.dirname(domain_volumes[0][:absolute_path])}/" # steal
+          else
+            # Ensure domain name is set for subsequent steps if restarting a machine without a box
+            libvirt_domain = env[:machine].provider.driver.connection.client.lookup_domain_by_uuid(
+              env[:machine].id
+            )
+            domain_xml = libvirt_domain.xml_desc(1)
+            xml_descr = REXML::Document.new(domain_xml)
+            domain_name = xml_descr.elements['domain'].elements['name'].text
+
+            storage_prefix = get_disk_storage_prefix(env[:machine], storage_pool_name)
+          end
+
+          resolver.resolve!(disks)
+
+          disks.each do |disk|
+            disk[:path] ||= disk_name(domain_name, disk)
+
+            # On volume creation, the <path> element inside <target>
+            # is oddly ignored; instead the path is taken from the
+            # <name> element:
+            # http://www.redhat.com/archives/libvir-list/2008-August/msg00329.html
+            disk[:name] = disk[:path]
+
+            disk[:absolute_path] = storage_prefix + disk[:path]
+
+            if disk[:pool].nil?
+              disk[:pool] = storage_pool_name
+            else
+              @logger.debug "Overriding pool name with: #{disk[:pool]}"
+              disk_storage_prefix = get_disk_storage_prefix(env[:machine], disk[:pool])
+              disk[:absolute_path] = disk_storage_prefix + disk[:path]
+              @logger.debug "Overriding disk path with: #{disk[:absolute_path]}"
+            end
+          end
+
+          env[:domain_volumes] = domain_volumes
+          env[:disks] = disks
+
+          @app.call(env)
+        end
+
+        private
+
+        def disk_name(name, disk)
+          "#{name}-#{disk[:device]}.#{disk[:type]}" # disk name
+        end
+
+        def get_disk_storage_prefix(machine, disk_pool_name)
+          disk_storage_pool = machine.provider.driver.connection.client.lookup_storage_pool_by_name(disk_pool_name)
+          raise Errors::NoStoragePool if disk_storage_pool.nil?
+
+          xml = Nokogiri::XML(disk_storage_pool.xml_desc)
+          "#{xml.xpath('/pool/target/path').inner_text}/"
+        end
+
+        def volume_name(domain_name, index)
+          domain_name + (index.zero? ? '.img' : "_#{index}.img")
+        end
+
+        def volume_from_xml(device_xml, domain_name, index)
+          driver = device_xml.elements['driver']
+          source = device_xml.elements['source']
+          target = device_xml.elements['target']
+
+          {
+            name: volume_name(domain_name, index),
+            device: target.attributes['dev'],
+            cache: driver.attributes['cache'],
+            bus: target.attributes['bus'],
+            absolute_path: source.attributes['file'],
+          }
+        end
+      end
+    end
+  end
+end

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

@@ -375,10 +375,50 @@ module VagrantPlugins
                 end
               end
 
+              loader = REXML::XPath.first(xml_descr, '/domain/os/loader')
+              if config.loader
+                if loader.nil?
+                  descr_changed = true
+                  loader = REXML::Element.new('loader')
+                  REXML::XPath.first(xml_descr, '/domain/os').insert_after('//type', loader)
+                  loader.text = config.loader
+                else
+                  if (loader.text or '').strip != config.loader
+                    descr_changed = true
+                    loader.text = config.loader
+                  end
+                end
+                loader.attributes['type'] = config.nvram ? 'pflash' : 'rom'
+              elsif !loader.nil?
+                descr_changed = true
+                loader.parent.delete_element(loader)
+              end
+
+              undefine_flags = 0
+              nvram = REXML::XPath.first(xml_descr, '/domain/os/nvram')
+              if config.nvram
+                if nvram.nil?
+                  descr_changed = true
+                  nvram = REXML::Element.new('nvram')
+                  REXML::XPath.first(xml_descr, '/domain/os').insert_after(loader, nvram)
+                  nvram.text = config.nvram
+                else
+                  if (nvram.text or '').strip != config.nvram
+                    descr_changed = true
+                    nvram.text = config.nvram
+                  end
+                  undefine_flags |= ProviderLibvirt::Util::DomainFlags::VIR_DOMAIN_UNDEFINE_KEEP_NVRAM
+                end
+              elsif !nvram.nil?
+                descr_changed = true
+                undefine_flags |= ProviderLibvirt::Util::DomainFlags::VIR_DOMAIN_UNDEFINE_NVRAM
+                nvram.parent.delete_element(nvram)
+              end
+
               # Apply
               if descr_changed
                 begin
-                  libvirt_domain.undefine
+                  libvirt_domain.undefine(undefine_flags)
                   new_descr = String.new
                   xml_descr.write new_descr
                   env[:machine].provider.driver.connection.servers.create(xml: new_descr)

data/lib/vagrant-libvirt/action.rb

@@ -35,6 +35,7 @@ module VagrantPlugins
       autoload :ReadMacAddresses, action_root.join('read_mac_addresses')
       autoload :RemoveLibvirtImage, action_root.join('remove_libvirt_image')
       autoload :RemoveStaleVolume, action_root.join('remove_stale_volume')
+      autoload :ResolveDiskSettings, action_root.join('resolve_disk_settings')
       autoload :ResumeDomain, action_root.join('resume_domain')
       autoload :SetNameOfDomain, action_root.join('set_name_of_domain')
       autoload :SetBootOrder, action_root.join('set_boot_order')
@@ -48,15 +49,12 @@ module VagrantPlugins
       autoload :TimedProvision, action_root.join('timed_provision')
       autoload :WaitTillUp, action_root.join('wait_till_up')
 
-      autoload :HandleBox, 'vagrant/action/builtin/handle_box'
       autoload :Package, 'vagrant/action/general/package'
       autoload :PackageSetupFiles, 'vagrant/action/general/package_setup_files'
       autoload :PackageSetupFolders, 'vagrant/action/general/package_setup_folders'
       autoload :ProvisionerCleanup, 'vagrant/action/builtin/provisioner_cleanup'
       autoload :SSHRun, 'vagrant/action/builtin/ssh_run'
       autoload :SyncedFolderCleanup, 'vagrant/action/builtin/synced_folder_cleanup'
-      autoload :SyncedFolders, 'vagrant/action/builtin/synced_folders'
-      autoload :WaitForCommunicator, 'vagrant/action/builtin/wait_for_communicator'
 
       # Include the built-in & general modules so we can use them as top-level things.
       include Vagrant::Action::Builtin
@@ -77,11 +75,14 @@ module VagrantPlugins
           b.use BoxCheckOutdated
           b.use Call, IsCreated do |env, b2|
             b2.use CleanupOnFailure
+            b2.use Provision
 
             # Create VM if not yet created.
             if !env[:result]
               b2.use SetNameOfDomain
+
               if !env[:machine].config.vm.box
+                b2.use ResolveDiskSettings
                 b2.use CreateDomain
                 b2.use CreateNetworks
                 b2.use CreateNetworkInterfaces
@@ -91,9 +92,11 @@ module VagrantPlugins
                 b2.use SetupComplete
               else
                 b2.use HandleStoragePool
+                require 'vagrant/action/builtin/handle_box'
                 b2.use HandleBox
                 b2.use HandleBoxImage
                 b2.use CreateDomainVolume
+                b2.use ResolveDiskSettings
                 b2.use CreateDomain
                 b2.use CreateNetworks
                 b2.use CreateNetworkInterfaces
@@ -104,6 +107,7 @@ module VagrantPlugins
               end
             else
               env[:halt_on_error] = true
+              b2.use ResolveDiskSettings
               b2.use CreateNetworks
               b2.use action_start
             end
@@ -117,7 +121,7 @@ module VagrantPlugins
       # Assuming VM is created, just start it. This action is not called
       # directly by any subcommand. VM can be suspended, already running or in
       # poweroff state.
-      def self.action_start
+      private_class_method def self.action_start
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
           b.use Call, IsRunning do |env, b2|
@@ -140,10 +144,9 @@ module VagrantPlugins
                 b3.use StartDomain
               else
                 # VM is not running or suspended.
-                b3.use Provision
-
                 b3.use PrepareNFSValidIds
                 b3.use SyncedFolderCleanup
+                require 'vagrant/action/builtin/synced_folders'
                 b3.use SyncedFolders
                 b3.use PrepareNFSSettings
                 b3.use ShareFolders
@@ -156,6 +159,7 @@ module VagrantPlugins
                 # Machine should gain IP address when comming 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
@@ -213,6 +217,7 @@ module VagrantPlugins
             end
 
             b2.use ConfigValidate
+            b2.use Provision
             b2.use action_halt
             b2.use action_start
           end
@@ -352,6 +357,9 @@ module VagrantPlugins
               end
               b3.use CreateNetworks
               b3.use ResumeDomain
+              b3.use Provision
+              require 'vagrant/action/builtin/wait_for_communicator'
+              b3.use WaitForCommunicator, [:running]
             end
           end
         end

data/lib/vagrant-libvirt/config.rb

@@ -528,10 +528,14 @@ module VagrantPlugins
           pci_domain = options[:domain]
         end
 
-        @pcis.push(domain:    pci_domain,
-                   bus:       options[:bus],
-                   slot:      options[:slot],
-                   function:  options[:function])
+        @pcis.push(domain:          pci_domain,
+                   bus:             options[:bus],
+                   slot:            options[:slot],
+                   function:        options[:function],
+                   guest_domain:    options[:guest_domain],
+                   guest_bus:       options[:guest_bus],
+                   guest_slot:      options[:guest_slot],
+                   guest_function:  options[:guest_function])
       end
 
       def watchdog(options = {})
@@ -990,6 +994,10 @@ module VagrantPlugins
           errors << "libvirt.qemu_use_agent must be a boolean."
         end
 
+        if !@nvram.nil? && @loader.nil?
+          errors << "use of 'nvram' requires a 'loader' to be specified, please add one to the configuration"
+        end
+
         if @qemu_use_agent == true
           # if qemu agent is used to optain domain ip configuration, at least
           # one qemu channel has to be configured. As there are various options,