vagrant-libvirt 0.0.37 → 0.0.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 133c3e62a88c8fe90de33598ebafdaadb7a8fcfc
-  data.tar.gz: efc8ee6514b87be1309957af7a9bf57f15daa893
+  metadata.gz: ec76a65b6a28f5c9f4160ed84a12d4ed452e125d
+  data.tar.gz: 1cb52a45beb2a74567a70b8633fbddb2581745ac
 SHA512:
-  metadata.gz: 5dcc7e341830feb2a3ac402539ef4e9447eb234caa6cda31f62a35bb677be58e0a89b6ed27d84a683c09857f8b4580978d61c89409e9955c676bd0b42c4a3e15
-  data.tar.gz: 2e1f97ec49aaf4c71131fd2eedf524e707b42814b943a38fb88a201ef8061244f4287e1adad8700d7f1267d4c4c6a83e2262327734e6d3b569b74629ebcc5e48
+  metadata.gz: a4d955916b17fb3a513d091fe031435d293e766c6ae2cb87af4b6e49e23a4daa0388afc3596d64e7733d052c22cfdf6a699471039dd6b358d6202f9594f276ea
+  data.tar.gz: '092d61e503d19f5a7ff51e6ab36af403f1dcba747ee5a7f5e0695199bf1e82aaf28c9b29b7ea9901d62f0dab748b2bd8caff34bae3cb47e75e8ed60fcb44a92f'

data/README.md

