vagrant-libvirt 0.0.43 → 0.0.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0c42ba18912a85fe40f2547f06e454ecd2ce38b0
-  data.tar.gz: 7ba91e28bd673e009b0d60912e1f0e5e21847196
+SHA256:
+  metadata.gz: 418a49ce7fd1b2f951f64f38e13479bbe2b894933b3127d8e70ad47a27ec78a5
+  data.tar.gz: 6450a6b6a234718c59481418ecb8568af1dc1ddd8d924af1f5879e632dc3cabd
 SHA512:
-  metadata.gz: b9583d2e0b44d2199cb42a7dfafb7cc43501ced072144dd703a2a630d33c397d52127ba9ba95a96a4c1cd83cb2550d0cbdf19ba18737b170a033778b073520f3
-  data.tar.gz: 5556600da47984ac843c23a226e0467d7b3bcc3c44543255ab71f4d15f68ae20674571efc22ae4733f1a751f4c3bf1bde5fada6d987f46d9b37c8bd5fc4a492e
+  metadata.gz: 81a5f88b26b1048b66c8bc7249443c6f013d157dd2d43df4c2cc523f94d5e9fc96f52b522f2addab2347607ce9d8226695662032da08caaf4aabd0a5f1667120
+  data.tar.gz: 90dca18364b8b9eb23c9598d480717d2113d9b43f5846189174e4ca25868cd52a7d37ed3fde5614d8a132cf3163c8e07c8682cb9c6cb518bfa3f28381a99f0f8

data/README.md

@@ -11,15 +11,6 @@ control and provision machines via Libvirt toolkit.
 **Note:** Actual version is still a development one. Feedback is welcome and
 can help a lot :-)
 
