vagrant-libvirt 0.10.8 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8480e85c239c56fec0b2800bb26c7453c566c12c38d45d07e38f50744b2e719
-  data.tar.gz: 0b8970b25c17ac001a9b2d348598512b13afdef476f1078d66720df721f5631d
+  metadata.gz: 40dbf1a78ed383e5c289059d869c281c778fee7414a0a1711849d9dcba16df52
+  data.tar.gz: 2bf17eb2166d56a0386d6bbd70d6548d89def585aaf6f10c929f8afc546496bc
 SHA512:
-  metadata.gz: de18f3d908462a69a121271ddcc919c2bb7c883591d4ca11bf4739aa5030b37ef86446ac3c92c9d0e84fefe903328df0dfe135f62bf0c29f818e57c1d1796b32
-  data.tar.gz: 376684defc3fd7a3b6d0f87aedb68d4ee1c040c909bf225be84dc8fc5abb85b16f3145f1a9307f5e6446a2f927e604616fd7e714abdc6af73babd4c05bfa696b
+  metadata.gz: e9fa89d429ae04d5375930e3bfec06d3cf2c152803e8dc6a3fcb9c4a8ac4e81e1bafe08639fe689e9535cf3889bb1fd548c196ebe064abbad1edbfd85619ce0f
+  data.tar.gz: 4713ea077cc23984256c1a0ed55a67ec44c0a687f3a7c72916762a65807995c4fd5e1206f0ed86cc69008f8bf51a7cfff07b36f6947cd90bd29e136c2649c9f7

data/README.md