@@ -52,6 +52,8 @@ In the table below, build passing means that specific version combination of Vag
 - [PCI device passthrough](#pci-device-passthrough)
 - [USB Redirector Devices](#usb-redirector-devices)
 - [Random number generator passthrough](#random-number-generator-passthrough)
+- [Watchdog·Device](#watchdog-device)
+- [Smartcard device](#smartcard-device)
 - [CPU Features](#cpu-features)
 - [No box and PXE boot](#no-box-and-pxe-boot)
 - [SSH Access To VM](#ssh-access-to-vm)
@@ -275,6 +277,10 @@ end
   _target_](http://libvirt.org/formatdomain.html#elementsDisks). NOTE: this
   option applies only to disks associated with a box image. To set the bus type
   on additional disks, see the [Additional Disks](#additional-disks) section.
+* `disk_device` - The disk device to emulate. Defaults to vda if not
+  set, which should be fine for paravirtualized guests, but some fully
+  virtualized guests may require hda. NOTE: this option also applies only to
+  disks associated with a box image.
 * `nic_model_type` - parameter specifies the model of the network adapter when
   you create a domain value by default virtio KVM believe possible values, see
   the [documentation for
@@ -330,6 +336,8 @@ end
   "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.
+* `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
   `qemu-system-x86_64 -machine help` to get a list of supported machines.
 * `machine_arch` - Sets machine architecture. This helps libvirt to determine
@@ -600,6 +608,11 @@ starts with `libvirt__` string. Here is a list of those options:
 * `:model_type` - parameter specifies the model of the network adapter when you
   create a domain value by default virtio KVM believe possible values, see the
   documentation for libvirt
+* `:libvirt__driver_name` - Define which network driver to use. [More
+  info](https://libvirt.org/formatdomain.html#elementsDriverBackendOptions)
+* `:libvirt__driver_queues` - Define a number of queues to be used for network
+  interface. Set equal to numer of vCPUs for best performance. [More
+  info](http://www.linux-kvm.org/page/Multiqueue)
 * `:autostart` - Automatic startup of network by the libvirt daemon.
   If not specified the default is 'false'.
 
@@ -680,6 +693,7 @@ It has a number of options:
   pre-existing disk. If the disk doesn't exist it will be created.
   Disks with this option set to true need to be removed manually.
 * `shareable` - Set to true if you want to simulate shared SAN storage.
+* `serial` - Serial number of the disk device.
 
 The following example creates two additional disks.
 
@@ -854,6 +868,80 @@ end
 
 At the moment only the `random` backend is supported.
 
+## Watchdog device
+A virtual hardware watchdog device can be added to the guest via the `libvirt.watchdog` element. The option `model` is mandatory and could have on of the following values.
+
+* `i6300esb` - the recommended device, emulating a PCI Intel 6300ESB
+* 'ib700` - emulating an ISA iBase IB700
+* `diag288` - emulating an S390 DIAG288 device
+
+The optional action attribute describes what `action` to take when the watchdog expires. Valid values are specific to the underlying hypervisor. The default behavior is `reset`.
+
+* `reset` - default, forcefully reset the guest
+* `shutdown` - gracefully shutdown the guest (not recommended)
+* `poweroff` - forcefully power off the guest
+* `pause` - pause the guest
+* `none` - do nothing
+* `dump` - automatically dump the guest
+* `inject-nmi` - inject a non-maskable interrupt into the guest
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.provider :libvirt do |libvirt|
+    # Add libvirt watchdog device model i6300esb
+    libvirt.watchdog :model => 'i6300esb', :action => 'reset'
+  end
+end
+```
+
+## Smartcard device
+A virtual smartcard device can be supplied to the guest via the `libvirt.smartcard` element. The option `mode` is mandatory and currently only value `passthrough` is supported. The value `spicevmc` for option `type` is default value and can be supressed. On using `type = tcp`, the options `source_mode`, `source_host` and `source_service` are mandatory.
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.provider :libvirt do |libvirt|
+    # Add smartcard device with type 'spicevmc'
+    libvirt.smartcard :mode => 'passthrough', :type => 'spicevmc'
+  end
+end
+```
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.provider :libvirt do |libvirt|
+    # Add smartcard device with type 'tcp'
+    domain.smartcard :mode => 'passthrough', :type => 'tcp', :source_mode => 'bind', :source_host => '127.0.0.1', :source_service => '2001'
+  end
+end
+```
+## 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`
+you overwrite the defaults, so keep that in mind.
+
+An example:
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.provider :libvirt do |libvirt|
+    # Specify the default hypervisor features
+    libvirt.features = ['acpi', 'apic', 'pae' ]
+  end
+end
+```
+
+A different example for ARM boards:
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.provider :libvirt do |libvirt|
+    # Specify the default hypervisor features
+    libvirt.features = ["apic", "gic version='2'" ]
+  end
+end
+```
+
 ## CPU features
 
 You can specify CPU feature policies via `libvirt.cpu_feature`. Available

data/lib/vagrant-libvirt.rb

@@ -22,7 +22,7 @@ end
 # This is a sanity check to make sure no one is attempting to install
 # this into an early Vagrant version.
 if Vagrant::VERSION < '1.5.0'
-  raise 'The Vagrant Libvirt plugin is only compatible with Vagrant 1.5+'
+  raise 'The Vagrant Libvirt plugin is only compatible with Vagrant 1.5+.'
 end
 
 # make sure base module class defined before loading plugin

data/lib/vagrant-libvirt/action.rb

@@ -67,12 +67,16 @@ module VagrantPlugins
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
           b.use Call, IsRunning do |env, b2|
-            # If the VM is running, then our work here is done, exit
-            next if env[:result]
+            # If the VM is running, run the necessary provisioners
+            if env[:result]
+              b2.use action_provision
+              next
+            end
 
             b2.use Call, IsSuspended do |env2, b3|
               # if vm is suspended resume it then exit
               if env2[:result]
+                b3.use CreateNetworks
                 b3.use ResumeDomain
                 next
               end
@@ -124,6 +128,7 @@ module VagrantPlugins
             end
 
             b2.use Call, IsSuspended do |env2, b3|
+              b3.use CreateNetworks if env2[:result]
               b3.use ResumeDomain if env2[:result]
             end
 
@@ -269,6 +274,7 @@ module VagrantPlugins
                 b3.use MessageNotSuspended
                 next
               end
+              b3.use CreateNetworks
               b3.use ResumeDomain
             end
           end

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

@@ -34,6 +34,7 @@ module VagrantPlugins
           @uuid = config.uuid
           @cpus = config.cpus.to_i
           @cpu_features = config.cpu_features
+          @features = config.features
           @cpu_mode = config.cpu_mode
           @cpu_model = config.cpu_model
           @cpu_fallback = config.cpu_fallback
@@ -42,6 +43,7 @@ module VagrantPlugins
           @machine_type = config.machine_type
           @machine_arch = config.machine_arch
           @disk_bus = config.disk_bus
+          @disk_device = config.disk_device
           @nested = config.nested
           @memory_size = config.memory.to_i * 1024
           @management_network_mac = config.management_network_mac
@@ -61,6 +63,7 @@ module VagrantPlugins
                                "passwd='#{config.graphics_passwd}'"
                               end
           @video_type = config.video_type
+          @sound_type = config.sound_type
           @video_vram = config.video_vram
           @keymap = config.keymap
           @kvm_hidden = config.kvm_hidden
@@ -85,6 +88,9 @@ module VagrantPlugins
 
           # PCI device passthrough
           @pcis = config.pcis
+          
+          # Watchdog device
+          @watchdog_dev = config.watchdog_dev          
 
           # USB device passthrough
           @usbs = config.usbs
@@ -93,6 +99,9 @@ module VagrantPlugins
           @redirdevs = config.redirdevs
           @redirfilters = config.redirfilters
 
+          # smartcard device
+          @smartcard_dev = config.smartcard_dev
+
           # RNG device passthrough
           @rng = config.rng
 
@@ -169,6 +178,9 @@ module VagrantPlugins
           @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
           env[:ui].info(" -- Memory:            #{@memory_size / 1024}M")
           env[:ui].info(" -- Management MAC:    #{@management_network_mac}")
           env[:ui].info(" -- Loader:            #{@loader}")
@@ -186,6 +198,7 @@ module VagrantPlugins
           env[:ui].info(" -- Graphics Password: #{@graphics_passwd.empty? ? 'Not defined' : 'Defined'}")
           env[:ui].info(" -- Video Type:        #{@video_type}")
           env[:ui].info(" -- Video VRAM:        #{@video_vram}")
+          env[:ui].info(" -- Sound Type:	#{@sound_type}")
           env[:ui].info(" -- Keymap:            #{@keymap}")
           env[:ui].info(" -- TPM Path:          #{@tpm_path}")
 
@@ -230,6 +243,10 @@ module VagrantPlugins
             env[:ui].info(" -- RNG device model:  #{@rng[:model]}")
           end
 
+          if not @watchdog_dev.empty?
+            env[:ui].info(" -- Watchdog device:   model=#{@watchdog_dev[:model]}, action=#{@watchdog_dev[:action]}")
+          end
+
           @usbs.each do |usb|
             usb_dev = []
             usb_dev.push("bus=#{usb[:bus]}") if usb[:bus]
@@ -259,6 +276,10 @@ module VagrantPlugins
             end
           end
 
+          if not @smartcard_dev.empty?
+            env[:ui].info(" -- smartcard device:  mode=#{@smartcard_dev[:mode]}, type=#{@smartcard_dev[:type]}")
+          end
+
           env[:ui].info(" -- Command line : #{@cmd_line}")
 
           # Create libvirt domain.

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

@@ -41,8 +41,37 @@ module VagrantPlugins
           # Create new volume from xml template. Fog currently doesn't support
           # volume snapshots directly.
           begin
+            xml = Nokogiri::XML::Builder.new do |xml|
+              xml.volume do
+                xml.name(@name)
+                xml.capacity(@capacity, unit: 'G')
+                xml.target do
+                  xml.format(type: 'qcow2')
+                  xml.permissions do
+                    xml.owner 0
+                    xml.group 0
+                    xml.mode '0600'
+                    xml.label 'virt_image_t'
+                  end
+                end
+                xml.backingStore do
+                  xml.path(@backing_file)
+                  xml.format(type: 'qcow2')
+                  xml.permissions do
+                    xml.owner 0
+                    xml.group 0
+                    xml.mode '0600'
+                    xml.label 'virt_image_t'
+                  end
+                end
+              end
+            end.to_xml(
+              save_with: Nokogiri::XML::Node::SaveOptions::NO_DECLARATION |
+                         Nokogiri::XML::Node::SaveOptions::NO_EMPTY_TAGS |
+                         Nokogiri::XML::Node::SaveOptions::FORMAT
+            )
             domain_volume = env[:machine].provider.driver.connection.volumes.create(
-              xml: to_xml('volume_snapshot'),
+              xml: xml,
               pool_name: config.storage_pool_name
             )
           rescue Fog::Errors::Error => e

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

@@ -17,7 +17,7 @@ module VagrantPlugins
           @logger = Log4r::Logger.new('vagrant_libvirt::action::create_network_interfaces')
           @management_network_name = env[:machine].provider_config.management_network_name
           config = env[:machine].provider_config
-          @nic_model_type = config.nic_model_type
+          @nic_model_type = config.nic_model_type || 'virtio'
           @nic_adapter_count = config.nic_adapter_count
           @app = app
         end
@@ -64,11 +64,17 @@ module VagrantPlugins
           end
 
           # Create each interface as new domain device.
+          @macs_per_network = Hash.new(0)
           adapters.each_with_index do |iface_configuration, slot_number|
             @iface_number = slot_number
             @network_name = iface_configuration[:network_name]
+            @source_options = {
+              network: @network_name
+            }
             @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_queues = iface_configuration.fetch(:driver_queues, false)
             @device_name = iface_configuration.fetch(:iface_name, false)
             template_name = 'interface'
             # Configuration for public interfaces which use the macvtap driver
@@ -77,6 +83,8 @@ module VagrantPlugins
               @mode = iface_configuration.fetch(:mode, 'bridge')
               @type = iface_configuration.fetch(:type, 'direct')
               @model_type = iface_configuration.fetch(:model_type, @nic_model_type)
+              @driver_name = iface_configuration.fetch(:driver_name, false)
+              @driver_queues = iface_configuration.fetch(:driver_queues, false)
               @portgroup = iface_configuration.fetch(:portgroup, nil)
               @network_name = iface_configuration.fetch(:network_name, @network_name)
               template_name = 'public_interface'
@@ -90,8 +98,10 @@ module VagrantPlugins
               raise Errors::TunnelPortNotDefined if @tunnel_port.nil?
               if @type == 'udp'
                 # default udp tunnel source to 127.0.0.1
-                @udp_tunnel_local_ip = iface_configuration.fetch(:tunnel_local_ip, '127.0.0.1')
-                @udp_tunnel_local_port = iface_configuration.fetch(:tunnel_local_port)
+                @udp_tunnel={
+                  address: iface_configuration.fetch(:tunnel_local_ip,'127.0.0.1'),
+                  port: iface_configuration.fetch(:tunnel_local_port)
+                }
               end
               # default mcast tunnel to 239.255.1.1. Web search says this
               # 239.255.x.x is a safe range to use for general use mcast
@@ -100,8 +110,13 @@ module VagrantPlugins
                            else
                              '127.0.0.1'
                            end
-              @tunnel_ip = iface_configuration.fetch(:tunnel_ip, default_ip)
-              @model_type = iface_configuration.fetch(:model_type, @nic_model_type)
+              @source_options = {
+                address: iface_configuration.fetch(:tunnel_ip, default_ip),
+                port: @tunnel_port
+              }
+              @tunnel_type = iface_configuration.fetch(:model_type, @nic_model_type)
+              @driver_name = iface_configuration.fetch(:driver_name, 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
@@ -115,27 +130,46 @@ module VagrantPlugins
             @logger.info(message)
 
             begin
-              domain.attach_device(to_xml(template_name))
+              # FIXME: all options for network driver should be hash from Vagrantfile
+              driver_options = {}
+              driver_options[:name] = @driver_name if @driver_name
+              driver_options[:queues] = @driver_queues if @driver_queues
+              @udp_tunnel ||= {}
+              xml = if template_name == 'interface' or
+                       template_name == 'tunnel_interface'
+                      interface_xml(@type,
+                                    @source_options,
+                                    @mac,
+                                    @device_name,
+                                    @iface_number,
+                                    @model_type,
+                                    driver_options,
+                                    @udp_tunnel)
+                    else
+                      to_xml(template_name)
+                    end
+              domain.attach_device(xml)
             rescue => e
               raise Errors::AttachDeviceError,
                     error_message: e.message
             end
 
             # Re-read the network configuration and grab the MAC address
-            next if @mac
-            xml = Nokogiri::XML(domain.xml_desc)
             if iface_configuration[:iface_type] == :public_network
+              xml = Nokogiri::XML(domain.xml_desc)
+              source = "@network='#{@network_name}'"
               if @type == 'direct'
-                @mac = xml.xpath("/domain/devices/interface[source[@dev='#{@device}']]/mac/@address")
-              elsif !@portgroup.nil?
-                @mac = xml.xpath("/domain/devices/interface[source[@network='#{@network_name}']]/mac/@address")
-              else
-                @mac = xml.xpath("/domain/devices/interface[source[@bridge='#{@device}']]/mac/@address")
+                  source = "@dev='#{@device}'"
+              elsif @portgroup.nil?
+                source = "@bridge='#{@device}'"
               end
-            else
-              @mac = xml.xpath("/domain/devices/interface[source[@network='#{@network_name}']]/mac/@address")
+              if not @mac
+                macs = xml.xpath("/domain/devices/interface[source[#{source}]]/mac/@address")
+                @mac = macs[@macs_per_network[source]]
+                iface_configuration[:mac] = @mac.to_s
+              end
+              @macs_per_network[source] += 1
             end
-            iface_configuration[:mac] = @mac.to_s
           end
 
           # Continue the middleware chain.
@@ -150,7 +184,7 @@ module VagrantPlugins
               # Skip configuring the management network, which is on the first interface.
               # It's used for provisioning and it has to be available during provisioning,
               # ifdown command is not acceptable here.
-              next if slot_number == 0
+              next if slot_number.zero?
               next if options[:auto_config] === false
               @logger.debug "Configuring interface slot_number #{slot_number} options #{options}"
 
@@ -187,6 +221,39 @@ module VagrantPlugins
 
         private
 
+        def target_dev_name(device_name, type, iface_number)
+          if device_name
+            device_name
+          elsif type == 'netwrok'
+            "vnet#{iface_number}"
+          else
+            # TODO can we use same name vnet#ifnum?
+            #"tnet#{iface_number}" FIXME plugin vagrant-libvirt trying to create second tnet0 interface
+            "vnet#{iface_number}"
+          end
+        end
+
+        def interface_xml(type, source_options, mac, device_name,
+                          iface_number, model_type, driver_options,
+                          udp_tunnel={})
+          Nokogiri::XML::Builder.new do |xml|
+            xml.interface(type: type || 'network') do
+              xml.source(source_options) do
+                xml.local(udp_tunnel) if type == 'udp'
+              end
+              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.driver(driver_options)
+            end
+          end.to_xml(
+            save_with: Nokogiri::XML::Node::SaveOptions::NO_DECLARATION |
+                       Nokogiri::XML::Node::SaveOptions::NO_EMPTY_TAGS |
+                       Nokogiri::XML::Node::SaveOptions::FORMAT
+          )
+        end
+
         def find_empty(array, start = 0, stop = @nic_adapter_count)
           (start..stop).each do |i|
             return i unless array[i]

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

@@ -20,13 +20,19 @@ module VagrantPlugins
           libvirt_domain = env[:machine].provider.driver.connection.client.lookup_domain_by_uuid(
             env[:machine].id
           )
-          libvirt_domain.list_snapshots.each do |name|
-            @logger.info("Deleting snapshot '#{name}'")
-            begin
-              libvirt_domain.lookup_snapshot_by_name(name).delete
-            rescue => e
-              raise Errors::DeleteSnapshotError, error_message: e.message
+          begin
+            libvirt_domain.list_snapshots.each do |name|
+              @logger.info("Deleting snapshot '#{name}'")
+              begin
+                libvirt_domain.lookup_snapshot_by_name(name).delete
+              rescue => e
+                raise Errors::DeleteSnapshotError, error_message: e.message
+              end
             end
+          rescue
+            # Some drivers (xen) don't support getting list of snapshots,
+            # not much can be done here about it
+            @logger.warn("Failed to get list of snapshots")
           end
 
           # must remove managed saves

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

@@ -39,11 +39,29 @@ module VagrantPlugins
           # remove hw association with interface
           # working for centos with lvs default disks
           `virt-sysprep --no-logfile --operations defaults,-ssh-userdir -a #{@tmp_img}`
+          # add any user provided file
+          extra = ''
+          @tmp_include = @tmp_dir + '/_include'
+          if env['package.include']
+            extra = './_include'
+            Dir.mkdir(@tmp_include)
+            env['package.include'].each do |f|
+              env[:ui].info("Including user file: #{f}")
+              FileUtils.cp(f, @tmp_include)
+            end
+          end
+          if env['package.vagrantfile']
+            extra = './_include'
+            Dir.mkdir(@tmp_include) unless File.directory?(@tmp_include)
+            env[:ui].info('Including user Vagrantfile')
+            FileUtils.cp(env['package.vagrantfile'], @tmp_include + '/Vagrantfile')
+          end
           Dir.chdir(@tmp_dir)
-          img_size = `qemu-img info #{@tmp_img} | grep 'virtual size' | awk '{print $3;}' | tr -d 'G'`.chomp
+          info = JSON.parse(`qemu-img info --output=json #{@tmp_img}`)
+          img_size = (Float(info['virtual-size'])/(1024**3)).ceil
           File.write(@tmp_dir + '/metadata.json', metadata_content(img_size))
           File.write(@tmp_dir + '/Vagrantfile', vagrantfile_content)
-          assebmle_box(boxname)
+          assemble_box(boxname, extra)
           FileUtils.mv(@tmp_dir + '/' + boxname, '../' + boxname)
           FileUtils.rm_rf(@tmp_dir)
           env[:ui].info('Box created')
@@ -52,8 +70,8 @@ module VagrantPlugins
           @app.call(env)
         end
 
-        def assebmle_box(boxname)
-          `tar cvzf "#{boxname}" --totals ./metadata.json ./Vagrantfile ./box.img`
+        def assemble_box(boxname, extra)
+          `tar cvzf "#{boxname}" --totals ./metadata.json ./Vagrantfile ./box.img #{extra}`
         end
 
         def vagrantfile_content
@@ -66,6 +84,9 @@ module VagrantPlugins
                 libvirt.storage_pool_name = "default"
               end
             end
+
+            user_vagrantfile = File.expand_path('../_include/Vagrantfile', __FILE__)
+            load user_vagrantfile if File.exists?(user_vagrantfile)
           EOF
         end
 

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

@@ -54,10 +54,12 @@ module VagrantPlugins
               end
 
               # Iterface type
-              REXML::XPath.each(xml_descr, '/domain/devices/interface/model') do |iface_model|
-                if iface_model.attributes['type'] != config.nic_model_type
-                  descr_changed = true
-                  iface_model.attributes['type'] = config.nic_model_type
+              unless config.nic_model_type.nil?
+                REXML::XPath.each(xml_descr, '/domain/devices/interface/model') do |iface_model|
+                  if iface_model.attributes['type'] != config.nic_model_type
+                    descr_changed = true
+                    iface_model.attributes['type'] = config.nic_model_type
+                  end
                 end
               end
 
@@ -221,6 +223,12 @@ module VagrantPlugins
                 end
               end
 
+              # Sound device
+              if config.sound_type
+                sound = REXML::XPath.first(xml_descr,'/domain/devices/sound/model')
+              end
+
+
               # dtb
               if config.dtb
                 dtb = REXML::XPath.first(xml_descr, '/domain/os/dtb')

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

@@ -46,7 +46,19 @@ module VagrantPlugins
 
             machine.ui.info "================\nMachine id: #{machine.id}\nShould be mounting folders\n #{id}, opts: #{folder_opts}"
 
-            xml = to_xml('filesystem', folder_opts)
+            #xml = to_xml('filesystem', folder_opts)
+            xml = Nokogiri::XML::Builder.new do |xml|
+              xml.filesystem(type: 'mount', accessmode: folder_opts[:accessmode]) do
+                xml.driver(type: 'path', wrpolicy: 'immediate')
+                xml.source(dir: folder_opts[:hostpath])
+                xml.target(dir: mount_tag)
+                xml.readonly unless folder_opts[:readonly].nil?
+              end
+            end.to_xml(
+              save_with: Nokogiri::XML::Node::SaveOptions::NO_DECLARATION |
+                         Nokogiri::XML::Node::SaveOptions::NO_EMPTY_TAGS |
+                         Nokogiri::XML::Node::SaveOptions::FORMAT
+            )
             # puts "<<<<< XML:\n #{xml}\n >>>>>"
             @conn.lookup_domain_by_uuid(machine.id).attach_device(xml, 0)
           end

data/lib/vagrant-libvirt/config.rb

@@ -64,6 +64,7 @@ module VagrantPlugins
       attr_accessor :cpu_model
       attr_accessor :cpu_fallback
       attr_accessor :cpu_features
+      attr_accessor :features
       attr_accessor :numa_nodes
       attr_accessor :loader
       attr_accessor :boot_order
@@ -71,6 +72,7 @@ module VagrantPlugins
       attr_accessor :machine_arch
       attr_accessor :machine_virtual_size
       attr_accessor :disk_bus
+      attr_accessor :disk_device
       attr_accessor :nic_model_type
       attr_accessor :nested
       attr_accessor :volume_cache
@@ -88,6 +90,7 @@ module VagrantPlugins
       attr_accessor :video_vram
       attr_accessor :keymap
       attr_accessor :kvm_hidden
+      attr_accessor :sound_type
 
       # Sets the information for connecting to a host TPM device
       # Only supports socket-based TPMs
@@ -116,6 +119,9 @@ module VagrantPlugins
       # Random number device passthrough
       attr_accessor :rng
 
+      # Watchdog device
+      attr_accessor :watchdog_dev
+
       # USB device passthrough
       attr_accessor :usbs
 
@@ -123,6 +129,9 @@ module VagrantPlugins
       attr_accessor :redirdevs
       attr_accessor :redirfilters
 
+      # smartcard device
+      attr_accessor :smartcard_dev
+
       # Suspend mode
       attr_accessor :suspend_mode
 
@@ -157,12 +166,14 @@ module VagrantPlugins
         @cpu_model         = UNSET_VALUE
         @cpu_fallback      = UNSET_VALUE
         @cpu_features      = UNSET_VALUE
+        @features          = UNSET_VALUE
         @numa_nodes        = UNSET_VALUE
         @loader            = UNSET_VALUE
         @machine_type      = UNSET_VALUE
         @machine_arch      = UNSET_VALUE
         @machine_virtual_size = UNSET_VALUE
         @disk_bus          = UNSET_VALUE
+        @disk_device       = UNSET_VALUE
         @nic_model_type    = UNSET_VALUE
         @nested            = UNSET_VALUE
         @volume_cache      = UNSET_VALUE
@@ -178,6 +189,7 @@ module VagrantPlugins
         @graphics_passwd   = UNSET_VALUE
         @video_type        = UNSET_VALUE
         @video_vram        = UNSET_VALUE
+        @sound_type        = UNSET_VALUE
         @keymap            = UNSET_VALUE
         @kvm_hidden        = UNSET_VALUE
 
@@ -205,6 +217,9 @@ module VagrantPlugins
         # Random number device passthrough
         @rng = UNSET_VALUE
 
+        # Watchdog device
+        @watchdog_dev      = UNSET_VALUE
+
         # USB device passthrough
         @usbs              = UNSET_VALUE
 
@@ -212,6 +227,9 @@ module VagrantPlugins
         @redirdevs         = UNSET_VALUE
         @redirfilters      = UNSET_VALUE
 
+        # smartcard device
+        @smartcard_dev     = UNSET_VALUE
+
         # Suspend mode
         @suspend_mode      = UNSET_VALUE
 
@@ -344,6 +362,20 @@ module VagrantPlugins
                    function:  options[:function])
       end
 
+      def watchdog(options = {})
+        if options[:model].nil?
+          raise 'Model must be specified.'
+        end
+
+        if @watchdog_dev == UNSET_VALUE
+            @watchdog_dev = {}
+        end
+
+        @watchdog_dev[:model] = options[:model]
+        @watchdog_dev[:action] = options[:action] || 'reset'
+      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.'
@@ -378,6 +410,26 @@ module VagrantPlugins
                            allow: options[:allow])
       end
 
+      def smartcard(options = {})
+        if options[:mode].nil?
+          raise 'Option mode must be specified.'
+        elsif options[:mode] != 'passthrough'
+          raise 'Currently only passthrough mode is supported!'
+        elsif options[:type] == 'tcp' && (options[:source_mode].nil? || options[:source_host].nil? || options[:source_service].nil?)
+          raise 'If using type "tcp", option "source_mode", "source_host" and "source_service" must be specified.'
+        end
+
+        if @smartcard_dev == UNSET_VALUE
+          @smartcard_dev = {}
+        end
+
+        @smartcard_dev[:mode] = options[:mode]
+        @smartcard_dev[:type] = options[:type] || 'spicevmc'
+        @smartcard_dev[:source_mode] = options[:source_mode] if @smartcard_dev[:type] == 'tcp'
+        @smartcard_dev[:source_host] = options[:source_host] if @smartcard_dev[:type] == 'tcp'
+        @smartcard_dev[:source_service] = options[:source_service] if @smartcard_dev[:type] == 'tcp'
+      end
+
       # NOTE: this will run twice for each time it's needed- keep it idempotent
       def storage(storage_type, options = {})
         if storage_type == :file
@@ -430,7 +482,8 @@ module VagrantPlugins
           bus: options[:bus],
           cache: options[:cache] || 'default',
           allow_existing: options[:allow_existing],
-          shareable: options[:shareable]
+          shareable: options[:shareable],
+          serial: options[:serial]
         }
 
         @disks << disk # append
@@ -515,13 +568,15 @@ module VagrantPlugins
           end
         @cpu_fallback = 'allow' if @cpu_fallback == UNSET_VALUE
         @cpu_features = [] if @cpu_features == UNSET_VALUE
+        @features = ['acpi','apic','pae'] if @features == UNSET_VALUE
         @numa_nodes = @numa_nodes == UNSET_VALUE ? nil : _generate_numa
         @loader = nil if @loader == 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
         @disk_bus = 'virtio' if @disk_bus == UNSET_VALUE
-        @nic_model_type = 'virtio' if @nic_model_type == UNSET_VALUE
+        @disk_device = 'vda' if @disk_device == UNSET_VALUE
+        @nic_model_type = nil if @nic_model_type == UNSET_VALUE
         @nested = false if @nested == UNSET_VALUE
         @volume_cache = 'default' if @volume_cache == UNSET_VALUE
         @kernel = nil if @kernel == UNSET_VALUE
@@ -539,6 +594,7 @@ module VagrantPlugins
         @graphics_ip = '127.0.0.1' if @graphics_ip == UNSET_VALUE
         @video_type = 'cirrus' if @video_type == UNSET_VALUE
         @video_vram = 9216 if @video_vram == UNSET_VALUE
+        @sound_type = nil if @sound_type == UNSET_VALUE
         @keymap = 'en-us' if @keymap == UNSET_VALUE
         @kvm_hidden = false if @kvm_hidden == UNSET_VALUE
         @tpm_model = 'tpm-tis' if @tpm_model == UNSET_VALUE
@@ -574,6 +630,9 @@ module VagrantPlugins
         # Random number generator passthrough
         @rng = {} if @rng == UNSET_VALUE
 
+        # Watchdog device
+        @watchdog_dev = {} if @watchdog_dev == UNSET_VALUE
+
         # USB device passthrough
         @usbs = [] if @usbs == UNSET_VALUE
 
@@ -581,6 +640,9 @@ module VagrantPlugins
         @redirdevs = [] if @redirdevs == UNSET_VALUE
         @redirfilters = [] if @redirfilters == UNSET_VALUE
 
+        # smartcard device
+        @smartcard_dev = {} if @smartcard_dev == UNSET_VALUE
+
         # Suspend mode
         @suspend_mode = 'pause' if @suspend_mode == UNSET_VALUE
 

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

@@ -55,9 +55,9 @@
     <% end %>
   </os>
   <features>
-    <acpi/>
-    <apic/>
-    <pae/>
+    <% @features.each do |feature| %>
+    <<%= feature %>/>
+    <% end %>
     <% if @kvm_hidden %>
       <kvm>
         <hidden state='on'/>
@@ -74,7 +74,7 @@
       <driver name='qemu' type='qcow2' cache='<%= @domain_volume_cache %>'/>
       <source file='<%= @domain_volume_path %>'/>
       <%# we need to ensure a unique target dev -%>
-      <target dev='vda' bus='<%= @disk_bus %>'/>
+      <target dev='<%= @disk_device %>' bus='<%= @disk_bus %>'/>
     </disk>
     <% end %>
 <%# additional disks -%>
@@ -86,6 +86,9 @@
       <% if d[:shareable] %>
         <shareable/>
       <% end %>
+      <% if d[:serial] %>
+        <serial><%= d[:serial] %></serial>
+      <% end %>
 <%# this will get auto generated by libvirt
       <address type='pci' domain='0x0000' bus='0x00' slot='???' function='0x0'/>
 -%>
@@ -132,6 +135,12 @@
     <input type='<%= input[:type] %>' bus='<%= input[:bus] %>'/>
 <% end %>
 
+    <% if !@sound_type.nil? %>
+      <%# Sound device-%>
+      <sound model='<%= @sound_type %>'>
+      </sound>
+      <%# End Sound%>
+    <% end %>
     <% if @graphics_type != 'none' %>
       <%# Video device -%>
       <graphics type='<%= @graphics_type %>' port='<%= @graphics_port %>' autoport='<%= @graphics_autoport %>' listen='<%= @graphics_ip %>' keymap='<%= @keymap %>' <%= @graphics_passwd%> />
@@ -183,6 +192,22 @@
         </redirfilter>
       <% end %>
     <% end %>
+    <% unless @watchdog_dev.empty? %>
+    <%# Watchdog Device -%>
+    <watchdog model='<%= @watchdog_dev[:model] %>' action='<%= @watchdog_dev[:action] %>'/>
+    <% end %>
+
+    <% unless @smartcard_dev.empty? -%>
+      <% if @smartcard_dev[:mode] == 'passthrough' %>
+        <% if @smartcard_dev[:type] == 'tcp' %>
+        <smartcard mode='<%= @smartcard_dev[:mode] %>' type='<%= @smartcard_dev[:type] %>'>
+            <source mode='<%= @smartcard_dev[:source_mode] %>' host='<%= @smartcard_dev[:source_host] %>' service='<%= @smartcard_dev[:source_service] %>'/>
+        </smartcard>
+        <% else %>
+        <smartcard mode='<%= @smartcard_dev[:mode] %>' type='<%= @smartcard_dev[:type] %>'/>
+        <% end %>
+      <% end %>
+    <% end -%>
 
     <% if @tpm_path -%>
     <%# TPM Device -%>

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

@@ -10,6 +10,13 @@
   <source bridge='<%=@device%>'/>
   <% end %>
   <model type='<%=@model_type%>'/>
+  <% if @driver_name and @driver_queues %>
+    <driver name='<%=@driver_name%>' queues='<%=@driver_queues%>'/>
+  <% elsif @driver_queues %>
+    <driver queues='<%=@driver_queues%>'/>
+  <% elsif @driver_name %>
+    <driver name='<%=@driver_name%>'/>
+  <% end %>
   <% if @ovs %>
   <virtualport type='openvswitch'/>
   <% end %>

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

@@ -4,6 +4,7 @@ module VagrantPlugins
   module ProviderLibvirt
     module Util
       module ErbTemplate
+        # TODO: remove and use nokogiri builder
         # TODO: might be a chance to use vagrant template system according to https://github.com/mitchellh/vagrant/issues/3231
         def to_xml(template_name = nil, data = binding)
           erb = template_name || self.class.to_s.split('::').last.downcase

data/lib/vagrant-libvirt/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ProviderLibvirt
-    VERSION = '0.0.37'.freeze
+    VERSION = '0.0.38'.freeze
   end
 end

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 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 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

@@ -115,6 +115,9 @@
         <redirfilter>
           <usbdev class='0x0b' vendor='0x0b' product='0x0b' version='0x0b' allow='yes'/>
         </redirfilter>
+    <watchdog model='i6300esb' action='reset'/>
+
+        <smartcard mode='passthrough' type='spicevmc'/>
 
     <tpm model='tpm-tis'>
       <backend type='passthrough'>

data/spec/unit/templates/domain_defaults.xml

@@ -40,5 +40,6 @@
         <model type='cirrus' vram='9216' heads='1'/>
       </video>
 
+
   </devices>
 </domain>

data/spec/unit/templates/domain_spec.rb

@@ -36,6 +36,7 @@ describe 'templates/domain' do
       domain.instance_variable_set('@domain_volume_path', '/var/lib/libvirt/images/test.qcow2')
       domain.instance_variable_set('@domain_volume_cache', 'unsafe')
       domain.disk_bus = 'ide'
+      domain.disk_device = 'vda'
       domain.storage(:file, path: 'test-disk1.qcow2')
       domain.storage(:file, path: 'test-disk2.qcow2')
       domain.disks.each do |disk|
@@ -58,6 +59,8 @@ describe 'templates/domain' do
       domain.redirdev(type: 'tcp', host: 'localhost', port: '4000')
       domain.redirfilter(class: '0x0b', vendor: '0x08e6',
                          product: '0x3437', version: '2.00', allow: 'yes')
+      domain.watchdog(model: 'i6300esb', action: 'reset')
+      domain.smartcard(mode: 'passthrough')
       domain.tpm_path = '/dev/tpm0'
     end
     let(:test_file) { 'domain_all_settings.xml' }

data/tools/create_box.sh

@@ -88,7 +88,7 @@ cd "$TMP_DIR"
 #Using the awk int function here to truncate the virtual image size to an
 #integer since the fog-libvirt library does not seem to properly handle
 #floating point.
-IMG_SIZE=$(qemu-img info "$TMP_IMG" | awk '/virtual size/{print int($3)+1;}' | tr -d 'G')
+IMG_SIZE=$(qemu-img info --output=json "$TMP_IMG" | awk '/virtual-size/{s=int($2)/(1024^3); print (s == int(s)) ? s : int(s)+1 }')
 
 echo "{$IMG_SIZE}"
 
@@ -118,7 +118,7 @@ EOF
 
 echo "==> Creating box, tarring and gzipping"
 
-tar cvzf "$BOX" --totals ./metadata.json ./Vagrantfile ./box.img
+tar cvzf "$BOX" -S --totals ./metadata.json ./Vagrantfile ./box.img
 
 # if box is in tmpdir move it to CWD before removing tmpdir
 if ! isabspath "$BOX"; then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.0.37
+  version: 0.0.38
 platform: ruby
 authors:
 - Lukas Stanek
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-09 00:00:00.000000000 Z
+date: 2017-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
@@ -160,12 +160,8 @@ files:
 - lib/vagrant-libvirt/provider.rb
 - lib/vagrant-libvirt/templates/default_storage_pool.xml.erb
 - lib/vagrant-libvirt/templates/domain.xml.erb
-- lib/vagrant-libvirt/templates/filesystem.xml.erb
-- lib/vagrant-libvirt/templates/interface.xml.erb
 - lib/vagrant-libvirt/templates/private_network.xml.erb
 - lib/vagrant-libvirt/templates/public_interface.xml.erb
-- lib/vagrant-libvirt/templates/tunnel_interface.xml.erb
-- lib/vagrant-libvirt/templates/volume_snapshot.xml.erb
 - lib/vagrant-libvirt/util.rb
 - lib/vagrant-libvirt/util/collection.rb
 - lib/vagrant-libvirt/util/erb_template.rb

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

@@ -1,8 +0,0 @@
-    <filesystem type='mount' accessmode='<%= accessmode %>'>
-      <driver type='path' wrpolicy='immediate'/>
-      <source dir='<%= hostpath %>'/>
-      <target dir='<%= mount_tag %>'/>
-      <% unless readonly.nil? %>
-         <readonly /> 
-      <% end %>
-    </filesystem>

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

@@ -1,14 +0,0 @@
-<interface type='network'>
-  <source network='<%= @network_name %>'/>
-    <% if @mac %>
-      <mac address='<%= @mac %>'/>
-    <% end %>
-    <% if @device_name %>
-      <target dev='<%= @device_name %>'/>
-    <% else %>
-      <target dev='vnet<%= @iface_number %>'/>
-    <% end %>
-  <alias name='net<%= @iface_number %>'/>
-  <model type='<%=@model_type%>'/>
-</interface>
-

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

@@ -1,17 +0,0 @@
-<interface type='<%= @type %>'>
-  <% if @mac %>
-  <mac address='<%= @mac %>'/>
-  <% end %>
-  <source address='<%=@tunnel_ip%>' port='<%= @tunnel_port %>'>
-  <% if @type == 'udp' %>
-    <local address='<%=@udp_tunnel_local_ip%>' port='<%=@udp_tunnel_local_port%>' />
-  <% end %>
-  </source>
-  <% if @device_name %>
-    <target dev='<%= @device_name %>'/>
-  <% else %>
-    <target dev='tnet<%= @iface_number %>'/>
-  <% end %>
-  <alias name='net<%= @iface_number %>'/>
-  <model type='<%=@model_type%>'/>
-</interface>

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

@@ -1,26 +0,0 @@
-<volume>
-  <name><%= @name %></name>
-  <capacity unit="G"><%= @capacity %></capacity>
-
-  <target>
-    <format type='qcow2'/>
-    <permissions>
-      <owner>0</owner>
-      <group>0</group>
-      <mode>0600</mode>
-      <label>virt_image_t</label>
-    </permissions>
-  </target>
-
-  <backingStore>
-    <path><%= @backing_file %></path>
-    <format type='qcow2'/>
-    <permissions>
-      <owner>0</owner>
-      <group>0</group>
-      <mode>0600</mode>
-      <label>virt_image_t</label>
-    </permissions>
-  </backingStore>
-</volume>
-