vagrant-libvirt 0.0.45 → 0.1.0

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

@@ -1,9 +1,10 @@
+require 'fileutils'
 require 'log4r'
 
 module VagrantPlugins
   module ProviderLibvirt
     module Action
-      # Action for create new box for libvirt provider
+      # Action for create new box for Libvirt provider
       class PackageDomain
         def initialize(app, env)
           @logger = Log4r::Logger.new('vagrant_libvirt::action::package_domain')
@@ -21,24 +22,31 @@ module VagrantPlugins
           root_disk = domain.volumes.select do |x|
             x.name == libvirt_domain.name + '.img'
           end.first
+          raise Errors::NoDomainVolume if root_disk.nil?
           boxname = env['package.output']
           raise "#{boxname}: Already exists" if File.exist?(boxname)
           @tmp_dir = Dir.pwd + '/_tmp_package'
           @tmp_img = @tmp_dir + '/box.img'
-          Dir.mkdir(@tmp_dir)
-          if File.readable?(root_disk.path)
-            backing = `qemu-img info "#{root_disk.path}" | grep 'backing file:' | cut -d ':' -f2`.chomp
-          else
-            env[:ui].error("Require set read access to #{root_disk.path}. sudo chmod a+r #{root_disk.path}")
-            FileUtils.rm_rf(@tmp_dir)
-            raise 'Have no access'
+          FileUtils.mkdir_p(@tmp_dir)
+          env[:ui].info("Downloading #{root_disk.name} to #{@tmp_img}")
+          ret = download_image(@tmp_img, env[:machine].provider_config.storage_pool_name,
+                               root_disk.name, env) do |progress,image_size|
+            env[:ui].clear_line
+            env[:ui].report_progress(progress, image_size, false)
+          end
+          # Clear the line one last time since the progress meter doesn't
+          # disappear immediately.
+          env[:ui].clear_line
+          backing = `qemu-img info "#{@tmp_img}" | grep 'backing file:' | cut -d ':' -f2`.chomp
+          if backing
+            env[:ui].info('Image has backing image, copying image and rebasing ...')
+            `qemu-img rebase -p -b "" #{@tmp_img}`
           end
-          env[:ui].info('Image has backing image, copying image and rebasing ...')
-          FileUtils.cp(root_disk.path, @tmp_img)
-          `qemu-img rebase -p -b "" #{@tmp_img}`
           # remove hw association with interface
           # working for centos with lvs default disks
-          `virt-sysprep --no-logfile --operations defaults,-ssh-userdir -a #{@tmp_img}`
+          options = ENV.fetch('VAGRANT_LIBVIRT_VIRT_SYSPREP_OPTIONS', '')
+          operations = ENV.fetch('VAGRANT_LIBVIRT_VIRT_SYSPREP_OPERATIONS', 'defaults,-ssh-userdir')
+          `virt-sysprep --no-logfile --operations #{operations} -a #{@tmp_img} #{options}`
           # add any user provided file
           extra = ''
           @tmp_include = @tmp_dir + '/_include'
@@ -99,6 +107,44 @@ module VagrantPlugins
             }
           EOF
         end
+
+        protected
+
+        # Fog libvirt currently doesn't support downloading images from storage
+        # pool volumes. Use ruby-libvirt client instead.
+        def download_image(image_file, pool_name, volume_name, env)
+          begin
+            pool = env[:machine].provider.driver.connection.client.lookup_storage_pool_by_name(
+              pool_name
+            )
+            volume = pool.lookup_volume_by_name(volume_name)
+            image_size = volume.info.allocation # B
+
+            stream = env[:machine].provider.driver.connection.client.stream
+
+            # Use length of 0 to download remaining contents after offset
+            volume.download(stream, offset = 0, length = 0)
+
+            buf_size = 1024 * 250 # 250K, copied from upload_image in handle_box_image.rb
+            progress = 0
+            retval = stream.recv(buf_size)
+            open(image_file, 'wb') do |io|
+              while (retval.at(0) > 0)
+                recvd = io.write(retval.at(1))
+                progress += recvd
+                yield [progress, image_size]
+                retval = stream.recv(buf_size)
+              end
+            end
+          rescue => e
+            raise Errors::ImageDownloadError,
+                  volume_name: volume_name,
+                  pool_name: pool_name,
+                  error_message: e.message
+          end
+
+          progress == image_size
+        end
       end
     end
   end

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