@@ -16,11 +16,19 @@ can help a lot :-)
 
 Vagrant-libvirt Documentation is published at [https://vagrant-libvirt.github.io/vagrant-libvirt/](https://vagrant-libvirt.github.io/vagrant-libvirt/)
 
+## QA status
+
+We periodically test basic functionality for vagrant-libvirt on various distributions.
+In the status badges below, build passing means that latest version of Vagrant + Vagrant-libvirt was installed correctly and `vagrant up` is working. Click the badge to review the action workflow.
+
+[![](http://github-actions.40ants.com/vagrant-libvirt/vagrant-libvirt-qa/matrix.svg?only=Distribution%20Install.verify-install)](https://github.com/vagrant-libvirt/vagrant-libvirt-qa/actions/workflows/distro-install.yml)
+
 ## Index
 
 <!-- vim-markdown-toc GFM -->
 
 * [Installing](#installing)
+  * [Latest development version](#latest-development-version)
 * [Running](#running)
 * [Development](#development)
 * [Contributing](#contributing)
@@ -32,6 +40,27 @@ Vagrant-libvirt Documentation is published at [https://vagrant-libvirt.github.io
 Installation typically involves a number of distribution package dependencies to ensure that Libvirt is available.
 Recommend that you follow the [installation guide](https://vagrant-libvirt.github.io/vagrant-libvirt/installation.html).
 
+### Latest development version
+
+If you want to try out the very latest development version you can download the gem package from the GitHub
+rubygems package [repository](https://github.com/vagrant-libvirt/vagrant-libvirt/packages/1659776) under the
+asserts. Unfortunately it's not yet possible to make the rubygem repositories in GitHub public.
+
+To install provide the file directly to the install command:
+```
+vagrant plugin install ./vagrant-libvirt-<version>.gem
+```
+
+It is possible to install directly from the GitHub rubygems package repository, however this will embedded
+your GitHub token directly into the file `~/.vagrant.d/plugins.json`:
+```
+vagrant plugin install vagrant-libvirt \
+  --plugin-source https://${USERNAME}:${GITHUB_TOKEN}@rubygems.pkg.github.com/vagrant-libvirt \
+  --plugin-version "0.10.9.pre.62"
+```
+
+Provided this token is a classic token limited to `read:packages` only, this may be acceptable to you.
+
 ## Running
 
 Once installed, use vagrant-libvirt through vagrant.
@@ -75,21 +104,19 @@ To work on the `vagrant-libvirt` plugin, clone this repository out, and use
 ```shell
 git clone https://github.com/vagrant-libvirt/vagrant-libvirt.git
 cd vagrant-libvirt
+bundle config --local with development
+bundle config --local path 'vendor/bundle'
 bundle install
 ```
 
 Once you have the dependencies, verify the unit tests pass with `rspec`:
 
 ```shell
-export VAGRANT_HOME=$(mktemp -d)
 bundle exec rspec --fail-fast --color --format documentation
 ```
 
 If those pass, you're ready to start developing the plugin.
 
-Setting `VAGRANT_HOME` is to avoid issues with conflicting with other
-plugins/gems or data already present under `~/.vagrant.d`.
-
 Additionally if you wish to test against a specific version of vagrant you
 can control the version using the following before running the tests:
 
@@ -98,13 +125,23 @@ export VAGRANT_VERSION=v2.2.14
 bundle update && bundle exec rspec --fail-fast --color --format documentation
 ```
 
+To run the acceptance tests which involve bringing up VMs and exercising
+various functionality aspects run the following (warning, may have issues if
+distro ruby is newer than supported by vagrant):
+```shell
+bundle exec rspec --fail-fast --color --format documentation --tag acceptance
+```
+
 **Note** rvm is used by the maintainers to help provide an environment to test
 against multiple ruby versions that align with the ones used by vagrant for
 their embedded ruby depending on the release. You can see what version is used
 by looking at the current [unit tests](.github/workflows/unit-tests.yml)
 workflow. By default if you have rvm installed and enabled it this project looks
-to use ruby 2.6.6 and configures a separate gemset, both of which will be switched
-to each time you enter the project directory.
+to use ruby 3.1.2 and configures a separate gemset, both of which will be switched
+to each time you enter the project directory. It should be considered sufficient
+just to get any tests passing with your system ruby, and as long as you ensure
+that the option to allow maintainers can update your PR, we will fix up any
+issues with the remaining combinations.
 
 You can test the plugin without installing it into your Vagrant environment by
 just creating a `Vagrantfile` in the top level of this directory (it is
@@ -132,7 +169,7 @@ end
 Now you can use bundler to execute Vagrant:
 
 ```shell
-$ bundle exec vagrant up --provider=libvirt
+bundle exec vagrant up --provider=libvirt
 ```
 
 **IMPORTANT NOTE:** bundle is crucial. You need to use bundled Vagrant.

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

@@ -32,11 +32,13 @@ module VagrantPlugins
           @cpuset = config.cpuset
           @cpu_features = config.cpu_features
           @cpu_topology = config.cpu_topology
+          @cpu_affinity = config.cpu_affinity
           @nodeset = config.nodeset
           @features = config.features
           @features_hyperv = config.features_hyperv
           @clock_offset = config.clock_offset
           @clock_timers = config.clock_timers
+          @launchsecurity_data = config.launchsecurity_data
           @shares = config.shares
           @cpu_mode = config.cpu_mode
           @cpu_model = config.cpu_model
@@ -48,9 +50,12 @@ module VagrantPlugins
           @machine_arch = config.machine_arch
           @disk_controller_model = config.disk_controller_model
           @disk_driver_opts = config.disk_driver_opts
+          @disk_address_type = config.disk_address_type
           @nested = config.nested
           @memory_size = config.memory.to_i * 1024
           @memory_backing = config.memory_backing
+          @memtunes = config.memtunes
+
           @management_network_mac = config.management_network_mac
           @domain_volume_cache = config.volume_cache || 'default'
           @kernel = config.kernel
@@ -61,6 +66,7 @@ module VagrantPlugins
           @graphics_type = config.graphics_type
           @graphics_autoport = config.graphics_autoport
           @graphics_port = config.graphics_port
+          @graphics_websocket = config.graphics_websocket
           @graphics_ip = config.graphics_ip
           @graphics_passwd = config.graphics_passwd
           @graphics_gl = config.graphics_gl
@@ -100,6 +106,7 @@ module VagrantPlugins
           @domain_volumes = env[:domain_volumes] || []
           @disks = env[:disks] || []
           @cdroms = config.cdroms
+          @floppies = config.floppies
 
           # Input
           @inputs = config.inputs
@@ -206,13 +213,16 @@ module VagrantPlugins
           env[:ui].info(" -- Domain type:       #{@domain_type}")
           env[:ui].info(" -- Cpus:              #{@cpus}")
           unless @cpuset.nil?
-            env[:ui].info(" -- Cpuset:            #{@cpuset}")
+            env[:ui].info("   -- Cpuset:          #{@cpuset}")
           end
           if not @cpu_topology.empty?
-            env[:ui].info(" -- CPU topology:   sockets=#{@cpu_topology[:sockets]}, cores=#{@cpu_topology[:cores]}, threads=#{@cpu_topology[:threads]}")
+            env[:ui].info(" -- CPU topology:      sockets=#{@cpu_topology[:sockets]}, cores=#{@cpu_topology[:cores]}, threads=#{@cpu_topology[:threads]}")
+          end
+          @cpu_affinity.each do |vcpu, cpuset|
+            env[:ui].info(" -- CPU affinity:      vcpu #{vcpu} => cpuset #{cpuset}")
           end
           @cpu_features.each do |cpu_feature|
-            env[:ui].info(" -- CPU Feature:       name=#{cpu_feature[:name]}, policy=#{cpu_feature[:policy]}")
+            env[:ui].info(" -- CPU feature:       name=#{cpu_feature[:name]}, policy=#{cpu_feature[:policy]}")
           end
           @features.each do |feature|
             env[:ui].info(" -- Feature:           #{feature}")
@@ -235,12 +245,18 @@ module VagrantPlugins
           @memory_backing.each do |backing|
             env[:ui].info(" -- Memory Backing:    #{backing[:name]}: #{backing[:config].map { |k,v| "#{k}='#{v}'"}.join(' ')}")
           end
+
+          @memtunes.each do |type, options|
+            env[:ui].info(" -- Memory Tuning:     #{type}: #{options[:config].map { |k,v| "#{k}='#{v}'"}.join(' ')}, value: #{options[:value]}")
+          end
           unless @shares.nil?
             env[:ui].info(" -- Shares:            #{@shares}")
           end
-          env[:ui].info(" -- Management MAC:    #{@management_network_mac}")
-          env[:ui].info(" -- Loader:            #{@loader}")
-          env[:ui].info(" -- Nvram:             #{@nvram}")
+          env[:ui].info(" -- Management MAC:    #{@management_network_mac}") if @management_network_mac
+          env[:ui].info(" -- Kernel:            #{@kernel}") if @kernel
+          env[:ui].info(" -- Initrd:            #{@initrd}") if @initrd
+          env[:ui].info(" -- Loader:            #{@loader}") if @loader
+          env[:ui].info(" -- Nvram:             #{@nvram}") if @nvram
           if env[:machine].config.vm.box
             env[:ui].info(" -- Base box:          #{env[:machine].box.name}")
           end
@@ -255,23 +271,24 @@ module VagrantPlugins
             env[:ui].info(" -- Disk driver opts:  cache='#{@domain_volume_cache}'")
           end
 
-          env[:ui].info(" -- Kernel:            #{@kernel}")
-          env[:ui].info(" -- Initrd:            #{@initrd}")
           env[:ui].info(" -- Graphics Type:     #{@graphics_type}")
-          env[:ui].info(" -- Graphics Port:     #{@graphics_port}")
-          env[:ui].info(" -- Graphics IP:       #{@graphics_ip}")
-          env[:ui].info(" -- Graphics Password: #{@graphics_passwd.nil? ? 'Not defined' : 'Defined'}")
+          env[:ui].info(" -- Graphics Websocket: #{@graphics_websocket}") if @graphics_websocket != -1
+          if !@graphics_autoport
+            env[:ui].info(" -- Graphics Port:     #{@graphics_port}")
+            env[:ui].info(" -- Graphics IP:       #{@graphics_ip}")
+            env[:ui].info(" -- Graphics Password: #{@graphics_passwd.nil? ? 'Not defined' : 'Defined'}")
+          end
           env[:ui].info(" -- Video Type:        #{@video_type}")
           env[:ui].info(" -- Video VRAM:        #{@video_vram}")
           env[:ui].info(" -- Video 3D accel:    #{@video_accel3d}")
-          env[:ui].info(" -- Sound Type:        #{@sound_type}")
+          env[:ui].info(" -- Sound Type:        #{@sound_type}") if @sound_type
           env[:ui].info(" -- Keymap:            #{@keymap}")
           env[:ui].info(" -- TPM Backend:       #{@tpm_type}")
           if @tpm_type == 'emulator'
             env[:ui].info(" -- TPM Model:         #{@tpm_model}")
             env[:ui].info(" -- TPM Version:       #{@tpm_version}")
           else
-            env[:ui].info(" -- TPM Path:          #{@tpm_path}")
+            env[:ui].info(" -- TPM Path:          #{@tpm_path}") if @tpm_path
           end
 
           unless @sysinfo.empty?
@@ -300,12 +317,12 @@ module VagrantPlugins
             env[:ui].info(" -- Boot device:        #{device}")
           end
 
-          unless @disks.empty?
-            env[:ui].info(" -- Disks:         #{_disks_print(@disks)}")
+          if not @launchsecurity_data.nil?
+            env[:ui].info(" -- Launch security:   #{@launchsecurity_data.map { |k, v| "#{k.to_s}=#{v}" }.join(", ")}")
           end
 
           @disks.each do |disk|
-            msg = " -- Disk(#{disk[:device]}):     #{disk[:absolute_path]}"
+            msg = " -- Disk(#{disk[:device]}):         #{disk[:absolute_path]}, #{disk[:bus]}, #{disk[:size]}"
             msg += ' Shared' if disk[:shareable]
             msg += ' (Remove only manually)' if disk[:allow_existing]
             msg += ' Not created - using existed.' if disk[:preexisting]
@@ -320,6 +337,14 @@ module VagrantPlugins
             env[:ui].info(" -- CDROM(#{cdrom[:dev]}):        #{cdrom[:path]}")
           end
 
+          unless @floppies.empty?
+            env[:ui].info(" -- Floppies:          #{_floppies_print(@floppies)}")
+          end
+
+          @floppies.each do |floppy|
+            env[:ui].info(" -- Floppy(#{floppy[:dev]}):      #{floppy[:path]}")
+          end
+
           @inputs.each do |input|
             env[:ui].info(" -- INPUT:             type=#{input[:type]}, bus=#{input[:bus]}")
           end
@@ -428,15 +453,13 @@ module VagrantPlugins
         end
 
         private
-        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 _floppies_print(floppies)
+          floppies.collect { |x| x[:dev] }.join(', ')
+        end
       end
     end
   end

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

@@ -2,6 +2,9 @@
 
 require 'log4r'
 
+require 'vagrant-libvirt/util/erb_template'
+require 'vagrant-libvirt/util/storage_util'
+
 module VagrantPlugins
   module ProviderLibvirt
     module Action

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

@@ -61,7 +61,7 @@ module VagrantPlugins
             # We have slot for interface, fill it with interface configuration.
             adapters[free_slot] = options
             adapters[free_slot][:network_name] = interface_network(
-              env[:machine].provider.driver.connection.client, adapters[free_slot]
+              env[:machine].provider.driver, adapters[free_slot]
             )
           end
 
@@ -76,6 +76,7 @@ module VagrantPlugins
             @mac = iface_configuration.fetch(:mac, false)
             @model_type = iface_configuration.fetch(:model_type, @nic_model_type)
             @driver_name = iface_configuration.fetch(:driver_name, false)
+            @driver_iommu = iface_configuration.fetch(:driver_iommu, false )
             @driver_queues = iface_configuration.fetch(:driver_queues, false)
             @device_name = iface_configuration.fetch(:iface_name, false)
             @mtu = iface_configuration.fetch(:mtu, nil)
@@ -84,12 +85,15 @@ module VagrantPlugins
             template_name = 'interface'
             @type = nil
             @udp_tunnel = nil
+
+            @logger.debug("Interface configuration: #{iface_configuration}")
             # Configuration for public interfaces which use the macvtap driver
             if iface_configuration[:iface_type] == :public_network
               @device = iface_configuration.fetch(:dev, 'eth0')
               @mode = iface_configuration.fetch(:mode, 'bridge')
               @type = iface_configuration.fetch(:type, 'direct')
               @model_type = iface_configuration.fetch(:model_type, @nic_model_type)
+              @driver_iommu = iface_configuration.fetch(:driver_iommu, false )
               @driver_name = iface_configuration.fetch(:driver_name, false)
               @driver_queues = iface_configuration.fetch(:driver_queues, false)
               @portgroup = iface_configuration.fetch(:portgroup, nil)
@@ -124,13 +128,14 @@ module VagrantPlugins
               }
               @tunnel_type = iface_configuration.fetch(:model_type, @nic_model_type)
               @driver_name = iface_configuration.fetch(:driver_name, false)
+              @driver_iommu = iface_configuration.fetch(:driver_iommu, false )
               @driver_queues = iface_configuration.fetch(:driver_queues, false)
               template_name = 'tunnel_interface'
               @logger.info("Setting up #{@type} tunnel interface using  #{@tunnel_ip} port #{@tunnel_port}")
             end
 
             message = "Creating network interface eth#{@iface_number}"
-            message += " connected to network #{@network_name}."
+            message += " connected to network #{@network_name} based on template #{template_name}."
             if @mac
               @mac = @mac.scan(/(\h{2})/).join(':')
               message += " Using MAC address: #{@mac}"
@@ -141,7 +146,9 @@ module VagrantPlugins
               # FIXME: all options for network driver should be hash from Vagrantfile
               driver_options = {}
               driver_options[:name] = @driver_name if @driver_name
+              driver_options[:iommu] = @driver_iommu ? "on" : "off" if @nic_model_type == 'virtio'
               driver_options[:queues] = @driver_queues if @driver_queues
+
               @udp_tunnel ||= {}
               xml = if template_name == 'interface' or
                        template_name == 'tunnel_interface'
@@ -259,12 +266,14 @@ module VagrantPlugins
               xml.source(source_options) do
                 xml.local(udp_tunnel) if type == 'udp'
               end
+
+              @logger.debug "Driver options: #{driver_options}"
+
               xml.mac(address: mac) if mac
               xml.target(dev: target_dev_name(device_name, type, iface_number))
-              xml.alias(name: "net#{iface_number}")
               xml.model(type: model_type.to_s)
               xml.mtu(size: Integer(mtu)) if mtu
-              xml.driver(driver_options)
+              xml.driver(**driver_options) if driver_options
               xml.address(type: 'pci', bus: pci_bus, slot: pci_slot) if pci_bus and pci_slot
             end
           end.to_xml(
@@ -282,7 +291,7 @@ module VagrantPlugins
         end
 
         # Return network name according to interface options.
-        def interface_network(libvirt_client, options)
+        def interface_network(driver, options)
           # no need to get interface network for tcp tunnel config
           return 'tunnel_interface' if options.fetch(:tunnel_type, nil)
 
@@ -292,7 +301,7 @@ module VagrantPlugins
           end
 
           # Get list of all (active and inactive) Libvirt networks.
-          available_networks = libvirt_networks(libvirt_client)
+          available_networks = libvirt_networks(driver)
 
           return 'public' if options[:iface_type] == :public_network
 

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

@@ -35,9 +35,7 @@ module VagrantPlugins
             # for VMs using sessions. It is likely that this should be done
             # to determine the correct virtual device for the management
             # network for sessions instead of assuming the default of virbr0.
-            @available_networks = libvirt_networks(
-              env[:machine].provider.driver.system_connection
-            )
+            @available_networks = libvirt_networks(env[:machine].provider.driver)
 
             @app.call(env)
             return
@@ -61,9 +59,7 @@ module VagrantPlugins
               # Get a list of all (active and inactive) Libvirt networks. This
               # list is used throughout this class and should be easier to
               # process than Libvirt API calls.
-              @available_networks = libvirt_networks(
-                env[:machine].provider.driver.connection.client
-              )
+              @available_networks = libvirt_networks(env[:machine].provider.driver)
 
               current_network = @available_networks.detect { |network| network[:name] == @options[:network_name] }
 

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

@@ -54,7 +54,7 @@ module VagrantPlugins
              env[:machine].provider_config.cdroms.empty?
             # if using default configuration of disks and cdroms
             # cdroms are consider volumes, but cannot be destroyed
-            destroy_domain(domain, destroy_volumes: true, flags: undefine_flags)
+            domain.destroy(destroy_volumes: true, flags: undefine_flags)
           else
             domain_xml = libvirt_domain.xml_desc(1)
             xml_descr = REXML::Document.new(domain_xml)
@@ -64,7 +64,7 @@ module VagrantPlugins
               env[:ui].warn(I18n.t('vagrant_libvirt.domain_xml.obsolete_method'))
             end
 
-            destroy_domain(domain, destroy_volumes: false, flags: undefine_flags)
+            domain.destroy(destroy_volumes: false, flags: undefine_flags)
 
             volumes = domain.volumes
 
@@ -171,14 +171,6 @@ 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/forward_ports.rb

@@ -110,7 +110,7 @@ module VagrantPlugins
               end
           ).map { |s| ['-o', s] }.flatten
 
-          options += ['-o', "ProxyCommand=\"#{ssh_info[:proxy_command]}\""] if machine.provider_config.proxy_command
+          options += ['-o', "ProxyCommand=\"#{ssh_info[:proxy_command]}\""] if machine.provider_config.proxy_command && !machine.provider_config.proxy_command.empty?
 
           ssh_cmd = ['ssh'] + options + params
 

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

@@ -20,7 +20,7 @@ module VagrantPlugins
             if libvirt_domain.has_managed_save?
               env[:result] = env[:machine].state.id == :shutoff
             else
-              env[:result] = env[:machine].state.id == :paused
+              env[:result] = [:paused, :pmsuspended].include?(env[:machine].state.id)
               if env[:result]
                 env[:ui].warn('One time switching to pause suspend mode, found a paused VM.')
                 config.suspend_mode = 'pause'
@@ -32,7 +32,7 @@ module VagrantPlugins
               env[:result] = [:shutoff, :paused].include?(env[:machine].state.id)
               config.suspend_mode = 'managedsave'
             else
-              env[:result] = env[:machine].state.id == :paused
+              env[:result] = [:paused, :pmsuspended].include?(env[:machine].state.id)
             end
           end
 

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

@@ -52,8 +52,8 @@ module VagrantPlugins
         # @return [String]
         def read_machine_ip(machine)
           # check host only ip
-          ssh_host = machine.ssh_info[:host]
-          return ssh_host if ping(ssh_host)
+          ssh_info = machine.ssh_info
+          return ssh_info[:host] if ping(ssh_info[:host], ssh_info[:port])
 
           # check other ips
           command = "ip=$(which ip); ${ip:-/sbin/ip} addr show | grep -i 'inet ' | grep -v '127.0.0.1' | tr -s ' ' | cut -d' ' -f3 | cut -d'/' -f 1"
@@ -65,17 +65,19 @@ module VagrantPlugins
           ips = result.chomp.split("\n").uniq
           @logger.info("guest IPs: #{ips.join(', ')}")
           ips.each do |ip|
-            next if ip == ssh_host
+            next if ip == ssh_info[:host]
             return ip if ping(ip)
           end
+
+          nil
         end
 
         private
 
         # Check if we can open a connection to the host
-        def ping(host, timeout = 3)
+        def ping(host, port=nil, timeout = 3)
           ::Timeout.timeout(timeout) do
-            s = TCPSocket.new(host, 'ssh')
+            s = TCPSocket.new(host, port || 'ssh')
             s.close
           end
           true

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

@@ -23,6 +23,7 @@ module VagrantPlugins
           domain_name = env[:domain_name] # only set on create
           disk_bus = config.disk_bus
           disk_device = config.disk_device
+          disk_address_type = config.disk_address_type
           domain_volume_cache = config.volume_cache || 'default'
 
           # Storage
@@ -84,6 +85,7 @@ module VagrantPlugins
                     device: env[:box_volumes][index][:device],
                     cache: domain_volume_cache,
                     bus: disk_bus,
+                    address_type: disk_address_type,
                     absolute_path: domain_volume.path,
                     virtual_size: env[:box_volumes][index][:virtual_size],
                     pool: pool_name,

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

@@ -20,7 +20,9 @@ module VagrantPlugins
 
           libvirt_domain = env[:machine].provider.driver.connection.client.lookup_domain_by_uuid(env[:machine].id)
           config = env[:machine].provider_config
-          if config.suspend_mode == 'managedsave'
+          if env[:machine].state.id == :pmsuspended
+            libvirt_domain.pmwakeup
+          elsif config.suspend_mode == 'managedsave'
             domain.start
           else
             domain.resume

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

@@ -12,7 +12,7 @@ module VagrantPlugins
           env[:ui].info(I18n.t(
             "vagrant.actions.vm.snapshot.deleting",
             name: env[:snapshot_name]))
-          env[:machine].provider.driver.delete_snapshot(env[:machine], env[:snapshot_name])
+          env[:machine].provider.driver.delete_snapshot(env[:snapshot_name])
 
           env[:ui].success(I18n.t(
             "vagrant.actions.vm.snapshot.deleted",

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

@@ -12,7 +12,7 @@ module VagrantPlugins
           env[:ui].info(I18n.t(
             "vagrant.actions.vm.snapshot.restoring",
             name: env[:snapshot_name]))
-          env[:machine].provider.driver.restore_snapshot(env[:machine], env[:snapshot_name])
+          env[:machine].provider.driver.restore_snapshot(env[:snapshot_name])
 
           @app.call(env)
         end

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

@@ -12,8 +12,7 @@ module VagrantPlugins
           env[:ui].info(I18n.t(
             "vagrant.actions.vm.snapshot.saving",
             name: env[:snapshot_name]))
-          env[:machine].provider.driver.create_snapshot(
-            env[:machine], env[:snapshot_name])
+          env[:machine].provider.driver.create_snapshot(env[:snapshot_name])
 
           env[:ui].success(I18n.t(
             "vagrant.actions.vm.snapshot.saved",