vagrant-libvirt 0.6.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e9e48f76c74f80aa79c260ab558d0a72ec8dd3ecc667731ff05bd0a54d8ab8b
-  data.tar.gz: 8144733ea9d0f2a0a3152d481ab690120017a6767dcee783de8d5ba86d320d62
+  metadata.gz: b1bfaefd1dab7cbdb1293e867e29fef05a9eb101fae5226a38203593de84e717
+  data.tar.gz: d36d4f487ed2ad0b4f00ba09c263a5cd8deda6c268eef50974376e2796b7e64d
 SHA512:
-  metadata.gz: a4a81d5cacbee89973ae0dee7eedcc28ccee0a66d9d1139cef7a91ade87b16ca85a91f0cf22e7d8659450114691fc3079b7beef5cb002621683881cc99ca634a
-  data.tar.gz: 418ed72a453ba03aca7c0cb67d15adc431d37ab5de7c7f0f2d9f9a987f90ad7a88e923249eaf0a324ebc57886dc1b4d9eb23bcf3258254970dc8cdc8ba9a6f90
+  metadata.gz: 510c1b6ffd2fb4eea02ede8d7612c3a41a89e5c50b630370bec6fd70b79986caa222e6ce1cc0f4c2732b310f7c134866aa2283ee449441c92078b148c4734503
+  data.tar.gz: cb6ab754dcff508ec150c6ff67cf82b603243596b35ab6a5ef79d4dfe36042a933dde8eebc3630d5a2473c8fcd398111a98d12a64a66950ad0abe942c15bce40

data/README.md