@@ -1,12 +1,13 @@
 require 'nokogiri'
 require 'socket'
 require 'timeout'
+require 'vagrant-libvirt/util/nfs'
 
 module VagrantPlugins
   module ProviderLibvirt
     module Action
       class PrepareNFSSettings
-        include Vagrant::Action::Builtin::MixinSyncedFolders
+        include VagrantPlugins::ProviderLibvirt::Util::Nfs
 
         def initialize(app, _env)
           @app = app
@@ -28,13 +29,6 @@ module VagrantPlugins
           end
         end
 
-        # We're using NFS if we have any synced folder with NFS configured. If
-        # we are not using NFS we don't need to do the extra work to
-        # populate these fields in the environment.
-        def using_nfs?
-          !!synced_folders(@machine)[:nfs]
-        end
-
         # Returns the IP address of the host
         #
         # @param [Machine] machine
@@ -79,7 +73,7 @@ module VagrantPlugins
         # Check if we can open a connection to the host
         def ping(host, timeout = 3)
           ::Timeout.timeout(timeout) do
-            s = TCPSocket.new(host, 'echo')
+            s = TCPSocket.new(host, 'ssh')
             s.close
           end
           true

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

@@ -1,22 +1,31 @@
+require 'vagrant-libvirt/util/nfs'
 require 'yaml'
+
 module VagrantPlugins
   module ProviderLibvirt
     module Action
       class PruneNFSExports
+        include VagrantPlugins::ProviderLibvirt::Util::Nfs
+
         def initialize(app, _env)
           @app = app
         end
 
         def call(env)
-          if env[:host]
-            uuid = env[:machine].id
-            # get all uuids
-            uuids = env[:machine].provider.driver.connection.servers.all.map(&:id)
-            # not exiisted in array will removed from nfs
-            uuids.delete(uuid)
-            env[:host].capability(
-              :nfs_prune, env[:machine].ui, uuids
-            )
+	  @machine = env[:machine]
+
+	  if using_nfs?
+            @logger.info('Using NFS, prunning NFS settings from host')
+	    if env[:host]
+              uuid = env[:machine].id
+              # get all uuids
+              uuids = env[:machine].provider.driver.connection.servers.all.map(&:id)
+              # not exiisted in array will removed from nfs
+              uuids.delete(uuid)
+              env[:host].capability(
+                :nfs_prune, env[:machine].ui, uuids
+              )
+            end
           end
 
           @app.call(env)

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

@@ -10,8 +10,8 @@ module VagrantPlugins
         end
 
         def call(env)
-          env[:ui].info('Vagrant-libvirt plugin removed box only from you LOCAL ~/.vagrant/boxes directory')
-          env[:ui].info('From libvirt storage pool you have to delete image manually(virsh, virt-manager or by any other tool)')
+          env[:ui].info('Vagrant-libvirt plugin removed box only from your LOCAL ~/.vagrant/boxes directory')
+          env[:ui].info('From Libvirt storage pool you have to delete image manually(virsh, virt-manager or by any other tool)')
           @app.call(env)
         end
       end

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

@@ -16,13 +16,19 @@ module VagrantPlugins
 
         def call(env)
           # Remove stale server volume
-          env[:ui].info(I18n.t('vagrant_libvirt.remove_stale_volume'))
-
           config = env[:machine].provider_config
           # Check for storage pool, where box image should be created
-          fog_pool = ProviderLibvirt::Util::Collection.find_matching(
-            env[:machine].provider.driver.connection.pools.all, config.storage_pool_name
-          )
+          fog_pool = env[:machine].provider.driver.connection.pools.all(
+            name: config.storage_pool_name
+          ).first
+
+          env[:result] = nil
+
+          if not fog_pool
+            @logger.debug("**** Pool #{config.storage_pool_name} not found")
+            return @app.call(env)
+          end
+
           @logger.debug("**** Pool #{fog_pool.name}")
 
           # This is name of newly created image for vm.
@@ -30,17 +36,17 @@ module VagrantPlugins
           @logger.debug("**** Volume name #{name}")
 
           # remove root storage
-          box_volume = ProviderLibvirt::Util::Collection.find_matching(
-            env[:machine].provider.driver.connection.volumes.all, name
-          )
-          if box_volume && box_volume.pool_name == fog_pool.name
+          box_volume = env[:machine].provider.driver.connection.volumes.all(
+            name: name
+          ).find { |x| x.pool_name == fog_pool.name }
+          if box_volume && box_volume.id
+            env[:ui].info(I18n.t('vagrant_libvirt.remove_stale_volume'))
             @logger.info("Deleting volume #{box_volume.key}")
             box_volume.destroy
             env[:result] = box_volume
           else
-            env[:result] = nil
+            @logger.debug("**** Volume #{name} not found in pool #{fog_pool.name}")
           end
-
           # Continue the middleware chain.
           @app.call(env)
         end

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

@@ -33,7 +33,7 @@ module VagrantPlugins
           if @boot_order.count >= 1
 
             # If a domain is initially defined with no box or disk or
-            # with an explicit boot order, libvirt adds <boot dev="foo">
+            # with an explicit boot order, Libvirt adds <boot dev="foo">
             # This conflicts with an explicit boot_order configuration,
             # so we need to remove it from the domain xml and feed it back.
             # Also see https://bugzilla.redhat.com/show_bug.cgi?id=1248514
@@ -66,7 +66,7 @@ module VagrantPlugins
               logger_msg(node, index)
             end
 
-            # Finally redefine the domain XML through libvirt
+            # Finally redefine the domain XML through Libvirt
             # to apply the boot ordering
             env[:machine].provider
                          .driver

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

@@ -13,20 +13,17 @@ module VagrantPlugins
           env[:domain_name] = build_domain_name(env)
 
           begin
-            @logger.info("Looking for domain #{env[:domain_name]} through list " \
-                         "#{env[:machine].provider.driver.connection.servers.all}")
+            @logger.info("Looking for domain #{env[:domain_name]}")
             # Check if the domain name is not already taken
 
