kitchen-qemu 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba7790deddf9d9fb08c2641e8e697939986de0f6
-  data.tar.gz: 5cacb0d0430844a839f60b40289731ae6ce4b309
+  metadata.gz: cb38771a7b4755414d61c8766b9503fc79cce395
+  data.tar.gz: 6aec6dcc6dabcb1b6dfaaf4b9ab39c9a50aa4f47
 SHA512:
-  metadata.gz: 6b89c6e201ac6bd4bdc0537dfc1a368d2bb57c729ee9a37cc1b80e1d3e9dd96ee9c5b0c43dbb4d1a59726d7c14a348c4c542991aaeb3c365f776271488d3a901
-  data.tar.gz: 9c156a6bdaf2827eb0676ae963b5470a3bbb5a2aeb4a1c6b967b7269e0b013655689e61237554dd842a113e76bee93ffeea11917e89d39aeb0ce0f65251a0008
+  metadata.gz: 5ab29a56d741c00fb0bbfc41eaf470a0274bc5a33df3d70ff891e563a044fb31e40c7efc88f5b84737d792f3930de3370f64639b54ae95dd2302fc3419243568
+  data.tar.gz: 49f495ef2d79e9b53106a217c475a19808b5fd1f405af98bcb14647892ecb7bcf106119a8802ebb739776be3f147ddbfeb17e436fa00a578a92618e174c97914

data/lib/kitchen/driver/qemu.rb

@@ -77,27 +77,34 @@ module Kitchen
         end
 
         # kitchen-vagrant compatibility
-        config[:hostname] = config[:vm_hostname] if config[:hostname].nil?
+        config[:hostname] = config[:vm_hostname] unless config.has_key?(:hostname)
 
         acpi_poweroff = false
         if config[:image].kind_of?(String)
           config[:image] = [{
             :file     => config[:image],
-            :readonly => false,
-            :snapshot => true,
+            :snapshot => 'on',
           }]
         else
           raise UserError, "Invalid image entry for #{instance.to_str}" unless
             config[:image].kind_of?(Array)
           config[:image].each do |image|
             raise UserError, "Invalid image entry for #{instance.to_str}" unless
-              image.kind_of?(Hash) && image[:file]
-            image[:readonly] = false             if image[:readonly].nil?
-            image[:snapshot] = !image[:readonly] if image[:snapshot].nil?
-            acpi_poweroff = true unless (image[:snapshot] || image[:readonly])
+              image.kind_of?(Hash) && image[:file].kind_of?(String)
+            # backwards compatibility
+            image[:readonly] = 'on'  if image[:readonly].kind_of?(TrueClass)
+            image[:readonly] = 'off' if image[:readonly].kind_of?(FalseClass)
+            image[:snapshot] = 'on'  if image[:snapshot].kind_of?(TrueClass)
+            image[:snapshot] = 'off' if image[:snapshot].kind_of?(FalseClass)
+            # defaults
+            image[:snapshot]      = 'on'    if !image.has_key?(:snapshot) && image[:readonly] != 'on'
+            image[:discard]       = 'unmap' if !image.has_key?(:discard)  && image[:readonly] != 'on'
+            image[:detect_zeroes] = 'unmap' if !image.has_key?(:detect_zeroes) &&
+              image[:readonly] != 'on' && image[:snapshot] != 'on'
+            acpi_poweroff = true if image[:snapshot] != 'on' && image[:readonly] != 'on'
           end
         end
-        config[:acpi_poweroff] = acpi_poweroff if config[:acpi_poweroff].nil?
+        config[:acpi_poweroff] = acpi_poweroff unless config.has_key?(:acpi_poweroff)
 
         raise UserError, "Invalid share entry for #{instance.to_str}" unless
           config[:hostshares].kind_of?(Array)
@@ -113,11 +120,11 @@ module Kitchen
         else
           config[:hostshares].each do |share|
             raise UserError, "Invalid share entry for #{instance.to_str}" unless
-              share.kind_of?(Hash) && share[:path]
+              share.kind_of?(Hash) && share[:path].kind_of?(String)
             raise UserError, "No mountpoint defined for share '#{share[:path]}' of #{instance.to_str}" unless
-              share[:mountpoint]
-            raise UserError, "Invalid mount options for share '#{share[:path]}' of #{instance.to_str}" unless
-              share[:mount_options].nil? || share[:mount_options].kind_of?(Array)
+              share[:mountpoint].kind_of?(String)
+            raise UserError, "Invalid mount options for share '#{share[:path]}' of #{instance.to_str}" if
+              share.has_key?(:mount_options) && !share[:mount_options].kind_of?(Array)
           end
         end
 
@@ -185,8 +192,10 @@ module Kitchen
         cmd.push('-device', 'virtio-scsi-pci,id=scsi')
         config[:image].each_with_index do |image, i|
           drive = ['if=none', "id=drive#{i}"]
-          drive.push('readonly')    if image[:readonly]
-          drive.push('snapshot=on') if image[:snapshot]
+          drive.push("readonly=#{image[:readonly]}")           if image.has_key?(:readonly)
+          drive.push("snapshot=#{image[:snapshot]}")           if image.has_key?(:snapshot)
+          drive.push("discard=#{image[:discard]}")             if image.has_key?(:discard)
+          drive.push("detect-zeroes=#{image[:detect_zeroes]}") if image.has_key?(:detect_zeroes)
           if image[:file][0] == '/'
             drive.push("file=#{image[:file]}")
           else
@@ -196,6 +205,16 @@ module Kitchen
                    '-drive', drive.join(','))
         end
 
+        smp = []
+        smp.push("cpus=#{config[:cpus]}")       if config.has_key?(:cpus)
+        smp.push("sockets=#{config[:sockets]}") if config.has_key?(:sockets)
+        smp.push("cores=#{config[:cores]}")     if config.has_key?(:cores)
+        smp.push("threads=#{config[:threads]}") if config.has_key?(:threads)
+        if smp.length > 0
+          info 'SMP enabled.'
+          cmd.push('-smp', smp.join(','))
+        end
+
         config[:hostshares].each_with_index do |share, i|
           path = share[:path]
           path = "#{config[:kitchen_root]}/#{path}" unless path[0] == '/'

data/lib/kitchen/driver/qemu_version.rb

@@ -17,6 +17,6 @@
 module Kitchen
   module Driver
     # Version string for the QEMU Kitchen driver
-    QEMU_VERSION = '0.2.4'
+    QEMU_VERSION = '0.2.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-qemu
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Emil Renner Berthing
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-30 00:00:00.000000000 Z
+date: 2016-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen