vagrant-libvirt 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e37a27120aef75fdd73d704321b96c7c881b07fa3cbdd655855300bf11163a3
-  data.tar.gz: 4639827cc360b3f06304310f02dffea445f19d2f4b8675a6e0e05a9be3cea307
+  metadata.gz: 696535927498f1996c3fd02f6e5503bd8ac47e92eb226d03cd28c46329232b93
+  data.tar.gz: 73cfeb05a09dad74122a6f09f562b5d56ac7c43a7ec029f2e8f5c8dcfa2a9413
 SHA512:
-  metadata.gz: cb13d39445a95f3514cc1be73bcf6e81ec7924959ec86e6cc712c50050ac8211f6b5beb26bbd42c137020e98143794d7b67aa7241e2461cdf2d1ca5ed2a15c30
-  data.tar.gz: b341135cabad7d59963df62e9dd921470a43e4794fb203ff78b893bd058a38af877717f48b25a72135211e72d82082ec444227b97157e365903103240dfb1311
+  metadata.gz: b4237cc046b138f9fbd5efad00bcc80d97b964d6a374e68b94c20cc19fd668e6eda2ea2939d8782ca05b9ea80478907a9728c3b34692b1b2adbb6305f1798cf4
+  data.tar.gz: 5a3e8094b553fd2557be01514f782139bfa52edca8c7dc811138932a84c7f3bffe44e7c0a5a5b322868e648016146efc9b67f5e3a7356e98b2d58b0e6ca2db74

data/README.md

@@ -1,8 +1,9 @@
 # Vagrant Libvirt Provider
 
 [![Join the chat at https://gitter.im/vagrant-libvirt/vagrant-libvirt](https://badges.gitter.im/vagrant-libvirt/vagrant-libvirt.svg)](https://gitter.im/vagrant-libvirt/vagrant-libvirt?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Build Status](https://travis-ci.org/vagrant-libvirt/vagrant-libvirt.svg)](https://travis-ci.org/vagrant-libvirt/vagrant-libvirt)
+[![Build Status](https://github.com/vagrant-libvirt/vagrant-libvirt/actions/workflows/unit-tests.yml/badge.svg)](https://github.com/vagrant-libvirt/vagrant-libvirt/actions/workflows/unit-tests.yml)
 [![Coverage Status](https://coveralls.io/repos/github/vagrant-libvirt/vagrant-libvirt/badge.svg?branch=master)](https://coveralls.io/github/vagrant-libvirt/vagrant-libvirt?branch=master)
+[![Gem Version](https://badge.fury.io/rb/vagrant-libvirt.svg)](https://badge.fury.io/rb/vagrant-libvirt)
 
 This is a [Vagrant](http://www.vagrantup.com) plugin that adds a
 [Libvirt](http://libvirt.org) provider to Vagrant, allowing Vagrant to
@@ -49,6 +50,7 @@ can help a lot :-)
   * [USB Redirector Devices](#usb-redirector-devices)
     * [Filter for USB Redirector Devices](#filter-for-usb-redirector-devices)
 * [Random number generator passthrough](#random-number-generator-passthrough)
+* [Serial Console Devices](#serial-console-devices)
 * [Watchdog device](#watchdog-device)
 * [Smartcard device](#smartcard-device)
 * [Hypervisor Features](#hypervisor-features)
@@ -137,12 +139,6 @@ docker pull vagrantlibvirt/vagrant-libvirt:edge
 ```
 ---
 
-Preparing the docker run, only once:
-
-```bash
-mkdir -p ~/.vagrant.d/{boxes,data,tmp}
-```
-
 Running the image:
 ```bash
 docker run -it --rm \
@@ -173,6 +169,14 @@ vagrant(){
 ```
 
 ### Using Podman
+
+Preparing the podman run, only once:
+
+```bash
+mkdir -p ~/.vagrant.d/{boxes,data,tmp}
+```
+_N.B. This is needed until the entrypoint works for podman to only mount the `~/.vagrant.d` directory_
+
 To run with Podman you need to include
 
 ```bash
@@ -180,6 +184,7 @@ To run with Podman you need to include
   --security-opt label=disable \
   -v ~/.vagrant.d/boxes:/vagrant/boxes \
   -v ~/.vagrant.d/data:/vagrant/data \
+  -v ~/.vagrant.d/data:/vagrant/tmp \
 ```
 
 for example:
@@ -191,6 +196,7 @@ vagrant(){
     -v /var/run/libvirt/:/var/run/libvirt/ \
     -v ~/.vagrant.d/boxes:/vagrant/boxes \
     -v ~/.vagrant.d/data:/vagrant/data \
+    -v ~/.vagrant.d/data:/vagrant/tmp \
     -v $(realpath "${PWD}"):${PWD} \
     -w $(realpath "${PWD}") \
     --network host \
@@ -232,7 +238,7 @@ installed](http://docs.vagrantup.com/v2/installation/index.html).
 Vagrant-libvirt supports Vagrant 2.0, 2.1 & 2.2. It should also work with earlier
 releases from 1.5 onwards but they are not actively tested.
 
-Check the [.travis.yml](https://github.com/vagrant-libvirt/vagrant-libvirt/blob/master/.travis.yml)
+Check the [unit tests](https://github.com/vagrant-libvirt/vagrant-libvirt/blob/master/.github/workflows/unit-tests.yml)
 for the current list of tested versions.
 
 *We only test with the upstream version!* If you decide to install your distro's
@@ -593,6 +599,8 @@ end
 * `graphics_autoport` - Sets autoport for graphics, Libvirt in this case
   ignores graphics_port value, Defaults to 'yes'. Possible value are "yes" and
   "no"
+* `graphics_gl` - Set to `true` to enable OpenGL. Defaults to `true` if
+`video_accel3d` is `true`.
 * `keymap` - Set keymap for vm. default: en-us
 * `kvm_hidden` - [Hide the hypervisor from the
   guest](https://libvirt.org/formatdomain.html#elementsFeatures). Useful for
@@ -603,6 +611,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.
+* `video_accel3d` - Set to `true` to enable 3D acceleration. Defaults to
+`false`.
 * `sound_type` - [Set the virtual sound card](https://libvirt.org/formatdomain.html#elementsSound)
   Defaults to "ich6".
 * `machine_type` - Sets machine type. Equivalent to qemu `-machine`. Use
@@ -657,6 +667,9 @@ end
   it is not possible to communicate with VM through `vagrant ssh` or run
   provisioning. Setting to 'false' is only possible when VM doesn't use box.
   Defaults set to 'true'.
+* `serial` - [libvirt serial devices](https://libvirt.org/formatdomain.html#elementsConsole).
+  Configure a serial/console port to communicate with the guest. Can be used
+  to log to file boot time messages sent to ttyS0 console by the guest.
 
 Specific domain settings can be set for each domain separately in multi-VM
 environment. Example below shows a part of Vagrantfile, where specific options
@@ -906,6 +919,9 @@ starts with `libvirt__` string. Here is a list of those options:
   If not specified the default is 'false'.
 * `:bus` - The bus of the PCI device. Both :bus and :slot have to be defined.
 * `:slot` - The slot of the PCI device. Both :bus and :slot have to be defined.
+* `:libvirt__always_destroy` - Allow domains that use but did not create a
+  network to destroy it when the domain is destroyed (default: `true`). Set to
+  `false` to only allow the domain that created the network to destroy it.
 
 When the option `:libvirt__dhcp_enabled` is to to 'false' it shouldn't matter
 whether the virtual network contains a DHCP server or not and vagrant-libvirt
@@ -1249,6 +1265,26 @@ Vagrant.configure("2") do |config|
 end
 ```
 
+## Serial Console Devices
+You can define settings to redirect output from the serial console of any VM brought up with libvirt to a file or other devices that are listening. [See libvirt documentation](https://libvirt.org/formatdomain.html#elementCharSerial).
+
+Currently only redirecting to a file is supported.
+
+* `type` - only value that has an effect is file, in the future support may be added for virtual console, pty, dev, pipe, tcp, udp, unix socket, spiceport & nmdm.
+* `source` - options pertaining to how the connection attaches to the host, contains sub-settings dependent on `type`.
+  `source` options for type `file`
+  * `path` - file on host to connect to the serial port to record all output. May be created by qemu system user causing some permissions issues.
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.define :test do |test|
+    test.vm.provider :libvirt do |domain|
+      domain.serial :type => "file", :source => {:path => "/var/log/vm_consoles/test.log}
+    end
+  end
+end
+```
+
 ## Random number generator passthrough
 
 You can pass through `/dev/random` to your VM by configuring the domain like this:

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

@@ -78,9 +78,11 @@ module VagrantPlugins
                              else
                                "passwd='#{config.graphics_passwd}'"
                               end
+          @graphics_gl = config.graphics_gl
           @video_type = config.video_type
           @sound_type = config.sound_type
           @video_vram = config.video_vram
+          @video_accel3d = config.video_accel3d
           @keymap = config.keymap
           @kvm_hidden = config.kvm_hidden
 
@@ -171,6 +173,20 @@ module VagrantPlugins
             storage_prefix = get_disk_storage_prefix(env, @storage_pool_name)
           end
 
+          @serials = config.serials
+
+          @serials.each do |serial|
+            next unless serial[:source] && serial[:source][:path]
+
+            dir = File.dirname(serial[:source][:path])
+            begin
+              FileUtils.mkdir_p(dir)
+            rescue ::Errno::EACCES
+              raise Errors::SerialCannotCreatePathError,
+                    path: dir
+            end
+          end
+
           @disks.each do |disk|
             disk[:path] ||= _disk_name(@name, disk)
 
@@ -285,6 +301,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(" -- Video 3D accel:    #{@video_accel3d}")
           env[:ui].info(" -- Sound Type:	#{@sound_type}")
           env[:ui].info(" -- Keymap:            #{@keymap}")
           env[:ui].info(" -- TPM Backend:       #{@tpm_type}")
@@ -379,6 +396,13 @@ module VagrantPlugins
             env[:ui].info(" -- smartcard device:  mode=#{@smartcard_dev[:mode]}, type=#{@smartcard_dev[:type]}")
           end
 
+          @serials.each_with_index do |serial, port|
+            if serial[:source]
+              env[:ui].info(" -- SERIAL(COM#{port}:       redirect to #{serial[:source][:path]}")
+              env[:ui].warn(I18n.t('vagrant_libvirt.warnings.creating_domain_console_access_disabled'))
+            end
+          end
+
           unless @qemu_args.empty?
             env[:ui].info(' -- Command line args: ')
             @qemu_args.each do |arg|

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

@@ -208,6 +208,9 @@ module VagrantPlugins
 
             # Create a private network.
             create_private_network(env)
+            write_created_network(env)
+          else
+            write_created_network(env) unless @options[:always_destroy] == false
           end
         end
 
@@ -247,6 +250,9 @@ module VagrantPlugins
 
             # Create a private network.
             create_private_network(env)
+            write_created_network(env)
+          else
+            write_created_network(env) unless @options[:always_destroy] == false
           end
         end
 
@@ -273,6 +279,9 @@ module VagrantPlugins
 
             # Create a private network.
             create_private_network(env)
+            write_created_network(env)
+          else
+            write_created_network(env) unless @options[:always_destroy] == false
           end
         end
 
@@ -347,7 +356,9 @@ module VagrantPlugins
           rescue => e
             raise Errors::CreateNetworkError, error_message: e.message
           end
+        end
 
+        def write_created_network(env)
           created_networks_file = env[:machine].data_dir + 'created_networks'
 
           message = 'Saving information about created network ' \

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

@@ -34,10 +34,11 @@ module VagrantPlugins
             box_format = env[:machine].box.metadata['format']
             HandleBoxImage.verify_box_format(box_format)
 
+            image_path = HandleBoxImage.get_box_image_path(env[:machine].box, 'box.img')
             env[:box_volume_number] = 1
             env[:box_volumes] = [{
-              :path => HandleBoxImage.get_box_image_path(env[:machine].box, 'box.img'),
-              :name => HandleBoxImage.get_volume_name(env[:machine].box, 'box'),
+              :path => image_path,
+              :name => HandleBoxImage.get_volume_name(env[:machine].box, 'box', image_path, env[:ui]),
               :virtual_size => HandleBoxImage.get_virtual_size(env),
               :format => box_format,
             }]
@@ -58,6 +59,8 @@ module VagrantPlugins
               volume_name = HandleBoxImage.get_volume_name(
                 env[:machine].box,
                 disks[i].fetch('name', disks[i]['path'].sub(/#{File.extname(disks[i]['path'])}$/, '')),
+                image_path,
+                env[:ui],
               )
 
               # allowing name means needing to check that it doesn't cause a clash
@@ -122,15 +125,21 @@ module VagrantPlugins
 
         protected
 
-        def self.get_volume_name(box, name)
+        def self.get_volume_name(box, name, path, ui)
+          version = begin
+                      box.version.to_s
+                    rescue
+                      ''
+                    end
+
+          if version.empty?
+            ui.warn(I18n.t('vagrant_libvirt.box_version_missing', name: box.name.to_s))
+
+            version = "0_#{File.mtime(path).to_i}"
+          end
+
           vol_name = box.name.to_s.dup.gsub('/', '-VAGRANTSLASH-')
-          vol_name << "_vagrant_box_image_#{
-            begin
-              box.version.to_s
-            rescue
-              ''
-            end
-          }_#{name.dup.gsub('/', '-SLASH-')}.img"
+          vol_name << "_vagrant_box_image_#{version}_#{name.dup.gsub('/', '-SLASH-')}.img"
         end
 
         def self.get_virtual_size(env)

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

@@ -59,7 +59,7 @@ module VagrantPlugins
           command = "ip=$(which ip); ${ip:-/sbin/ip} addr show | grep -i 'inet ' | grep -v '127.0.0.1' | tr -s ' ' | cut -d' ' -f3 | cut -d'/' -f 1"
           result  = ''
           machine.communicate.execute(command) do |type, data|
-            result << data if type == :stdout
+            result += data if type == :stdout
           end
 
           ips = result.chomp.split("\n").uniq

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

@@ -1,5 +1,24 @@
 require 'log4r'
 
+module VagrantPlugins
+  module ProviderLibvirt
+    module Action
+      # To wrap GracefulShutdown need to track the time taken
+      class StartShutdownTimer
+        def initialize(app, _env)
+          @app = app
+        end
+
+        def call(env)
+          env[:shutdown_start_time] = Time.now
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end
+
 module VagrantPlugins
   module ProviderLibvirt
     module Action
@@ -15,21 +34,22 @@ module VagrantPlugins
         def call(env)
           timeout = env[:machine].config.vm.graceful_halt_timeout
 
-          start_time = Time.now
+          start_time = env[:shutdown_start_time]
 
-          # call nested action first under the assumption it should try to
-          # handle shutdown via client capabilities
-          @app.call(env)
+          if start_time.nil?
+            # this really shouldn't happen
+            raise Errors::CallChainError, require_action: StartShutdownTimer.name, current_action: ShutdownDomain.name
+          end
 
           # return if successful, otherwise will ensure result is set to false
           env[:result] = env[:machine].state.id == @target_state
 
-          return if env[:result]
+          return @app.call(env) if env[:result]
 
           current_time = Time.now
 
           # if we've already exceeded the timeout
-          return if current_time - start_time >= timeout
+          return @app.call(env) if current_time - start_time >= timeout
 
           # otherwise construct a new timeout.
           timeout = timeout - (current_time - start_time)
@@ -42,6 +62,8 @@ module VagrantPlugins
           end
 
           env[:result] = env[:machine].state.id == @target_state
+
+          @app.call(env)
         end
       end
     end

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

@@ -222,6 +222,24 @@ module VagrantPlugins
                     graphics.attributes['passwd'] = config.graphics_passwd
                   end
                 end
+                graphics_gl = REXML::XPath.first(xml_descr, '/domain/devices/graphics/gl')
+                if graphics_gl.nil?
+                  if config.graphics_gl
+                    graphics_gl = REXML::Element.new('gl', REXML::XPath.first(xml_descr, '/domain/devices/graphics'))
+                    graphics_gl.attributes['enable'] = 'yes'
+                    descr_changed = true
+                  end
+                else
+                  if config.graphics_gl
+                    if graphics_gl.attributes['enable'] != 'yes'
+                      graphics_gl.attributes['enable'] = 'yes'
+                      descr_changed = true
+                    end
+                  else
+                    graphics_gl.parent.delete_element(graphics_gl)
+                    descr_changed = true
+                  end
+                end
               else
                 # graphics_type = none, remove entire element
                 graphics.parent.delete_element(graphics) unless graphics.nil?
@@ -280,6 +298,24 @@ module VagrantPlugins
                     video_model.attributes['vram'] = config.video_vram
                   end
                 end
+                video_accel = REXML::XPath.first(xml_descr, '/domain/devices/video/model/acceleration')
+                if video_accel.nil?
+                  if config.video_accel3d
+                    video_accel = REXML::Element.new('acceleration', REXML::XPath.first(xml_descr, '/domain/devices/video/model'))
+                    video_accel.attributes['accel3d'] = 'yes'
+                    descr_changed = true
+                  end
+                else
+                  if config.video_accel3d
+                    if video_accel.attributes['accel3d'] != 'yes'
+                      video_accel.attributes['accel3d'] = 'yes'
+                      descr_changed = true
+                    end
+                  else
+                    video_accel.parent.delete_element(video_accel)
+                    descr_changed = true
+                  end
+                end
               end
 
               # Sound device

data/lib/vagrant-libvirt/action.rb

@@ -143,19 +143,17 @@ module VagrantPlugins
             b2.use Call, IsRunning do |env2, b3|
               next unless env2[:result]
 
-              b3.use Call, Message, "Attempting nice shutdowns..." do |_, b4|
-                # ShutdownDomain will perform the domain shutdown on the out calls
-                # so it runs after the remaining actions in the same action builder.
-                b4.use ShutdownDomain, :shutoff, :running
-                b4.use GracefulHalt, :shutoff, :running
+              b3.use StartShutdownTimer
+              b3.use Call, GracefulHalt, :shutoff, :running do |env3, b4|
+                if !env3[:result]
+                  b4.use Call, ShutdownDomain, :shutoff, :running do |env4, b5|
+                    if !env4[:result]
+                       b5.use HaltDomain
+                    end
+                  end
+                end
               end
 
-              # Only force halt if previous actions insufficient.
-              b3.use Call, IsRunning do |env3, b4|
-                next unless env3[:result]
-
-                b4.use HaltDomain
-              end
             end
           end
         end
@@ -235,14 +233,12 @@ module VagrantPlugins
           b.use ConfigValidate
           b.use Call, IsCreated do |env, b2|
             unless env[:result]
-              b2.use MessageNotCreated
-              next
+              raise Vagrant::Errors::VMNotCreatedError
             end
 
             b2.use Call, IsRunning do |env2, b3|
               unless env2[:result]
-                b3.use MessageNotRunning
-                next
+                raise Vagrant::Errors::VMNotRunningError
               end
 
               b3.use SSHExec
@@ -332,14 +328,12 @@ module VagrantPlugins
           b.use ConfigValidate
           b.use Call, IsCreated do |env, b2|
             unless env[:result]
-              b2.use MessageNotCreated
-              next
+              raise Vagrant::Errors::VMNotCreatedError
             end
 
             b2.use Call, IsRunning do |env2, b3|
               unless env2[:result]
-                b3.use MessageNotRunning
-                next
+                raise Vagrant::Errors::VMNotRunningError
               end
 
               b3.use SSHRun
@@ -360,6 +354,7 @@ module VagrantPlugins
       autoload :ForwardPorts, action_root.join('forward_ports')
       autoload :ClearForwardedPorts, action_root.join('forward_ports')
       autoload :HaltDomain, action_root.join('halt_domain')
+      autoload :StartShutdownTimer, action_root.join('shutdown_domain')
       autoload :ShutdownDomain, action_root.join('shutdown_domain')
       autoload :HandleBoxImage, action_root.join('handle_box_image')
       autoload :HandleStoragePool, action_root.join('handle_storage_pool')

data/lib/vagrant-libvirt/config.rb

@@ -119,8 +119,10 @@ module VagrantPlugins
       attr_accessor :graphics_port
       attr_accessor :graphics_passwd
       attr_accessor :graphics_ip
+      attr_accessor :graphics_gl
       attr_accessor :video_type
       attr_accessor :video_vram
+      attr_accessor :video_accel3d
       attr_accessor :keymap
       attr_accessor :kvm_hidden
       attr_accessor :sound_type
@@ -196,6 +198,9 @@ module VagrantPlugins
       # Use QEMU Agent to get ip address
       attr_accessor :qemu_use_agent
 
+      # serial consoles
+      attr_accessor :serials
+
       def initialize
         @uri               = UNSET_VALUE
         @driver            = UNSET_VALUE
@@ -267,8 +272,10 @@ module VagrantPlugins
         @graphics_port     = UNSET_VALUE
         @graphics_ip       = UNSET_VALUE
         @graphics_passwd   = UNSET_VALUE
+        @graphics_gl       = UNSET_VALUE
         @video_type        = UNSET_VALUE
         @video_vram        = UNSET_VALUE
+        @video_accel3d     = UNSET_VALUE
         @sound_type        = UNSET_VALUE
         @keymap            = UNSET_VALUE
         @kvm_hidden        = UNSET_VALUE
@@ -338,6 +345,8 @@ module VagrantPlugins
 
         # Use Qemu agent to get ip address
         @qemu_use_agent  = UNSET_VALUE
+
+        @serials           = []
       end
 
       def boot(device)
@@ -705,6 +714,20 @@ module VagrantPlugins
         @qemu_env.merge!(options)
       end
 
+      def serial(options={})
+        options = {
+          :type => "pty",
+          :source => nil,
+        }.merge(options)
+
+        serial = {
+          :type => options[:type],
+          :source => options[:source],
+        }
+
+        @serials << serial
+      end
+
       def _default_uri
         # Determine if any settings except driver provided explicitly, if not
         # and the LIBVIRT_DEFAULT_URI var is set, use that.
@@ -817,7 +840,6 @@ module VagrantPlugins
         @management_network_pci_slot = nil if @management_network_pci_slot == UNSET_VALUE
         @management_network_domain = nil if @management_network_domain == UNSET_VALUE
         @management_network_mtu = nil if @management_network_mtu == UNSET_VALUE
-        @system_uri      = 'qemu:///system' if @system_uri == UNSET_VALUE
 
         # Domain specific settings.
         @title = '' if @title == UNSET_VALUE
@@ -871,6 +893,8 @@ 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
+        @video_accel3d = false if @video_accel3d == UNSET_VALUE
+        @graphics_gl = @video_accel3d if @graphics_gl == 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
@@ -945,7 +969,9 @@ module VagrantPlugins
         # Additional QEMU commandline environment variables
         @qemu_env = {} if @qemu_env == UNSET_VALUE
 
-        @qemu_use_agent = true if @qemu_use_agent != UNSET_VALUE
+        @qemu_use_agent = false if @qemu_use_agent == UNSET_VALUE
+
+        @serials = [{:type => 'pty', :source => nil}] if @serials == []
       end
 
       def validate(machine)
@@ -959,6 +985,9 @@ module VagrantPlugins
           end
         end
 
+        unless @qemu_use_agent == true || @qemu_use_agent == false
+          errors << "libvirt.qemu_use_agent must be a boolean."
+        end
 
         if @qemu_use_agent == true
           # if qemu agent is used to optain domain ip configuration, at least
@@ -976,6 +1005,12 @@ module VagrantPlugins
           end
         end
 
+        machine.provider_config.serials.each do |serial|
+          if serial[:source] and serial[:source][:path].nil?
+            errors << "serial :source requires :path to be defined"
+          end
+        end
+
         machine.config.vm.networks.each do |_type, opts|
           if opts[:mac]
             if opts[:mac] =~ /\A([0-9a-fA-F]{12})\z/
@@ -1017,6 +1052,10 @@ module VagrantPlugins
           c = qemu_env != UNSET_VALUE ? qemu_env.dup : {}
           c.merge!(other.qemu_env) if other.qemu_env != UNSET_VALUE
           result.qemu_env = c
+
+          s = serials.dup
+          s += other.serials
+          result.serials = s
         end
       end
 
@@ -1026,6 +1065,10 @@ module VagrantPlugins
         # Parse uri to extract individual components
         uri = _parse_uri(@uri)
 
+        system_uri = uri.dup
+        system_uri.path = '/system'
+        @system_uri = system_uri.to_s if @system_uri == UNSET_VALUE
+
         # only set @connect_via_ssh if not explicitly to avoid overriding
         # and allow an error to occur if the @uri and @connect_via_ssh disagree
         @connect_via_ssh = uri.scheme.include? "ssh" if @connect_via_ssh == UNSET_VALUE

data/lib/vagrant-libvirt/driver.rb

@@ -61,7 +61,7 @@ module VagrantPlugins
 
         config = @machine.provider_config
 
-        @system_connection = Libvirt::open(config.system_uri)
+        @system_connection = Libvirt::open_read_only(config.system_uri)
         @system_connection
       end
 
@@ -98,16 +98,16 @@ module VagrantPlugins
       end
 
       def get_domain_ipaddress(machine, domain)
-        if @machine.provider_config.qemu_use_session
-          return get_ipaddress_from_system domain.mac
-        end
-
         # attempt to get ip address from qemu agent
         if @machine.provider_config.qemu_use_agent == true
           @logger.info('Get IP via qemu agent')
           return get_ipaddress_from_qemu_agent(domain, machine.id)
         end
 
+        if @machine.provider_config.qemu_use_session
+          return get_ipaddress_from_system domain.mac
+        end
+
         # Get IP address from dhcp leases table
         begin
           ip_address = get_ipaddress_from_domain(domain)
@@ -168,9 +168,9 @@ module VagrantPlugins
       def get_ipaddress_from_qemu_agent(domain, machine_id)
         ip_address = nil
         addresses = nil
-        dom = system_connection.lookup_domain_by_uuid(machine_id)
+        libvirt_domain = connection.client.lookup_domain_by_uuid(machine_id)
         begin
-          response = dom.qemu_agent_command('{"execute":"guest-network-get-interfaces"}', timeout=10)
+          response = libvirt_domain.qemu_agent_command('{"execute":"guest-network-get-interfaces"}', timeout=10)
           @logger.debug("Got Response from qemu agent")
           @logger.debug(response)
           addresses = JSON.parse(response)
@@ -180,7 +180,7 @@ module VagrantPlugins
 
         unless addresses.nil?
           addresses["return"].each{ |interface|
-            if domain.mac == interface["hardware-address"]
+            if domain.mac.downcase == interface["hardware-address"].downcase
               @logger.debug("Found mathing interface: [%s]" % interface["name"])
               if interface.has_key?("ip-addresses")
                 interface["ip-addresses"].each{ |ip|