-            domain = ProviderLibvirt::Util::Collection.find_matching(
-              env[:machine].provider.driver.connection.servers.all, env[:domain_name]
+            domain = env[:machine].provider.driver.connection.servers.all(
+              name: env[:domain_name]
             )
-          rescue Fog::Errors::Error => e
+          rescue Libvirt::RetrieveError => e
             @logger.info(e.to_s)
             domain = nil
           end
 
-          @logger.info("Looking for domain #{env[:domain_name]}")
-
           unless domain.nil?
             raise ProviderLibvirt::Errors::DomainNameExists,
                   domain_name: env[:domain_name]
@@ -41,7 +38,7 @@ module VagrantPlugins
         # parsable and sortable by epoch time
         # @example
         #   development-centos-6-chef-11_1404488971_3b7a569e2fd7c554b852
-        # @return [String] libvirt domain name
+        # @return [String] Libvirt domain name
         def build_domain_name(env)
           config = env[:machine].provider_config
           domain_name =
@@ -51,7 +48,7 @@ module VagrantPlugins
               # don't have any prefix, not even "_"
               ''
             else
-              config.default_prefix.to_s.dup.concat('_')
+              config.default_prefix.to_s.dup
             end
           domain_name << env[:machine].name.to_s
           domain_name.gsub!(/[^-a-z0-9_\.]/i, '')

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

@@ -23,7 +23,7 @@ module VagrantPlugins
 
             libvirt_domain = env[:machine].provider.driver.connection.client.lookup_domain_by_uuid(env[:machine].id)
 
-            # libvirt API doesn't support modifying memory on NUMA enabled CPUs
+            # Libvirt API doesn't support modifying memory on NUMA enabled CPUs
             # http://libvirt.org/git/?p=libvirt.git;a=commit;h=d174394105cf00ed266bf729ddf461c21637c736
             if config.numa_nodes == nil
               if config.memory.to_i * 1024 != libvirt_domain.max_memory
@@ -68,7 +68,7 @@ module VagrantPlugins
               end
 
               # vCpu count
-              if config.cpus.to_i != libvirt_domain.vcpus.length
+              if config.cpus.to_i != libvirt_domain.num_vcpus(0)
                 descr_changed = true
                 REXML::XPath.first(xml_descr, '/domain/vcpu').text = config.cpus
               end

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

@@ -28,7 +28,7 @@ module VagrantPlugins
           end
 
           # Wait for domain to obtain an ip address. Ip address is searched
-          # from arp table, either localy or remotely via ssh, if libvirt
+          # from arp table, either locally or remotely via ssh, if Libvirt
           # connection was done via ssh.
           env[:ip_address] = nil
           @logger.debug("Searching for IP for MAC address: #{domain.mac}")
@@ -37,8 +37,8 @@ module VagrantPlugins
           if env[:machine].provider_config.qemu_use_session
             env[:metrics]['instance_ip_time'] = Util::Timer.time do
               retryable(on: Fog::Errors::TimeoutError, tries: 300) do
-                # If we're interrupted don't worry about waiting
-                return terminate(env) if env[:interrupted]
+                # just return if interrupted and let the warden call recover
+                return if env[:interrupted]
 
                 # Wait for domain to obtain an ip address
                 domain.wait_for(2) do
@@ -50,8 +50,8 @@ module VagrantPlugins
           else
             env[:metrics]['instance_ip_time'] = Util::Timer.time do
               retryable(on: Fog::Errors::TimeoutError, tries: 300) do
-                # If we're interrupted don't worry about waiting
-                return terminate(env) if env[:interrupted]
+                # just return if interrupted and let the warden call recover
+                return if env[:interrupted]
 
                 # Wait for domain to obtain an ip address
                 domain.wait_for(2) do
@@ -84,8 +84,8 @@ module VagrantPlugins
               end
             end
           end
-          # if interrupted above, just terminate immediately
-          return terminate(env) if env[:interrupted]
+          # just return if interrupted and let the warden call recover
+          return if env[:interrupted]
           @logger.info("Time for SSH ready: #{env[:metrics]['instance_ssh_time']}")
 
           # Booted and ready for use.
@@ -95,8 +95,6 @@ module VagrantPlugins
         end
 
         def recover(env)
-          return if env['vagrant.error'].is_a?(Vagrant::Errors::VagrantError)
-
           # Undo the import
           terminate(env)
         end

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

@@ -20,7 +20,7 @@ module VagrantPlugins
       end
 
       def usable?(machine, _raise_error = false)
-        # bail now if not using libvirt since checking version would throw error
+        # bail now if not using Libvirt since checking version would throw error
         return false unless machine.provider_name == :libvirt
 
         # <filesystem/> support in device attach/detach introduced in 1.2.2
@@ -30,7 +30,7 @@ module VagrantPlugins
       end
 
       def prepare(machine, folders, _opts)
-        raise Vagrant::Errors::Error('No libvirt connection') if machine.provider.driver.connection.nil?
+        raise Vagrant::Errors::Error('No Libvirt connection') if machine.provider.driver.connection.nil?
         @conn = machine.provider.driver.connection.client
 
         begin
@@ -89,7 +89,7 @@ module VagrantPlugins
 
       def cleanup(machine, _opts)
         if machine.provider.driver.connection.nil?
-          raise Vagrant::Errors::Error('No libvirt connection')
+          raise Vagrant::Errors::Error('No Libvirt connection')
         end
         @conn = machine.provider.driver.connection.client
         begin

data/lib/vagrant-libvirt/config.rb

@@ -20,12 +20,12 @@ module VagrantPlugins
       # A hypervisor name to access via Libvirt.
       attr_accessor :driver
 
-      # The name of the server, where libvirtd is running.
+      # The name of the server, where Libvirtd is running.
       attr_accessor :host
 
       # If use ssh tunnel to connect to Libvirt.
       attr_accessor :connect_via_ssh
-      # Path towards the libvirt socket
+      # Path towards the Libvirt socket
       attr_accessor :socket
 
       # The username to access Libvirt.
@@ -42,6 +42,9 @@ module VagrantPlugins
       attr_accessor :storage_pool_name
       attr_accessor :storage_pool_path
 
+      # Libvirt storage pool where the base image snapshot shall be stored
+      attr_accessor :snapshot_pool_name
+
       # Turn on to prevent hostname conflicts
       attr_accessor :random_hostname
 
@@ -55,6 +58,7 @@ module VagrantPlugins
       attr_accessor :management_network_autostart
       attr_accessor :management_network_pci_bus
       attr_accessor :management_network_pci_slot
+      attr_accessor :management_network_domain
 
       # System connection information
       attr_accessor :system_uri
@@ -65,14 +69,17 @@ module VagrantPlugins
       # Domain specific settings used while creating new domain.
       attr_accessor :uuid
       attr_accessor :memory
+      attr_accessor :nodeset
       attr_accessor :memory_backing
       attr_accessor :channel
       attr_accessor :cpus
+      attr_accessor :cpuset
       attr_accessor :cpu_mode
       attr_accessor :cpu_model
       attr_accessor :cpu_fallback
       attr_accessor :cpu_features
       attr_accessor :cpu_topology
+      attr_accessor :shares
       attr_accessor :features
       attr_accessor :features_hyperv
       attr_accessor :numa_nodes
@@ -158,7 +165,10 @@ module VagrantPlugins
       # Additional qemuargs arguments
       attr_accessor :qemu_args
 
-      # Use qemu session instead of system
+      # Additional qemuenv arguments
+      attr_accessor :qemu_env
+
+      # Use QEMU session instead of system
       attr_accessor :qemu_use_session
 
       def initialize
@@ -170,6 +180,7 @@ module VagrantPlugins
         @password          = UNSET_VALUE
         @id_ssh_key_file   = UNSET_VALUE
         @storage_pool_name = UNSET_VALUE
+        @snapshot_pool_name = UNSET_VALUE
         @random_hostname   = UNSET_VALUE
         @management_network_device  = UNSET_VALUE
         @management_network_name    = UNSET_VALUE
@@ -180,6 +191,7 @@ module VagrantPlugins
         @management_network_autostart = UNSET_VALUE
         @management_network_pci_slot = UNSET_VALUE
         @management_network_pci_bus = UNSET_VALUE
+        @management_network_domain = UNSET_VALUE
 
         # System connection information
         @system_uri      = UNSET_VALUE
@@ -187,13 +199,16 @@ module VagrantPlugins
         # Domain specific settings.
         @uuid              = UNSET_VALUE
         @memory            = UNSET_VALUE
+        @nodeset           = UNSET_VALUE
         @memory_backing    = UNSET_VALUE
         @cpus              = UNSET_VALUE
+        @cpuset            = UNSET_VALUE
         @cpu_mode          = UNSET_VALUE
         @cpu_model         = UNSET_VALUE
         @cpu_fallback      = UNSET_VALUE
         @cpu_features      = UNSET_VALUE
         @cpu_topology      = UNSET_VALUE
+        @shares            = UNSET_VALUE
         @features          = UNSET_VALUE
         @features_hyperv   = UNSET_VALUE
         @numa_nodes        = UNSET_VALUE
@@ -272,7 +287,12 @@ module VagrantPlugins
         # Attach mgmt network
         @mgmt_attach       = UNSET_VALUE
 
-        @qemu_args  = []
+        # Additional QEMU commandline arguments
+        @qemu_args         = UNSET_VALUE
+
+        # Additional QEMU commandline environment variables
+        @qemu_env          = UNSET_VALUE
+
         @qemu_use_session  = UNSET_VALUE
       end
 
@@ -305,7 +325,7 @@ module VagrantPlugins
           end
         end
 
-        # is it better to raise our own error, or let libvirt cause the exception?
+        # is it better to raise our own error, or let Libvirt cause the exception?
         raise 'Only four cdroms may be attached at a time'
       end
 
@@ -349,7 +369,10 @@ module VagrantPlugins
           raise 'Feature name AND state must be specified'
         end
 
-        @features_hyperv = [{name: options[:name], state: options[:state]}]  if @features_hyperv == UNSET_VALUE
+        @features_hyperv = []  if @features_hyperv == UNSET_VALUE
+
+        @features_hyperv.push(name: options[:name],
+                              state: options[:state])
       end
 
       def cputopology(options = {})
@@ -431,7 +454,14 @@ module VagrantPlugins
 
         @pcis = [] if @pcis == UNSET_VALUE
 
-        @pcis.push(bus:       options[:bus],
+        if options[:domain].nil?
+          pci_domain = '0x0000'
+        else
+          pci_domain = options[:domain]
+        end
+
+        @pcis.push(domain:    pci_domain,
+                   bus:       options[:bus],
                    slot:      options[:slot],
                    function:  options[:function])
       end
@@ -577,12 +607,20 @@ module VagrantPlugins
       end
 
       def qemuargs(options = {})
+        @qemu_args = [] if @qemu_args == UNSET_VALUE
+
         @qemu_args << options if options[:value]
       end
 
+      def qemuenv(options = {})
+        @qemu_env = {} if @qemu_env == UNSET_VALUE
+
+        @qemu_env.merge!(options)
+      end
+
       # code to generate URI from a config moved out of the connect action
       def _generate_uri
-        # builds the libvirt connection URI from the given driver config
+        # builds the Libvirt connection URI from the given driver config
         # Setup connection uri.
         uri = @driver.dup
         virt_path = case uri
@@ -598,7 +636,7 @@ module VagrantPlugins
                       raise "Require specify driver #{uri}"
         end
         if uri == 'kvm'
-          uri = 'qemu' # use qemu uri for kvm domain type
+          uri = 'qemu' # use QEMU uri for KVM domain type
         end
 
         if @connect_via_ssh
@@ -619,13 +657,13 @@ module VagrantPlugins
         uri << '?no_verify=1'
 
         if @id_ssh_key_file
-          # set ssh key for access to libvirt host
+          # set ssh key for access to Libvirt host
           uri << "\&keyfile="
           # if no slash, prepend $HOME/.ssh/
           @id_ssh_key_file.prepend("#{`echo ${HOME}`.chomp}/.ssh/") if @id_ssh_key_file !~ /\A\//
           uri << @id_ssh_key_file
         end
-        # set path to libvirt socket
+        # set path to Libvirt socket
         uri << "\&socket=" + @socket if @socket
         uri
       end
@@ -638,6 +676,7 @@ module VagrantPlugins
         @password = nil if @password == UNSET_VALUE
         @id_ssh_key_file = 'id_rsa' if @id_ssh_key_file == UNSET_VALUE
         @storage_pool_name = 'default' if @storage_pool_name == UNSET_VALUE
+        @snapshot_pool_name = @storage_pool_name if @snapshot_pool_name == UNSET_VALUE
         @storage_pool_path = nil if @storage_pool_path == UNSET_VALUE
         @random_hostname = false if @random_hostname == UNSET_VALUE
         @management_network_device = 'virbr0' if @management_network_device == UNSET_VALUE
@@ -649,6 +688,7 @@ module VagrantPlugins
         @management_network_autostart = false if @management_network_autostart == UNSET_VALUE
         @management_network_pci_bus = nil if @management_network_pci_bus == UNSET_VALUE
         @management_network_pci_slot = nil if @management_network_pci_slot == UNSET_VALUE
+        @management_network_domain = nil if @management_network_domain == UNSET_VALUE
         @system_uri      = 'qemu:///system' if @system_uri == UNSET_VALUE
 
         @qemu_use_session = false if @qemu_use_session == UNSET_VALUE
@@ -659,8 +699,10 @@ module VagrantPlugins
         # Domain specific settings.
         @uuid = '' if @uuid == UNSET_VALUE
         @memory = 512 if @memory == UNSET_VALUE
+        @nodeset = nil if @nodeset == UNSET_VALUE
         @memory_backing = [] if @memory_backing == UNSET_VALUE
         @cpus = 1 if @cpus == UNSET_VALUE
+        @cpuset = nil if @cpuset == UNSET_VALUE
         @cpu_mode = 'host-model' if @cpu_mode == UNSET_VALUE
         @cpu_model = if (@cpu_model == UNSET_VALUE) && (@cpu_mode == 'custom')
                        'qemu64'
@@ -672,6 +714,7 @@ module VagrantPlugins
         @cpu_topology = {} if @cpu_topology == UNSET_VALUE
         @cpu_fallback = 'allow' if @cpu_fallback == UNSET_VALUE
         @cpu_features = [] if @cpu_features == UNSET_VALUE
+        @shares = nil if @shares == UNSET_VALUE
         @features = ['acpi','apic','pae'] if @features == UNSET_VALUE
         @features_hyperv = [] if @features_hyperv == UNSET_VALUE
         @numa_nodes = @numa_nodes == UNSET_VALUE ? nil : _generate_numa
@@ -761,7 +804,11 @@ module VagrantPlugins
         # Attach mgmt network
         @mgmt_attach = true if @mgmt_attach == UNSET_VALUE
 
+        # Additional QEMU commandline arguments
         @qemu_args = [] if @qemu_args == UNSET_VALUE
+
+        # Additional QEMU commandline environment variables
+        @qemu_env = {} if @qemu_env == UNSET_VALUE
       end
 
       def validate(machine)
@@ -797,6 +844,10 @@ module VagrantPlugins
           c = cdroms.dup
           c += other.cdroms
           result.cdroms = c
+
+          c = qemu_env != UNSET_VALUE ? qemu_env.dup : {}
+          c.merge!(other.qemu_env) if other.qemu_env != UNSET_VALUE
+          result.qemu_env = c
         end
       end
     end