-## QA status
-
-We periodically test basic functionality for vagrant-libvirt on various distributions.
-In the table below, build passing means that specific version combination of Vagrant + Vagrant-libvirt was installed correctly and `vagrant up` is working. Click the badge to see the log.
-
-|Vagrant|Vagrant-libvirt|ubuntu-12.04|ubuntu-14.04|ubuntu-16.04|debian-8|debian-9|centos-6|centos-7|fedora-21|fedora-22|fedora-23|fedora-24|arch|
-|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
-|2.0.1|master|[![Build Status](https://jenkins.infernix.net/job/vagrant-libvirt-qa/qa_vagrant_libvirt_version=master,qa_vagrant_version=2.0.1,distro=ubuntu-12.04/badge/icon)](https://jenkins.infernix.net/job/vagrant-libvirt-qa/qa_vagrant_libvirt_version=master,qa_vagrant_version=2.0.1,distro=ubuntu-12.04/)|[![Build Status](https://jenkins.infernix.net/job/vagrant-libvirt-qa/qa_vagrant_libvirt_version=master,qa_vagrant_version=2.0.1,distro=ubuntu-14.04/badge/icon)](https://jenkins.infernix.net/job/vagrant-libvirt-qa/qa_vagrant_libvirt_version=master,qa_vagrant_version=2.0.1,distro=ubuntu-14.04/)|[![Build Status](https://jenkins.infernix.net/job/vagrant-libvirt-qa/qa_vagrant_libvirt_version=master,qa_vagrant_version=2.0.1,distro=ubuntu-16.04/badge/icon)](https://jenkins.infernix.net/job/vagrant-libvirt-qa/qa_vagrant_libvirt_version=master,qa_vagrant_version=2.0.1,distro=ubuntu-16.04/)|[![Build Status](https://jenkins.infernix.net/job/vagrant-libvirt-qa/qa_vagrant_libvirt_version=master,qa_vagrant_version=2.0.1,distro=debian-8/badge/icon)](https://jenkins.infernix.net/job/vagrant-libvirt-qa/qa_vagrant_libvirt_version=master,qa_vagrant_version=2.0.1,distro=debian-8/)|[![Build Status](https://jenkins.infernix.net/job/vagrant-libvirt-qa/qa_vagrant_libvirt_version=master,qa_vagrant_version=2.0.1,distro=debian-9/badge/icon)](https://jenkins.infernix.net/job/vagrant-libvirt-qa/qa_vagrant_libvirt_version=master,qa_vagrant_version=2.0.1,distro=debian-9/)|[![Build Status](https://jenkins.infernix.net/job/vagrant-libvirt-qa/qa_vagrant_libvirt_version=master,qa_vagrant_version=2.0.1,distro=centos-6/badge/icon)](https://jenkins.infernix.net/job/vagrant-libvirt-qa/qa_vagrant_libvirt_version=master,qa_vagrant_version=2.0.1,distro=centos-6/)|[![Build Status](https://jenkins.infernix.net/job/vagrant-libvirt-qa/qa_vagrant_libvirt_version=master,qa_vagrant_version=2.0.1,distro=centos-7/badge/icon)](https://jenkins.infernix.net/job/vagrant-libvirt-qa/qa_vagrant_libvirt_version=master,qa_vagrant_version=2.0.1,distro=centos-7/)|[![Build Status](https://jenkins.infernix.net/job/vagrant-libvirt-qa/qa_vagrant_libvirt_version=master,qa_vagrant_version=2.0.1,distro=fedora-21/badge/icon)](https://jenkins.infernix.net/job/vagrant-libvirt-qa/qa_vagrant_libvirt_version=master,qa_vagrant_version=2.0.1,distro=fedora-21/)|[![Build Status](https://jenkins.infernix.net/job/vagrant-libvirt-qa/qa_vagrant_libvirt_version=master,qa_vagrant_version=2.0.1,distro=fedora-22/badge/icon)](https://jenkins.infernix.net/job/vagrant-libvirt-qa/qa_vagrant_libvirt_version=master,qa_vagrant_version=2.0.1,distro=fedora-22/)|[![Build Status](https://jenkins.infernix.net/job/vagrant-libvirt-qa/qa_vagrant_libvirt_version=master,qa_vagrant_version=2.0.1,distro=fedora-23/badge/icon)](https://jenkins.infernix.net/job/vagrant-libvirt-qa/qa_vagrant_libvirt_version=master,qa_vagrant_version=2.0.1,distro=fedora-23/)|[![Build Status](https://jenkins.infernix.net/job/vagrant-libvirt-qa/qa_vagrant_libvirt_version=master,qa_vagrant_version=2.0.1,distro=fedora-24/badge/icon)](https://jenkins.infernix.net/job/vagrant-libvirt-qa/qa_vagrant_libvirt_version=master,qa_vagrant_version=2.0.1,distro=fedora-24/)|[![Build Status](https://jenkins.infernix.net/job/vagrant-libvirt-qa/qa_vagrant_libvirt_version=master,qa_vagrant_version=2.0.1,distro=arch/badge/icon)](https://jenkins.infernix.net/job/vagrant-libvirt-qa/qa_vagrant_libvirt_version=master,qa_vagrant_version=2.0.1,distro=arch/)|
-
 ## Index
 
 
@@ -45,15 +36,18 @@ In the table below, build passing means that specific version combination of Vag
 - [CDROMs](#cdroms)
 - [Input](#input)
 - [PCI device passthrough](#pci-device-passthrough)
+- [USB Controller Configuration](#usb-controller-configuration)
 - [USB Redirector Devices](#usb-redirector-devices)
 - [Random number generator passthrough](#random-number-generator-passthrough)
 - [Watchdog·Device](#watchdog-device)
 - [Smartcard device](#smartcard-device)
+- [Hypervisor Features](#hypervisor-features)
 - [CPU Features](#cpu-features)
 - [No box and PXE boot](#no-box-and-pxe-boot)
 - [SSH Access To VM](#ssh-access-to-vm)
 - [Forwarded Ports](#forwarded-ports)
 - [Synced Folders](#synced-folders)
+- [QEMU Session Support](#qemu-session-support)
 - [Customized Graphics](#customized-graphics)
 - [Box Format](#box-format)
 - [Create Box](#create-box)
@@ -841,6 +835,26 @@ Note! Above options affect configuration only at domain creation. It won't chang
 
 Don't forget to [set](#domain-specific-options) `kvm_hidden` option to `true` especially if you are passthroughing NVIDIA GPUs. Otherwise GPU is visible from VM but cannot be operated.
 
+
+## USB Controller Configuration
+
+The USB controller can be configured using `libvirt.usb_controller`, with the following options:
+
+* `model` - The USB controller device model to emulate. (mandatory)
+* `ports` - The number of devices that can be connected to the controller.
+
+See the [libvirt documentation](https://libvirt.org/formatdomain.html#elementsControllers) for a list of valid models.
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.provider :libvirt do |libvirt|
+    # Set up a USB3 controller
+    libvirt.usb_controller :model => "nec-xhci"
+  end
+end
+```
+
+
 ## USB Redirector Devices
 You can specify multiple redirect devices via `libvirt.redirdev`. There are two types, `tcp` and `spicevmc` supported, for forwarding USB-devices to the guest. Available options are listed below.
 
@@ -954,7 +968,7 @@ Vagrant.configure("2") do |config|
   end
 end
 ```
-## Features
+## Hypervisor Features
 
 Hypervisor features can be specified via `libvirt.features` as a list. The default
 options that are enabled are `acpi`, `apic` and `pae`. If you define `libvirt.features`
@@ -982,6 +996,26 @@ Vagrant.configure("2") do |config|
 end
 ```
 
+You can also specify a special set of features that help improve the behavior of guests
+running Microsoft Windows.
+
+You can specify HyperV features via `libvirt.hyperv_feature`. Available
+options are listed below. Note that both options are required:
+
+* `name` - The name of the feature Hypervisor feature (see libvirt doc)
+* `state` - The state for this feature which can be either `on` or `off`.
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.provider :libvirt do |libvirt|
+    # Relax constraints on timers
+    libvirt.hyperv_feature :name => 'relaxed', :state => 'on'
+    # Enable virtual APIC
+    libvirt.hyperv_feature :name => 'vapic', :state => 'on'
+  end
+end
+```
+
 ## CPU features
 
 You can specify CPU feature policies via `libvirt.cpu_feature`. Available
@@ -1172,6 +1206,34 @@ Further documentation on using 9p can be found in [kernel docs](https://www.kern
 **SECURITY NOTE:** for remote libvirt, nfs synced folders requires a bridged
 public network interface and you must connect to libvirt via ssh.
 
+## QEMU Session Support
+
+vagrant-libvirt supports using the QEMU session connection to maintain Vagrant VMs. As the session connection does not have root access to the system features which require root will not work. Access to networks created by the system QEMU connection can be granted by using the [QEMU bridge helper](https://wiki.qemu.org/Features/HelperNetworking). The bridge helper is enabled by default on some distros but may need to be enabled/installed on others.
+
+An example configuration of a machine using the QEMU session connection:
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.provider :libvirt do |libvirt|
+    # Use QEMU session instead of system connection
+    libvirt.qemu_use_session = true
+    # URI of QEMU session connection, default is as below
+    libvirt.uri = 'qemu:///session'
+    # URI of QEMU system connection, use to obtain IP address for management
+    libvirt.system_uri = 'qemu:///system'
+    # Path to store libvirt images for the virtual machine, default is as ~/.local/share/libvirt/images
+    libvirt.storage_pool_path = '/home/user/.local/share/libvirt/images'
+    # Management network device
+    libvirt.management_network_device = 'virbr0'
+  end
+
+  # Public network configuration using existing network device
+  # Note: Private networks do not work with QEMU session enabled as root access is required to create new network devices
+  config.vm.network :public_network, :dev => "virbr1",
+      :mode => "bridge",
+      :type => "bridge"
+end
+```
 
 ## Customized Graphics
 

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

@@ -36,11 +36,13 @@ module VagrantPlugins
           @cpu_features = config.cpu_features
           @cpu_topology = config.cpu_topology
           @features = config.features
+          @features_hyperv = config.features_hyperv
           @cpu_mode = config.cpu_mode
           @cpu_model = config.cpu_model
           @cpu_fallback = config.cpu_fallback
           @numa_nodes = config.numa_nodes
           @loader = config.loader
+          @nvram = config.nvram
           @machine_type = config.machine_type
           @machine_arch = config.machine_arch
           @disk_bus = config.disk_bus
@@ -94,6 +96,9 @@ module VagrantPlugins
           # Watchdog device
           @watchdog_dev = config.watchdog_dev
 
+          # USB controller
+          @usbctl_dev = config.usbctl_dev
+
           # USB device passthrough
           @usbs = config.usbs
 
@@ -128,13 +133,15 @@ module VagrantPlugins
           # 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_volume_path) + '/' # steal
-          else
-            storage_pool = env[:machine].provider.driver.connection.client.lookup_storage_pool_by_name(@storage_pool_name)
-            raise Errors::NoStoragePool if storage_pool.nil?
-            xml = Nokogiri::XML(storage_pool.xml_desc)
-            storage_prefix = xml.xpath('/pool/target/path').inner_text.to_s + '/'
+          if !config.qemu_use_session
+            if env[:machine].config.vm.box
+              storage_prefix = File.dirname(@domain_volume_path) + '/' # steal
+            else
+              storage_pool = env[:machine].provider.driver.connection.client.lookup_storage_pool_by_name(@storage_pool_name)
+              raise Errors::NoStoragePool if storage_pool.nil?
+              xml = Nokogiri::XML(storage_pool.xml_desc)
+              storage_prefix = xml.xpath('/pool/target/path').inner_text.to_s + '/'
+            end
           end
 
           @disks.each do |disk|
@@ -180,19 +187,22 @@ module VagrantPlugins
           if not @cpu_topology.empty?
             env[:ui].info(" -- CPU topology:   sockets=#{@cpu_topology[:sockets]}, cores=#{@cpu_topology[:cores]}, threads=#{@cpu_topology[:threads]}")
           end
-          env[:ui].info("")
           @cpu_features.each do |cpu_feature|
             env[:ui].info(" -- CPU Feature:       name=#{cpu_feature[:name]}, policy=#{cpu_feature[:policy]}")
           end
           @features.each do |feature|
             env[:ui].info(" -- Feature:           #{feature}")
           end
+          @features_hyperv.each do |feature|
+            env[:ui].info(" -- Feature (HyperV):  name=#{feature[:name]}, state=#{feature[:state]}")
+          end
           env[:ui].info(" -- Memory:            #{@memory_size / 1024}M")
           @memory_backing.each do |backing|
             env[:ui].info(" -- Memory Backing:    #{backing[:name]}: #{backing[:config].map { |k,v| "#{k}='#{v}'"}.join(' ')}")
           end
           env[:ui].info(" -- Management MAC:    #{@management_network_mac}")
           env[:ui].info(" -- Loader:            #{@loader}")
+          env[:ui].info(" -- Nvram:             #{@nvram}")
           if env[:machine].config.vm.box
             env[:ui].info(" -- Base box:          #{env[:machine].box.name}")
           end
@@ -256,6 +266,12 @@ module VagrantPlugins
             env[:ui].info(" -- Watchdog device:   model=#{@watchdog_dev[:model]}, action=#{@watchdog_dev[:action]}")
           end
 
+          if not @usbctl_dev.empty?
+            msg = " -- USB controller:    model=#{@usbctl_dev[:model]}"
+            msg += ", ports=#{@usbctl_dev[:ports]}" if @usbctl_dev[:ports]
+            env[:ui].info(msg)
+          end
+
           @usbs.each do |usb|
             usb_dev = []
             usb_dev.push("bus=#{usb[:bus]}") if usb[:bus]

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

@@ -8,6 +8,7 @@ module VagrantPlugins
       # image as new domain volume.
       class CreateDomainVolume
         include VagrantPlugins::ProviderLibvirt::Util::ErbTemplate
+        include VagrantPlugins::ProviderLibvirt::Util::StorageUtil
 
         def initialize(app, _env)
           @logger = Log4r::Logger.new('vagrant_libvirt::action::create_domain_volume')
@@ -48,8 +49,8 @@ module VagrantPlugins
                 xml.target do
                   xml.format(type: 'qcow2')
                   xml.permissions do
-                    xml.owner 0
-                    xml.group 0
+                    xml.owner storage_uid(env)
+                    xml.group storage_gid(env)
                     xml.mode '0600'
                     xml.label 'virt_image_t'
                   end
@@ -58,8 +59,8 @@ module VagrantPlugins
                   xml.path(@backing_file)
                   xml.format(type: 'qcow2')
                   xml.permissions do
-                    xml.owner 0
-                    xml.group 0
+                    xml.owner storage_uid(env)
+                    xml.group storage_gid(env)
                     xml.mode '0600'
                     xml.label 'virt_image_t'
                   end

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

@@ -80,6 +80,8 @@ module VagrantPlugins
             @pci_bus = iface_configuration.fetch(:bus, nil)
             @pci_slot = iface_configuration.fetch(:slot, nil)
             template_name = 'interface'
+            @type = nil
+            @udp_tunnel = nil
             # Configuration for public interfaces which use the macvtap driver
             if iface_configuration[:iface_type] == :public_network
               @device = iface_configuration.fetch(:dev, 'eth0')

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

@@ -27,6 +27,11 @@ module VagrantPlugins
         end
 
         def call(env)
+          if env[:machine].provider_config.qemu_use_session
+            @app.call(env)
+            return
+          end
+
           # only one vm at a time should try to set up networks
           # otherwise they'll have inconsitent views of current state
           # and conduct redundant operations that cause errors

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

@@ -13,6 +13,11 @@ module VagrantPlugins
         end
 
         def call(env)
+          if env[:machine].provider_config.qemu_use_session
+            @app.call(env)
+            return
+          end
+
           # If there were some networks created for this machine, in machines
           # data directory, created_networks file holds UUIDs of each network.
           created_networks_file = env[:machine].data_dir + 'created_networks'

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

@@ -4,6 +4,10 @@ module VagrantPlugins
   module ProviderLibvirt
     module Action
       class HandleBoxImage
+        include VagrantPlugins::ProviderLibvirt::Util::ErbTemplate
+        include VagrantPlugins::ProviderLibvirt::Util::StorageUtil
+
+
         @@lock = Mutex.new
 
         def initialize(app, _env)
@@ -31,11 +35,12 @@ module VagrantPlugins
           config = env[:machine].provider_config
           box_image_file = env[:machine].box.directory.join('box.img').to_s
           env[:box_volume_name] = env[:machine].box.name.to_s.dup.gsub('/', '-VAGRANTSLASH-')
-          env[:box_volume_name] << "_vagrant_box_image_#{begin
-                                                           env[:machine].box.version.to_s
-                                                         rescue
-                                                           ''
-                                                         end}.img"
+          env[:box_volume_name] << "_vagrant_box_image_#{
+          begin
+            env[:machine].box.version.to_s
+          rescue
+            ''
+          end}.img"
 
           # Override box_virtual_size
           if config.machine_virtual_size
@@ -44,7 +49,7 @@ module VagrantPlugins
               # is not supported and will be ignored
               env[:ui].warn I18n.t(
                 'vagrant_libvirt.warnings.ignoring_virtual_size_too_small',
-                requested: config.machine_virtual_size, minimum: box_virtual_size
+                  requested: config.machine_virtual_size, minimum: box_virtual_size
               )
             else
               env[:ui].info I18n.t('vagrant_libvirt.manual_resize_required')
@@ -75,17 +80,41 @@ module VagrantPlugins
             message = "Creating volume #{env[:box_volume_name]}"
             message << " in storage pool #{config.storage_pool_name}."
             @logger.info(message)
-            begin
-              fog_volume = env[:machine].provider.driver.connection.volumes.create(
-                name:         env[:box_volume_name],
-                allocation:   "#{box_image_size / 1024 / 1024}M",
-                capacity:     "#{box_virtual_size}G",
-                format_type:  box_format,
-                pool_name:    config.storage_pool_name
-              )
-            rescue Fog::Errors::Error => e
-              raise Errors::FogCreateVolumeError,
-                    error_message: e.message
+
+            if config.qemu_use_session
+              begin
+                @name = env[:box_volume_name]
+                @allocation = "#{box_image_size / 1024 / 1024}M"
+                @capacity = "#{box_virtual_size}G"
+                @format_type = box_format ? box_format : 'raw'
+
+                @storage_volume_uid = storage_uid env
+                @storage_volume_gid = storage_gid env
+
+                libvirt_client = env[:machine].provider.driver.connection.client
+                libvirt_pool = libvirt_client.lookup_storage_pool_by_name(
+                  config.storage_pool_name
+                )
+                libvirt_volume = libvirt_pool.create_volume_xml(
+                  to_xml('default_storage_volume')
+                )
+              rescue => e
+                raise Errors::CreatingVolumeError,
+                      error_message: e.message
+              end
+            else
+              begin
+                fog_volume = env[:machine].provider.driver.connection.volumes.create(
+                  name: env[:box_volume_name],
+                  allocation: "#{box_image_size / 1024 / 1024}M",
+                  capacity: "#{box_virtual_size}G",
+                  format_type: box_format,
+                  pool_name: config.storage_pool_name
+                )
+              rescue Fog::Errors::Error => e
+                raise Errors::FogCreateVolumeError,
+                      error_message: e.message
+              end
             end
 
             # Upload box image to storage pool
@@ -103,7 +132,11 @@ module VagrantPlugins
             # storage pool.
             if env[:interrupted] || !ret
               begin
-                fog_volume.destroy
+                if config.qemu_use_session
+                  libvirt_volume.delete
+                else
+                  fog_volume.destroy
+                end
               rescue
                 nil
               end
@@ -113,6 +146,19 @@ module VagrantPlugins
           @app.call(env)
         end
 
+        def split_size_unit(text)
+          if text.kind_of? Integer
+            # if text is an integer, match will fail
+            size    = text
+            unit    = 'G'
+          else
+            matcher = text.match(/(\d+)(.+)/)
+            size    = matcher[1]
+            unit    = matcher[2]
+          end
+          [size, unit]
+        end
+
         protected
 
         # Fog libvirt currently doesn't support uploading images to storage

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

@@ -5,6 +5,8 @@ module VagrantPlugins
     module Action
       class HandleStoragePool
         include VagrantPlugins::ProviderLibvirt::Util::ErbTemplate
+        include VagrantPlugins::ProviderLibvirt::Util::StorageUtil
+
 
         @@lock = Mutex.new
 
@@ -37,6 +39,9 @@ module VagrantPlugins
             # Fog libvirt currently doesn't support creating pools. Use
             # ruby-libvirt client directly.
             begin
+              @storage_pool_path = storage_pool_path(env)
+              @storage_pool_uid = storage_uid(env)
+              @storage_pool_gid = storage_gid(env)
               libvirt_pool = env[:machine].provider.driver.connection.client.define_storage_pool_xml(
                 to_xml('default_storage_pool')
               )

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

@@ -31,22 +31,39 @@ module VagrantPlugins
           # from arp table, either localy or remotely via ssh, if libvirt
           # connection was done via ssh.
           env[:ip_address] = nil
-          env[:metrics]['instance_ip_time'] = Util::Timer.time do
-            @logger.debug("Searching for IP for MAC address: #{domain.mac}")
-            env[:ui].info(I18n.t('vagrant_libvirt.waiting_for_ip'))
-            retryable(on: Fog::Errors::TimeoutError, tries: 300) do
-              # If we're interrupted don't worry about waiting
-              return terminate(env) if env[:interrupted]
+          @logger.debug("Searching for IP for MAC address: #{domain.mac}")
+          env[:ui].info(I18n.t('vagrant_libvirt.waiting_for_ip'))
+
+          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]
 
-              # Wait for domain to obtain an ip address
-              domain.wait_for(2) do
-                addresses.each_pair do |_type, ip|
-                  env[:ip_address] = ip[0] unless ip[0].nil?
+                # Wait for domain to obtain an ip address
+                domain.wait_for(2) do
+                  env[:ip_address] = env[:machine].provider.driver.get_ipaddress_system(domain.mac)
+                  !env[:ip_address].nil?
+                end
+              end
+            end
+          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]
+
+                # Wait for domain to obtain an ip address
+                domain.wait_for(2) do
+                  addresses.each_pair do |_type, ip|
+                    env[:ip_address] = ip[0] unless ip[0].nil?
+                  end
+                  !env[:ip_address].nil?
                 end
-                !env[:ip_address].nil?
               end
             end
           end
+
           @logger.info("Got IP address #{env[:ip_address]}")
           @logger.info("Time for getting IP: #{env[:metrics]['instance_ip_time']}")
 

data/lib/vagrant-libvirt/config.rb

@@ -40,11 +40,13 @@ module VagrantPlugins
       # Libvirt storage pool name, where box image and instance snapshots will
       # be stored.
       attr_accessor :storage_pool_name
+      attr_accessor :storage_pool_path
 
       # Turn on to prevent hostname conflicts
       attr_accessor :random_hostname
 
       # Libvirt default network
+      attr_accessor :management_network_device
       attr_accessor :management_network_name
       attr_accessor :management_network_address
       attr_accessor :management_network_mode
@@ -54,6 +56,9 @@ module VagrantPlugins
       attr_accessor :management_network_pci_bus
       attr_accessor :management_network_pci_slot
 
+      # System connection information
+      attr_accessor :system_uri
+
       # Default host prefix (alternative to use project folder name)
       attr_accessor :default_prefix
 
@@ -69,8 +74,10 @@ module VagrantPlugins
       attr_accessor :cpu_features
       attr_accessor :cpu_topology
       attr_accessor :features
+      attr_accessor :features_hyperv
       attr_accessor :numa_nodes
       attr_accessor :loader
+      attr_accessor :nvram
       attr_accessor :boot_order
       attr_accessor :machine_type
       attr_accessor :machine_arch
@@ -126,6 +133,9 @@ module VagrantPlugins
       # Watchdog device
       attr_accessor :watchdog_dev
 
+      # USB controller
+      attr_accessor :usbctl_dev
+
       # USB device passthrough
       attr_accessor :usbs
 
@@ -148,6 +158,9 @@ module VagrantPlugins
       # Additional qemuargs arguments
       attr_accessor :qemu_args
 
+      # Use qemu session instead of system
+      attr_accessor :qemu_use_session
+
       def initialize
         @uri               = UNSET_VALUE
         @driver            = UNSET_VALUE
@@ -158,6 +171,7 @@ module VagrantPlugins
         @id_ssh_key_file   = UNSET_VALUE
         @storage_pool_name = UNSET_VALUE
         @random_hostname   = UNSET_VALUE
+        @management_network_device  = UNSET_VALUE
         @management_network_name    = UNSET_VALUE
         @management_network_address = UNSET_VALUE
         @management_network_mode = UNSET_VALUE
@@ -167,6 +181,9 @@ module VagrantPlugins
         @management_network_pci_slot = UNSET_VALUE
         @management_network_pci_bus = UNSET_VALUE
 
+        # System connection information
+        @system_uri      = UNSET_VALUE
+
         # Domain specific settings.
         @uuid              = UNSET_VALUE
         @memory            = UNSET_VALUE
@@ -178,8 +195,10 @@ module VagrantPlugins
         @cpu_features      = UNSET_VALUE
         @cpu_topology      = UNSET_VALUE
         @features          = UNSET_VALUE
+        @features_hyperv   = UNSET_VALUE
         @numa_nodes        = UNSET_VALUE
         @loader            = UNSET_VALUE
+        @nvram             = UNSET_VALUE
         @machine_type      = UNSET_VALUE
         @machine_arch      = UNSET_VALUE
         @machine_virtual_size = UNSET_VALUE
@@ -231,6 +250,9 @@ module VagrantPlugins
         # Watchdog device
         @watchdog_dev      = UNSET_VALUE
 
+        # USB controller
+        @usbctl_dev        = UNSET_VALUE
+
         # USB device passthrough
         @usbs              = UNSET_VALUE
 
@@ -251,6 +273,7 @@ module VagrantPlugins
         @mgmt_attach       = UNSET_VALUE
 
         @qemu_args  = []
+        @qemu_use_session  = UNSET_VALUE
       end
 
       def boot(device)
@@ -321,6 +344,14 @@ module VagrantPlugins
                            policy: options[:policy])
       end
 
+      def hyperv_feature(options = {})
+        if options[:name].nil? || options[:state].nil?
+          raise 'Feature name AND state must be specified'
+        end
+
+        @features_hyperv = [{name: options[:name], state: options[:state]}]  if @features_hyperv == UNSET_VALUE
+      end
+
       def cputopology(options = {})
         if options[:sockets].nil? || options[:cores].nil? || options[:threads].nil?
           raise 'CPU topology must have all of sockets, cores and threads specified'
@@ -332,7 +363,7 @@ module VagrantPlugins
 
         @cpu_topology[:sockets] = options[:sockets]
         @cpu_topology[:cores] = options[:cores]
-        @cpu_topology[:threads] = options[:threads]        
+        @cpu_topology[:threads] = options[:threads]
       end
 
       def memorybacking(option, config = {})
@@ -419,6 +450,19 @@ module VagrantPlugins
       end
 
 
+      def usb_controller(options = {})
+        if options[:model].nil?
+          raise 'USB controller model must be specified.'
+        end
+
+        if @usbctl_dev == UNSET_VALUE
+            @usbctl_dev = {}
+        end
+
+        @usbctl_dev[:model] = options[:model]
+        @usbctl_dev[:ports] = options[:ports]
+      end
+
       def usb(options = {})
         if (options[:bus].nil? || options[:device].nil?) && options[:vendor].nil? && options[:product].nil?
           raise 'Bus and device and/or vendor and/or product must be specified. Check `lsusb` for these.'
@@ -447,9 +491,9 @@ module VagrantPlugins
         @redirfilters = [] if @redirfilters == UNSET_VALUE
 
         @redirfilters.push(class: options[:class] || -1,
-                           vendor: options[:class] || -1,
-                           product: options[:class] || -1,
-                           version: options[:class] || -1,
+                           vendor: options[:vendor] || -1,
+                           product: options[:product] || -1,
+                           version: options[:version] || -1,
                            allow: options[:allow])
       end
 
@@ -542,7 +586,9 @@ module VagrantPlugins
         # Setup connection uri.
         uri = @driver.dup
         virt_path = case uri
-                    when 'qemu', 'openvz', 'uml', 'phyp', 'parallels', 'kvm'
+                    when 'qemu', 'kvm'
+                      @qemu_use_session ? '/session' : '/system'
+                    when 'openvz', 'uml', 'phyp', 'parallels'
                       '/system'
                     when '@en', 'esx'
                       '/'
@@ -592,7 +638,9 @@ 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
+        @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
         @management_network_name = 'vagrant-libvirt' if @management_network_name == UNSET_VALUE
         @management_network_address = '192.168.121.0/24' if @management_network_address == UNSET_VALUE
         @management_network_mode = 'nat' if @management_network_mode == UNSET_VALUE
@@ -601,6 +649,9 @@ 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
+        @system_uri      = 'qemu:///system' if @system_uri == UNSET_VALUE
+
+        @qemu_use_session = false if @qemu_use_session == UNSET_VALUE
 
         # generate a URI if none is supplied
         @uri = _generate_uri if @uri == UNSET_VALUE
@@ -615,13 +666,17 @@ module VagrantPlugins
                        'qemu64'
                      elsif @cpu_mode != 'custom'
                        ''
+                     else
+                       @cpu_model
           end
         @cpu_topology = {} if @cpu_topology == UNSET_VALUE
         @cpu_fallback = 'allow' if @cpu_fallback == UNSET_VALUE
         @cpu_features = [] if @cpu_features == 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
         @loader = nil if @loader == UNSET_VALUE
+        @nvram = nil if @nvram == UNSET_VALUE
         @machine_type = nil if @machine_type == UNSET_VALUE
         @machine_arch = nil if @machine_arch == UNSET_VALUE
         @machine_virtual_size = nil if @machine_virtual_size == UNSET_VALUE
@@ -684,6 +739,9 @@ module VagrantPlugins
         # Watchdog device
         @watchdog_dev = {} if @watchdog_dev == UNSET_VALUE
 
+        # USB controller
+        @usbctl_dev = {} if @usbctl_dev == UNSET_VALUE
+
         # USB device passthrough
         @usbs = [] if @usbs == UNSET_VALUE
 

data/lib/vagrant-libvirt/driver.rb

@@ -1,4 +1,5 @@
 require 'fog/libvirt'
+require 'libvirt'
 require 'log4r'
 
 module VagrantPlugins
@@ -10,6 +11,7 @@ module VagrantPlugins
       # settings as a key to allow per machine connection attributes
       # to be used.
       @@connection = nil
+      @@system_connection = nil
 
       def initialize(machine)
         @logger = Log4r::Logger.new('vagrant_libvirt::driver')
@@ -47,6 +49,17 @@ module VagrantPlugins
         @@connection
       end
 
+      def system_connection
+        # If already connected to libvirt, just use it and don't connect
+        # again.
+        return @@system_connection if @@system_connection
+
+        config = @machine.provider_config
+
+        @@system_connection = Libvirt::open_read_only(config.system_uri)
+        @@system_connection
+      end
+
       def get_domain(mid)
         begin
           domain = connection.servers.get(mid)
@@ -70,6 +83,9 @@ module VagrantPlugins
       def get_ipaddress(machine)
         # Find the machine
         domain = get_domain(machine.id)
+        if @machine.provider_config.qemu_use_session
+          return get_ipaddress_system domain.mac
+        end
 
         if domain.nil?
           # The machine can't be found
@@ -99,6 +115,19 @@ module VagrantPlugins
         ip_address
       end
 
+      def get_ipaddress_system(mac)
+        ip_address = nil
+
+        system_connection.list_all_networks.each do |net|
+          leases = net.dhcp_leases(mac, 0)
+          # Assume the lease expiring last is the current IP address
+          ip_address = leases.sort_by { |lse| lse["expirytime"] }.last["ipaddr"] if !leases.empty?
+          break if ip_address
+        end
+
+        return ip_address
+      end
+
       def state(machine)
         # may be other error states with initial retreival we can't handle
         begin

data/lib/vagrant-libvirt/errors.rb

@@ -29,6 +29,10 @@ module VagrantPlugins
         error_key(:creating_storage_pool_error)
       end
 
+      class CreatingVolumeError < VagrantLibvirtError
+        error_key(:creating_volume_error)
+      end
+
       class ImageUploadError < VagrantLibvirtError
         error_key(:image_upload_error)
       end

data/lib/vagrant-libvirt/templates/default_storage_pool.xml.erb

@@ -3,11 +3,11 @@
   <source>
   </source>
   <target>
-    <path>/var/lib/libvirt/images</path>
+    <path><%= @storage_pool_path %></path>
     <permissions>
       <mode>0755</mode>
-      <owner>-1</owner>
-      <group>-1</group>
+      <owner><%= @storage_pool_uid %></owner>
+      <group><%= @storage_pool_gid %></group>
     </permissions>
   </target>
 </pool>

data/lib/vagrant-libvirt/templates/default_storage_volume.xml.erb

@@ -0,0 +1,14 @@
+<volume>
+  <name><%= @name %></name>
+  <allocation unit="<%= split_size_unit(@allocation)[1] %>"><%= split_size_unit(@allocation)[0] %></allocation>
+  <capacity unit="<%= split_size_unit(@capacity)[1] %>"><%= split_size_unit(@capacity)[0] %></capacity>
+  <target>
+    <format type="<%= @format_type %>"/>
+    <permissions>
+      <owner><%= @storage_volume_uid %></owner>
+      <group><%= @storage_volume_gid %></group>
+      <mode>0744</mode>
+      <label>virt_image_t</label>
+    </permissions>
+  </target>
+</volume>

data/lib/vagrant-libvirt/templates/domain.xml.erb

@@ -9,8 +9,12 @@
     <% if @cpu_mode != 'host-passthrough' %>
       <model fallback='<%= @cpu_fallback %>'><% if @cpu_mode == 'custom' %><%= @cpu_model %><% end %></model>
       <% if @nested %>
-        <feature policy='optional' name='vmx'/>
-        <feature policy='optional' name='svm'/>
+        <% if @cpu_features.select{|x| x[:name] == 'vmx'}.empty? %>
+          <feature policy='optional' name='vmx'/>
+        <% end %>
+        <% if @cpu_features.select{|x| x[:name] == 'svm'}.empty? %>
+          <feature policy='optional' name='svm'/>
+        <% end %>
       <% end %>
       <% @cpu_features.each do |cpu_feature| %>
         <feature name='<%= cpu_feature[:name] %>' policy='<%= cpu_feature[:policy] %>'/>
@@ -52,7 +56,14 @@
       <% end %>
     <% end %>
     <% if @loader %>
-      <loader readonly='yes' type='rom'><%= @loader %></loader>
+      <% if @nvram %>
+        <loader readonly='yes' type='pflash'><%= @loader %></loader>
+      <% else %>
+        <loader readonly='yes' type='rom'><%= @loader %></loader>
+      <% end %>
+    <% end %>
+    <% if @nvram %>
+      <nvram><%= @nvram %></nvram>
     <% end %>
     <% if @boot_order.count >= 1 %>
       <bootmenu enable='yes'/>
@@ -73,6 +84,13 @@
         <hidden state='on'/>
       </kvm>
     <% end %>
+    <% if !@features_hyperv.empty? %>
+    <hyperv>
+      <% @features_hyperv.each do |feature| %>
+      <<%= feature[:name] %> state='<%= feature[:state] %>' />
+      <% end %>
+    </hyperv>
+    <% end %>
   </features>
   <clock offset='utc'/>
   <devices>
@@ -232,6 +250,10 @@
       </backend>
     </tpm>
     <% end -%>
+    <% if not @usbctl_dev.empty? %>
+    <%# USB Controller -%>
+    <controller type='usb' model='<%= @usbctl_dev[:model] %>' <%= "ports=\"#{@usbctl_dev[:ports]}\" " if @usbctl_dev[:ports] %>/>
+    <% end %>
   </devices>
 
   <% unless @qargs.empty? %>

data/lib/vagrant-libvirt/util.rb

@@ -5,6 +5,7 @@ module VagrantPlugins
       autoload :Collection,  'vagrant-libvirt/util/collection'
       autoload :Timer, 'vagrant-libvirt/util/timer'
       autoload :NetworkUtil, 'vagrant-libvirt/util/network_util'
+      autoload :StorageUtil, 'vagrant-libvirt/util/storage_util'
       autoload :ErrorCodes, 'vagrant-libvirt/util/error_codes'
     end
   end

data/lib/vagrant-libvirt/util/network_util.rb

@@ -8,6 +8,8 @@ module VagrantPlugins
         include Vagrant::Util::NetworkIP
 
         def configured_networks(env, logger)
+          qemu_use_session = env[:machine].provider_config.qemu_use_session
+          management_network_device = env[:machine].provider_config.management_network_device
           management_network_name = env[:machine].provider_config.management_network_name
           management_network_address = env[:machine].provider_config.management_network_address
           management_network_mode = env[:machine].provider_config.management_network_mode
@@ -33,18 +35,31 @@ module VagrantPlugins
                   error_message: "#{management_network_address} does not include both an address and subnet mask"
           end
 
-          management_network_options = {
-            iface_type: :private_network,
-            network_name: management_network_name,
-            ip: Regexp.last_match(1),
-            netmask: Regexp.last_match(2),
-            dhcp_enabled: true,
-            forward_mode: management_network_mode,
-            guest_ipv6: management_network_guest_ipv6,
-            autostart: management_network_autostart,
-            bus: management_network_pci_bus,
-            slot: management_network_pci_slot
-          }
+          if qemu_use_session
+            management_network_options = {
+              iface_type: :public_network,
+              dev: management_network_device,
+              mode: 'bridge',
+              type: 'bridge',
+              bus: management_network_pci_bus,
+              slot: management_network_pci_slot
+            }
+          else
+            management_network_options = {
+              iface_type: :private_network,
+              network_name: management_network_name,
+              ip: Regexp.last_match(1),
+              netmask: Regexp.last_match(2),
+              dhcp_enabled: true,
+              forward_mode: management_network_mode,
+              guest_ipv6: management_network_guest_ipv6,
+              autostart: management_network_autostart,
+              bus: management_network_pci_bus,
+              slot: management_network_pci_slot
+            }
+          end
+
+
 
           unless management_network_mac.nil?
             management_network_options[:mac] = management_network_mac

data/lib/vagrant-libvirt/util/storage_util.rb

@@ -0,0 +1,27 @@
+
+module VagrantPlugins
+  module ProviderLibvirt
+    module Util
+      module StorageUtil
+        def storage_uid(env)
+          env[:machine].provider_config.qemu_use_session ? Process.uid : 0
+        end
+
+        def storage_gid(env)
+          env[:machine].provider_config.qemu_use_session ? Process.gid : 0
+        end
+
+        def storage_pool_path(env)
+          if env[:machine].provider_config.storage_pool_path
+            env[:machine].provider_config.storage_pool_path
+          elsif env[:machine].provider_config.qemu_use_session
+            File.expand_path('~/.local/share/libvirt/images')
+          else
+            '/var/lib/libvirt/images'
+          end
+        end
+      end
+    end
+  end
+end
+

data/lib/vagrant-libvirt/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ProviderLibvirt
-    VERSION = '0.0.43'.freeze
+    VERSION = '0.0.45'.freeze
   end
 end

data/locales/en.yml

@@ -35,6 +35,8 @@ en:
       Resuming domain...
     suspending_domain: |-
       Suspending domain...
+    package_domain: |-
+      Packaging domain...
     waiting_for_ready: |-
       Waiting for domain to become "ready"...
     waiting_for_ip: |-
@@ -107,6 +109,8 @@ en:
         `vagrant up` command again.
       creating_storage_pool_error: |-
         There was error while creating libvirt storage pool: %{error_message}
+      creating_volume_error: |-
+        There was error while creating libvirt volume: %{error_message}
       image_upload_error: |-
         Error while uploading image to storage pool: %{error_message}
       no_domain_error: |-

data/spec/support/environment_helper.rb

@@ -18,7 +18,7 @@ class EnvironmentHelper
     1024
   end
 
-  %w(cpus cpu_mode loader boot_order machine_type disk_bus disk_device nested volume_cache kernel cmd_line initrd graphics_type graphics_autoport graphics_port graphics_ip graphics_passwd video_type video_vram keymap storage_pool_name disks cdroms driver).each do |name|
+  %w(cpus cpu_mode loader nvram boot_order machine_type disk_bus disk_device nested volume_cache kernel cmd_line initrd graphics_type graphics_autoport graphics_port graphics_ip graphics_passwd video_type video_vram keymap storage_pool_name disks cdroms driver).each do |name|
     define_method(name.to_sym) do
       nil
     end

data/spec/unit/templates/domain_all_settings.xml

@@ -14,7 +14,7 @@
 
   <os>
         <type arch='x86_64' machine='pc-compatible'>hvm</type>
-      <loader readonly='yes' type='rom'>/efi/loader</loader>
+        <loader readonly='yes' type='rom'>/efi/loader</loader>
       <bootmenu enable='yes'/>
     <kernel></kernel>
     <initrd></initrd>
@@ -24,6 +24,9 @@
     <acpi/>
     <apic/>
     <pae/>
+    <hyperv>
+      <BBB state='on' />
+    </hyperv>
   </features>
   <clock offset='utc'/>
   <devices>
@@ -117,7 +120,7 @@
         <redirdev bus='usb' type='tcp'>
         </redirdev>
         <redirfilter>
-          <usbdev class='0x0b' vendor='0x0b' product='0x0b' version='0x0b' allow='yes'/>
+          <usbdev class='0x0b' vendor='0x08e6' product='0x3437' version='2.00' allow='yes'/>
         </redirfilter>
     <watchdog model='i6300esb' action='reset'/>
 
@@ -128,6 +131,7 @@
         <device path='/dev/tpm0'/>
       </backend>
     </tpm>
+    <controller type='usb' model='nec-xhci' ports="4" />
   </devices>
 
   <qemu:commandline>

data/spec/unit/templates/domain_custom_cpu_model.xml

@@ -0,0 +1,46 @@
+<domain type='' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'>
+  <name></name>
+  <uuid></uuid>
+  <memory></memory>
+  <vcpu>1</vcpu>
+
+
+  <cpu mode='custom'>
+      <model fallback='allow'>SandyBridge</model>
+  </cpu>
+
+
+  <os>
+        <type>hvm</type>
+    <kernel></kernel>
+    <initrd></initrd>
+    <cmdline></cmdline>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+    <pae/>
+  </features>
+  <clock offset='utc'/>
+  <devices>
+
+
+    <serial type='pty'>
+      <target port='0'/>
+    </serial>
+    <console type='pty'>
+      <target port='0'/>
+    </console>
+
+
+    <input type='mouse' bus='ps2'/>
+
+      <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' keymap='en-us'  />
+      <video>
+        <model type='cirrus' vram='9216' heads='1'/>
+      </video>
+
+
+  </devices>
+
+</domain>

data/spec/unit/templates/domain_spec.rb

@@ -31,6 +31,7 @@ describe 'templates/domain' do
       domain.instance_variable_set('@domain_type', 'kvm')
       domain.cpu_mode = 'custom'
       domain.cpu_feature(name: 'AAA', policy: 'required')
+      domain.hyperv_feature(name: 'BBB', state: 'on')
       domain.cputopology(sockets: '1', cores: '3', threads: '2')
       domain.machine_type = 'pc-compatible'
       domain.machine_arch = 'x86_64'
@@ -64,6 +65,7 @@ describe 'templates/domain' do
       domain.random(model: 'random')
       domain.pci(bus: '0x06', slot: '0x12', function: '0x5')
       domain.pci(bus: '0x03', slot: '0x00', function: '0x0')
+      domain.usb_controller(model: 'nec-xhci', ports: '4')
       domain.usb(bus: '1', device: '2', vendor: '0x1234', product: '0xabcd')
       domain.redirdev(type: 'tcp', host: 'localhost', port: '4000')
       domain.redirfilter(class: '0x0b', vendor: '0x08e6',
@@ -81,4 +83,16 @@ describe 'templates/domain' do
       expect(domain.to_xml('domain')).to eq xml_expected
     end
   end
+
+  context 'when custom cpu model enabled' do
+    before do
+      domain.cpu_mode = 'custom'
+      domain.cpu_model = 'SandyBridge'
+    end
+    let(:test_file) { 'domain_custom_cpu_model.xml' }
+    it 'renders template' do
+      domain.finalize!
+      expect(domain.to_xml('domain')).to eq xml_expected
+    end
+  end
 end

data/vagrant-libvirt.gemspec

@@ -1,18 +1,15 @@
 # -*- encoding: utf-8 -*-
-# stub: vagrant-libvirt 0.0.41 ruby lib
-require File.expand_path('../lib/vagrant-libvirt/version', __FILE__)
+# stub: vagrant-libvirt 0.0.42 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "vagrant-libvirt".freeze
-  s.version = VagrantPlugins::ProviderLibvirt::VERSION
+  s.version = "0.0.45"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Lukas Stanek".freeze, "Dima Vasilets".freeze, "Brian Pitts".freeze]
   s.files         = `git ls-files`.split($\)
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
-
-  s.date = "2018-02-02"
   s.description = "libvirt provider for Vagrant.".freeze
   s.email = ["ls@elostech.cz".freeze, "pronix.service@gmail.com".freeze, "brian@polibyte.com".freeze]
   s.homepage = "https://github.com/vagrant-libvirt/vagrant-libvirt".freeze

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.0.43
+  version: 0.0.45
 platform: ruby
 authors:
 - Lukas Stanek
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-02 00:00:00.000000000 Z
+date: 2018-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
@@ -173,6 +173,7 @@ files:
 - lib/vagrant-libvirt/plugin.rb
 - lib/vagrant-libvirt/provider.rb
 - lib/vagrant-libvirt/templates/default_storage_pool.xml.erb
+- lib/vagrant-libvirt/templates/default_storage_volume.xml.erb
 - lib/vagrant-libvirt/templates/domain.xml.erb
 - lib/vagrant-libvirt/templates/private_network.xml.erb
 - lib/vagrant-libvirt/templates/public_interface.xml.erb
@@ -181,6 +182,7 @@ files:
 - lib/vagrant-libvirt/util/erb_template.rb
 - lib/vagrant-libvirt/util/error_codes.rb
 - lib/vagrant-libvirt/util/network_util.rb
+- lib/vagrant-libvirt/util/storage_util.rb
 - lib/vagrant-libvirt/util/timer.rb
 - lib/vagrant-libvirt/version.rb
 - locales/en.yml
@@ -193,6 +195,7 @@ files:
 - spec/unit/action/wait_till_up_spec.rb
 - spec/unit/config_spec.rb
 - spec/unit/templates/domain_all_settings.xml
+- spec/unit/templates/domain_custom_cpu_model.xml
 - spec/unit/templates/domain_defaults.xml
 - spec/unit/templates/domain_spec.rb
 - tools/create_box.sh
@@ -218,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: libvirt provider for Vagrant.
@@ -232,5 +235,6 @@ test_files:
 - spec/unit/action/wait_till_up_spec.rb
 - spec/unit/config_spec.rb
 - spec/unit/templates/domain_all_settings.xml
+- spec/unit/templates/domain_custom_cpu_model.xml
 - spec/unit/templates/domain_defaults.xml
 - spec/unit/templates/domain_spec.rb