@@ -1,8 +1,9 @@
 # Vagrant Libvirt Provider
 
 [![Join the chat at https://gitter.im/vagrant-libvirt/vagrant-libvirt](https://badges.gitter.im/vagrant-libvirt/vagrant-libvirt.svg)](https://gitter.im/vagrant-libvirt/vagrant-libvirt?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Build Status](https://travis-ci.org/vagrant-libvirt/vagrant-libvirt.svg)](https://travis-ci.org/vagrant-libvirt/vagrant-libvirt)
+[![Build Status](https://github.com/vagrant-libvirt/vagrant-libvirt/actions/workflows/unit-tests.yml/badge.svg)](https://github.com/vagrant-libvirt/vagrant-libvirt/actions/workflows/unit-tests.yml)
 [![Coverage Status](https://coveralls.io/repos/github/vagrant-libvirt/vagrant-libvirt/badge.svg?branch=master)](https://coveralls.io/github/vagrant-libvirt/vagrant-libvirt?branch=master)
+[![Gem Version](https://badge.fury.io/rb/vagrant-libvirt.svg)](https://badge.fury.io/rb/vagrant-libvirt)
 
 This is a [Vagrant](http://www.vagrantup.com) plugin that adds a
 [Libvirt](http://libvirt.org) provider to Vagrant, allowing Vagrant to
@@ -48,6 +49,7 @@ can help a lot :-)
   * [USB Device Passthrough](#usb-device-passthrough)
   * [USB Redirector Devices](#usb-redirector-devices)
     * [Filter for USB Redirector Devices](#filter-for-usb-redirector-devices)
+* [Serial Console Devices](#serial-console-devices)
 * [Random number generator passthrough](#random-number-generator-passthrough)
 * [Watchdog device](#watchdog-device)
 * [Smartcard device](#smartcard-device)
@@ -137,15 +139,9 @@ docker pull vagrantlibvirt/vagrant-libvirt:edge
 ```
 ---
 
-Preparing the docker run, only once:
-
-```bash
-mkdir -p ~/.vagrant.d/{boxes,data,tmp}
-```
-
 Running the image:
 ```bash
-docker run -it --rm \
+docker run -i --rm \
   -e LIBVIRT_DEFAULT_URI \
   -v /var/run/libvirt/:/var/run/libvirt/ \
   -v ~/.vagrant.d:/.vagrant.d \
@@ -159,7 +155,7 @@ docker run -it --rm \
 It's possible to define a function in `~/.bashrc`, for example:
 ```bash
 vagrant(){
-  docker run -it --rm \
+  docker run -i --rm \
     -e LIBVIRT_DEFAULT_URI \
     -v /var/run/libvirt/:/var/run/libvirt/ \
     -v ~/.vagrant.d:/.vagrant.d \
@@ -173,6 +169,14 @@ vagrant(){
 ```
 
 ### Using Podman
+
+Preparing the podman run, only once:
+
+```bash
+mkdir -p ~/.vagrant.d/{boxes,data,tmp}
+```
+_N.B. This is needed until the entrypoint works for podman to only mount the `~/.vagrant.d` directory_
+
 To run with Podman you need to include
 
 ```bash
@@ -180,6 +184,7 @@ To run with Podman you need to include
   --security-opt label=disable \
   -v ~/.vagrant.d/boxes:/vagrant/boxes \
   -v ~/.vagrant.d/data:/vagrant/data \
+  -v ~/.vagrant.d/tmp:/vagrant/tmp \
 ```
 
 for example:
@@ -191,6 +196,7 @@ vagrant(){
     -v /var/run/libvirt/:/var/run/libvirt/ \
     -v ~/.vagrant.d/boxes:/vagrant/boxes \
     -v ~/.vagrant.d/data:/vagrant/data \
+    -v ~/.vagrant.d/tmp:/vagrant/tmp \
     -v $(realpath "${PWD}"):${PWD} \
     -w $(realpath "${PWD}") \
     --network host \
@@ -232,7 +238,7 @@ installed](http://docs.vagrantup.com/v2/installation/index.html).
 Vagrant-libvirt supports Vagrant 2.0, 2.1 & 2.2. It should also work with earlier
 releases from 1.5 onwards but they are not actively tested.
 
-Check the [.travis.yml](https://github.com/vagrant-libvirt/vagrant-libvirt/blob/master/.travis.yml)
+Check the [unit tests](https://github.com/vagrant-libvirt/vagrant-libvirt/blob/master/.github/workflows/unit-tests.yml)
 for the current list of tested versions.
 
 *We only test with the upstream version!* If you decide to install your distro's
@@ -593,6 +599,8 @@ end
 * `graphics_autoport` - Sets autoport for graphics, Libvirt in this case
   ignores graphics_port value, Defaults to 'yes'. Possible value are "yes" and
   "no"
+* `graphics_gl` - Set to `true` to enable OpenGL. Defaults to `true` if
+`video_accel3d` is `true`.
 * `keymap` - Set keymap for vm. default: en-us
 * `kvm_hidden` - [Hide the hypervisor from the
   guest](https://libvirt.org/formatdomain.html#elementsFeatures). Useful for
@@ -602,7 +610,9 @@ end
   values](http://libvirt.org/formatdomain.html#elementsVideo) are "vga",
   "cirrus", "vmvga", "xen", "vbox", or "qxl".
 * `video_vram` - Used by some graphics card types to vary the amount of RAM
-  dedicated to video.  Defaults to 9216.
+  dedicated to video.  Defaults to 16384.
+* `video_accel3d` - Set to `true` to enable 3D acceleration. Defaults to
+`false`.
 * `sound_type` - [Set the virtual sound card](https://libvirt.org/formatdomain.html#elementsSound)
   Defaults to "ich6".
 * `machine_type` - Sets machine type. Equivalent to qemu `-machine`. Use
@@ -657,6 +667,9 @@ end
   it is not possible to communicate with VM through `vagrant ssh` or run
   provisioning. Setting to 'false' is only possible when VM doesn't use box.
   Defaults set to 'true'.
+* `serial` - [libvirt serial devices](https://libvirt.org/formatdomain.html#elementsConsole).
+  Configure a serial/console port to communicate with the guest. Can be used
+  to log to file boot time messages sent to ttyS0 console by the guest.
 
 Specific domain settings can be set for each domain separately in multi-VM
 environment. Example below shows a part of Vagrantfile, where specific options
@@ -846,6 +859,7 @@ starts with `libvirt__` string. Here is a list of those options:
 * `:libvirt__dhcp_bootp_server` - The server that runs the DHCP server.  Used
   only when dhcp is enabled.By default is the same host that runs the DHCP
   server.
+* `:libvirt__tftp_root` - Path to the root directory served via TFTP.
 * `:libvirt__adapter` - Number specifiyng sequence number of interface.
 * `:libvirt__forward_mode` - Specify one of `veryisolated`, `none`, `open`, `nat`
   or `route` options.  This option is used only when creating new network. Mode
@@ -906,6 +920,9 @@ starts with `libvirt__` string. Here is a list of those options:
   If not specified the default is 'false'.
 * `:bus` - The bus of the PCI device. Both :bus and :slot have to be defined.
 * `:slot` - The slot of the PCI device. Both :bus and :slot have to be defined.
+* `:libvirt__always_destroy` - Allow domains that use but did not create a
+  network to destroy it when the domain is destroyed (default: `true`). Set to
+  `false` to only allow the domain that created the network to destroy it.
 
 When the option `:libvirt__dhcp_enabled` is to to 'false' it shouldn't matter
 whether the virtual network contains a DHCP server or not and vagrant-libvirt
@@ -961,6 +978,8 @@ used by this network are configurable at the provider level.
 * `management_network_domain` - Domain name assigned to the management network.
 * `management_network_mtu` - MTU size of management network. If not specified,
   the Libvirt default (1500) will be used.
+* `management_network_keep` - Starting from version *0.7.0*, *always_destroy* is set to *true* by default for any network.
+  This option allows to change this behaviour for the management network.
 
 You may wonder how vagrant-libvirt knows the IP address a VM received.  Libvirt
 doesn't provide a standard way to find out the IP address of a running domain.
@@ -983,6 +1002,19 @@ if it detects an attached channel during boot.
 * `qemu_use_agent` - false by default, if set to true, attempt to extract configured
   ip address via qemu agent.
 
+By default if `qemu_use_agent` is set to `true` the code will automatically
+inject a suitable channel unless there already exists an entry with a
+`:target_name` matching `'org.qemu.guest_agent.'`.
+Alternatively if setting `qemu_use_agent` but, needing to disable the addition
+of the channel, simply use a disabled flag as follows:
+```ruby
+Vagrant.configure(2) do |config|
+  config.vm.provider :libvirt do |libvirt|
+    libvirt.channel :type => 'unix', :target_name => 'org.qemu.guest_agent.0', :disabled => true
+  end
+end
+```
+
 To use the management network interface with an external dhcp service you need
 to setup a bridged host network manually and define it via
 `management_network_name` in your Vagrantfile.
@@ -1180,9 +1212,9 @@ Bus 001 Device 002: ID 1234:abcd Example device
 Vagrant.configure("2") do |config|
   config.vm.provider :libvirt do |libvirt|
     # pass through specific device based on identifying it
-    libvirt.usbdev :vendor => '0x1234', :product => '0xabcd'
+    libvirt.usb :vendor => '0x1234', :product => '0xabcd'
     # pass through a host device where multiple of the same vendor/product exist
-    libvirt.usbdev :bus => '1', :device => '1'
+    libvirt.usb :bus => '1', :device => '1'
   end
 end
 ```
@@ -1249,6 +1281,26 @@ Vagrant.configure("2") do |config|
 end
 ```
 
+## Serial Console Devices
+You can define settings to redirect output from the serial console of any VM brought up with libvirt to a file or other devices that are listening. [See libvirt documentation](https://libvirt.org/formatdomain.html#elementCharSerial).
+
+Currently only redirecting to a file is supported.
+
+* `type` - only value that has an effect is file, in the future support may be added for virtual console, pty, dev, pipe, tcp, udp, unix socket, spiceport & nmdm.
+* `source` - options pertaining to how the connection attaches to the host, contains sub-settings dependent on `type`.
+  `source` options for type `file`
+  * `path` - file on host to connect to the serial port to record all output. May be created by qemu system user causing some permissions issues.
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.define :test do |test|
+    test.vm.provider :libvirt do |domain|
+      domain.serial :type => "file", :source => {:path => "/var/log/vm_consoles/test.log"}
+    end
+  end
+end
+```
+
 ## Random number generator passthrough
 
 You can pass through `/dev/random` to your VM by configuring the domain like this:

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

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+
+module VagrantPlugins
+  module ProviderLibvirt
+    module Action
+      class CleanupOnFailure
+        def initialize(app, _env)
+          @logger = Log4r::Logger.new('vagrant_libvirt::action::cleanup_on_failure')
+          @app = app
+          @cleanup = true
+        end
+
+        def call(env)
+          # passing a value doesn't work as the env that is updated may be dupped from
+          # the original meaning the latter action's update is discarded. Instead pass
+          # a reference to the method on this class that will toggle the instance
+          # variable indicating whether cleanup is needed or not.
+          env['vagrant-libvirt.complete'] = method(:completed)
+
+          @app.call(env)
+        end
+
+        def recover(env)
+          return unless env[:machine] && env[:machine].state.id != :not_created
+
+          # only destroy if failed to complete bring up
+          unless @cleanup
+            @logger.debug('VM provider setup was completed, no need to halt/destroy')
+            return
+          end
+
+          # If we're not supposed to destroy on error then just return
+          return unless env[:destroy_on_error]
+
+          if env[:halt_on_error]
+            halt_env = env.dup
+            halt_env.delete(:interrupted)
+            halt_env[:config_validate] = false
+            env[:action_runner].run(Action.action_halt, halt_env)
+          else
+            destroy_env = env.dup
+            destroy_env.delete(:interrupted)
+            destroy_env[:config_validate] = false
+            destroy_env[:force_confirm_destroy] = true
+            env[:action_runner].run(Action.action_destroy, destroy_env)
+          end
+        end
+
+        def completed
+          @cleanup = false
+        end
+      end
+
+      class SetupComplete
+        def initialize(app, _env)
+          @logger = Log4r::Logger.new('vagrant_libvirt::action::setup_complete')
+          @app = app
+        end
+
+        def call(env)
+          if env['vagrant-libvirt.complete'].nil? or !env['vagrant-libvirt.complete'].respond_to? :call
+            raise Errors::CallChainError, require_action: CleanupOnFailure.name, current_action: SetupComplete.name
+          end
+
+          @logger.debug('Marking provider setup as completed')
+          # mark provider as finished setup so that any failure after this
+          # point doesn't result in destroying or shutting down the VM
+          env['vagrant-libvirt.complete'].call
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -2,6 +2,8 @@
 
 require 'log4r'
 
+require 'vagrant-libvirt/util/resolvers'
+
 module VagrantPlugins
   module ProviderLibvirt
     module Action
@@ -20,7 +22,7 @@ module VagrantPlugins
 
         def _disks_print(disks)
           disks.collect do |x|
-            "#{x[:device]}(#{x[:type]},#{x[:size]})"
+            "#{x[:device]}(#{x[:type]}, #{x[:bus]}, #{x[:size]})"
           end.join(', ')
         end
 
@@ -73,14 +75,12 @@ module VagrantPlugins
           @graphics_autoport = config.graphics_autoport
           @graphics_port = config.graphics_port
           @graphics_ip = config.graphics_ip
-          @graphics_passwd = if config.graphics_passwd.to_s.empty?
-                               ''
-                             else
-                               "passwd='#{config.graphics_passwd}'"
-                              end
+          @graphics_passwd = config.graphics_passwd
+          @graphics_gl = config.graphics_gl
           @video_type = config.video_type
           @sound_type = config.sound_type
           @video_vram = config.video_vram
+          @video_accel3d = config.video_accel3d
           @keymap = config.keymap
           @kvm_hidden = config.kvm_hidden
 
@@ -133,11 +133,19 @@ module VagrantPlugins
           # RNG device passthrough
           @rng = config.rng
 
+          # Memballoon
+          @memballoon_enabled = config.memballoon_enabled
+          @memballoon_model = config.memballoon_model
+          @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
@@ -145,6 +153,12 @@ module VagrantPlugins
             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}" : ''
@@ -152,14 +166,16 @@ module VagrantPlugins
                 name: "#{@name}#{suffix_index}.img"
               ).find { |x| x.pool_name == pool_name }
               raise Errors::DomainVolumeExists if domain_volume.nil?
+
               @domain_volumes.push({
-                :dev => (index+1).vdev.to_s,
+                :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
+            end
+
           end
 
           # If we have a box, take the path from the domain volume and set our storage_prefix.
@@ -171,6 +187,8 @@ module VagrantPlugins
             storage_prefix = get_disk_storage_prefix(env, @storage_pool_name)
           end
 
+          resolver.resolve!(@disks)
+
           @disks.each do |disk|
             disk[:path] ||= _disk_name(@name, disk)
 
@@ -219,6 +237,20 @@ module VagrantPlugins
             end
           end
 
+          @serials = config.serials
+
+          @serials.each do |serial|
+            next unless serial[:source] && serial[:source][:path]
+
+            dir = File.dirname(serial[:source][:path])
+            begin
+              FileUtils.mkdir_p(dir)
+            rescue ::Errno::EACCES
+              raise Errors::SerialCannotCreatePathError,
+                    path: dir
+            end
+          end
+
           # Output the settings we're going to use to the user
           env[:ui].info(I18n.t('vagrant_libvirt.creating_domain'))
           env[:ui].info(" -- Name:              #{@name}")
@@ -268,7 +300,7 @@ module VagrantPlugins
           end
           env[:ui].info(" -- Storage pool:      #{@storage_pool_name}")
           @domain_volumes.each do |volume|
-            env[:ui].info(" -- Image(#{volume[:device]}):     #{volume[:path]}, #{volume[:virtual_size].to_GB}G")
+            env[:ui].info(" -- Image(#{volume[:dev]}):        #{volume[:path]}, #{volume[:bus]}, #{volume[:virtual_size].to_GB}G")
           end
 
           if not @disk_driver_opts.empty?
@@ -282,9 +314,10 @@ module VagrantPlugins
           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.empty? ? 'Not defined' : 'Defined'}")
+          env[:ui].info(" -- Graphics Password: #{@graphics_passwd.nil? ? 'Not defined' : 'Defined'}")
           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(" -- Keymap:            #{@keymap}")
           env[:ui].info(" -- TPM Backend:       #{@tpm_type}")
@@ -295,6 +328,12 @@ module VagrantPlugins
             env[:ui].info(" -- TPM Path:          #{@tpm_path}")
           end
 
+          if @memballoon_enabled
+            env[:ui].info(" -- Memballoon model:  #{@memballoon_model}")
+            env[:ui].info(" -- Memballoon bus:    #{@memballoon_pci_bus}")
+            env[:ui].info(" -- Memballoon slot:   #{@memballoon_pci_slot}")
+          end
+
           @boot_order.each do |device|
             env[:ui].info(" -- Boot device:        #{device}")
           end
@@ -379,6 +418,13 @@ module VagrantPlugins
             env[:ui].info(" -- smartcard device:  mode=#{@smartcard_dev[:mode]}, type=#{@smartcard_dev[:type]}")
           end
 
+          @serials.each_with_index do |serial, port|
+            if serial[:source]
+              env[:ui].info(" -- SERIAL(COM#{port}:       redirect to #{serial[:source][:path]}")
+              env[:ui].warn(I18n.t('vagrant_libvirt.warnings.creating_domain_console_access_disabled'))
+            end
+          end
+
           unless @qemu_args.empty?
             env[:ui].info(' -- Command line args: ')
             @qemu_args.each do |arg|

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

@@ -213,8 +213,12 @@ module VagrantPlugins
                   type: :static,
                   ip: options[:ip],
                   netmask: options[:netmask],
-                  gateway: options[:gateway]
+                  gateway: options[:gateway],
+                  route: options[:route]
                 }.merge(network)
+                if IPAddr.new(options[:ip]).ipv6?
+                  network[:type] = :static6
+                end
               else
                 network[:type] = :dhcp
               end

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

@@ -30,6 +30,15 @@ module VagrantPlugins
 
         def call(env)
           if env[:machine].provider_config.qemu_use_session
+            # Get a list of all (active and inactive) Libvirt networks. This
+            # triggers a side effect to ensure networking is fully available
+            # 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
+            )
+
             @app.call(env)
             return
           end
@@ -208,6 +217,9 @@ module VagrantPlugins
 
             # Create a private network.
             create_private_network(env)
+            write_created_network(env)
+          else
+            write_created_network(env) unless @options[:always_destroy] == false
           end
         end
 
@@ -247,6 +259,9 @@ module VagrantPlugins
 
             # Create a private network.
             create_private_network(env)
+            write_created_network(env)
+          else
+            write_created_network(env) unless @options[:always_destroy] == false
           end
         end
 
@@ -273,6 +288,9 @@ module VagrantPlugins
 
             # Create a private network.
             create_private_network(env)
+            write_created_network(env)
+          else
+            write_created_network(env) unless @options[:always_destroy] == false
           end
         end
 
@@ -334,6 +352,10 @@ module VagrantPlugins
             @network_dhcp_enabled = false
           end
 
+          if @options[:tftp_root]
+            @tftp_root = @options[:tftp_root]
+          end
+
           @network_domain_name = @options[:domain_name]
 
           begin
@@ -347,7 +369,9 @@ module VagrantPlugins
           rescue => e
             raise Errors::CreateNetworkError, error_message: e.message
           end
+        end
 
+        def write_created_network(env)
           created_networks_file = env[:machine].data_dir + 'created_networks'
 
           message = 'Saving information about created network ' \

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'log4r'
+require 'rexml'
 
 module VagrantPlugins
   module ProviderLibvirt
@@ -48,37 +49,121 @@ module VagrantPlugins
             # cdroms are consider volumes, but cannot be destroyed
             domain.destroy(destroy_volumes: true)
           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'))
+            end
+
             domain.destroy(destroy_volumes: false)
 
-            env[:machine].provider_config.disks.each do |disk|
-              # shared disks remove only manually or ???
-              next if disk[:allow_existing]
-              diskname = libvirt_domain.name + '-' + disk[:device] + '.' + disk[:type].to_s
-              # diskname is unique
-              libvirt_disk = domain.volumes.select do |x|
-                x.name == diskname
-              end.first
-              if libvirt_disk
-                libvirt_disk.destroy
-              elsif disk[:path]
-                poolname = env[:machine].provider_config.storage_pool_name
-                libvirt_disk = domain.volumes.select do |x|
-                  # FIXME: can remove pool/target.img and pool/123/target.img
-                  x.path =~ /\/#{disk[:path]}$/ && x.pool_name == poolname
+            volumes = domain.volumes
+
+            # Remove root storage. If no aliases available, perform the removal by name and keep track
+            # of how many matches there are in the volumes. This will provide a fallback offset to where
+            # the additional storage devices are.
+            detected_box_volumes = 0
+            if have_aliases
+              REXML::XPath.match(disks_xml, './alias[contains(@name, "ua-box-volume-")]').each do |box_disk|
+                diskname = box_disk.parent.elements['source'].attributes['file'].rpartition('/').last
+                detected_box_volumes += 1
+
+                destroy_volume(volumes, diskname, env)
+              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, idx|
+                name = libvirt_domain.name + (idx == 0 ? '.img' : "_#{idx}.img")
+                diskname = box_disk.elements['source'].attributes['file'].rpartition('/').last
+
+                break if name != diskname
+                detected_box_volumes += 1
+
+                root_disk = volumes.select do |x|
+                  x.name == name if x
                 end.first
-                libvirt_disk.destroy if libvirt_disk
+                if root_disk
+                  root_disk.destroy
+                end
               end
             end
 
-            # remove root storage
-            root_disk = domain.volumes.select do |x|
-              x.name == libvirt_domain.name + '.img' if x
-            end.first
-            root_disk.destroy if root_disk
+            # work out if there are any custom disks attached that wasn't done by vagrant-libvirt,
+            # and warn there might be unexpected behaviour
+            total_disks = disks_xml.length
+            offset = total_disks - env[:machine].provider_config.disks.length
+            if offset != detected_box_volumes
+              env[:ui].warn(I18n.t('vagrant_libvirt.destroy.unexpected_volumes'))
+            end
+
+            if !have_aliases
+              # if no aliases found, see if it's possible to check the number of box disks
+              # otherwise the destroy could remove the wrong disk by accident.
+              if env[:machine].box != nil
+                box_disks = env[:machine].box.metadata.fetch('disks', [1])
+                offset = box_disks.length
+                if offset != detected_box_volumes
+                  env[:ui].warn(I18n.t('vagrant_libvirt.destroy.expected_removal_mismatch'))
+                end
+              else
+                env[:ui].warn(I18n.t('vagrant_libvirt.destroy.box_metadata_unavailable'))
+              end
+
+              # offset only used when no aliases available
+              offset = detected_box_volumes
+            end
+
+            env[:machine].provider_config.disks.each_with_index.each do |disk, index|
+              # shared disks remove only manually or ???
+              next if disk[:allow_existing]
+
+              # look for exact match using aliases which will be used
+              # for subsequent domain creations
+              if have_aliases
+                domain_disk = REXML::XPath.match(disks_xml, './alias[@name="ua-disk-volume-' + index.to_s + '"]').first
+                domain_disk = domain_disk.parent if !domain_disk.nil?
+              else
+                # otherwise fallback to find the disk by device if specified by user
+                # and finally index counting with offset and hope the match is correct
+                if !disk[:device].nil?
+                  domain_disk = REXML::XPath.match(disks_xml, './target[@dev="' + disk[:device] + '"]').first
+                  domain_disk = domain_disk.parent if !domain_disk.nil?
+                else
+                  domain_disk = disks_xml[offset + index]
+                end
+              end
+
+              next if domain_disk.nil?
+
+              diskname = domain_disk.elements['source'].attributes['file'].rpartition('/').last
+              destroy_volume(volumes, diskname, env)
+            end
           end
 
           @app.call(env)
         end
+
+        protected
+
+        def destroy_volume(volumes, diskname, env)
+          # diskname is unique
+          libvirt_disk = volumes.select do |x|
+            x.name == diskname if x
+          end.first
+          if libvirt_disk
+            libvirt_disk.destroy
+          elsif disk[:path]
+            poolname = env[:machine].provider_config.storage_pool_name
+            libvirt_disk = volumes.select do |x|
+              # FIXME: can remove pool/target.img and pool/123/target.img
+              x.path =~ /\/#{disk[:path]}$/ && x.pool_name == poolname
+            end.first
+            libvirt_disk.destroy if libvirt_disk
+          end
+        end
       end
     end
   end