vagrant-qemu 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c30b268793fc83d9e8f8e87c6a8f4bcee6b918bc93e290fca5d7fa5bbf997fb8
-  data.tar.gz: 0f4601e7634001be4f8073587dd695dacac7c5ff6822c06530d8b09cae4f19e2
+  metadata.gz: 47636dd2f589218fd058d32661aa2844a842ea0c1fce7c4fbf1bceb5efc58bea
+  data.tar.gz: d4e04639beb03206cdcb5a09c2b63d608efe18b623ede070d6b2a4a1bafb452e
 SHA512:
-  metadata.gz: c0799387634f0395de31a58e7e94b2e5668527b4a1f02e793d7bc0efdfc8b44879146a6e5a714866e99a8447ffd4ac23985efac9ca3d4d05462a217d3ae88a6b
-  data.tar.gz: 9ca32661b5d7078e9e4641d2acb3c131686b9e52458405618bfe0074abc77829d36f9b858c24202f9cd01fe96793a4e5595e39dc8eecb6678c1ad38f8cfcd2e4
+  metadata.gz: 80ef6dbcb15d76fc97296b178416aaede61bcf4133fc38cac83fd92854cc1e92c8159b49ff961939e498a344b33a328fe87a6995675b65d91a6286d2ae0334ed
+  data.tar.gz: bad9fba78583cb6cb236e81728eba6d9fd53747b25abfe94b1227e0258364e536c093a126a3daea13a72e7bb1403df86710739032b931012ceee7f2a529dadd1

data/CHANGELOG.md

@@ -66,3 +66,8 @@
 * Allow no cpu for riscv64.
 * Allow more config options to be nil.
 * Let id start with "vq_".
+
+# 0.3.6 (2024-02-27)
+
+* Config 'image_path' support array type
+* Try to support libvirt box v2 format

data/README.md

@@ -30,6 +30,7 @@ Others:
 
 * Import from a Libvirt vagrant box or qcow2 image
   * To use box for **Paralles or VMware Fusion**, see [Wiki](https://github.com/ppggff/vagrant-qemu/wiki) for details
+  * Libvirt box v2 format support is experimental
 * Start VM without GUI
 * SSH into VM
 * Provision the instances with any built-in Vagrant provisioner
@@ -87,7 +88,7 @@ This provider exposes a few provider-specific configuration options:
   * `ssh_host` - The SSH IP used to access VM, default: `127.0.0.1`
   * `net_device` - The network device, default: `virtio-net-device`
   * `drive_interface` - The interface type for the main drive, default `virtio`
-  * `image_path` - The path to qcow2 image for box-less VM, default is nil value
+  * `image_path` - The path (or array of paths) to qcow2 image for box-less VM, default is nil value
   * `qemu_dir` - The path to QEMU's install dir, default: `/opt/homebrew/share/qemu`
   * `extra_qemu_args` - The raw list of additional arguments to pass to QEMU. Use with extreme caution. (see "Force Multicore" below as example)
   * `extra_netdev_args` - extra, comma-separated arguments to pass to the -netdev parameter. Use with caution. (see "Force Local IP" below as example)

data/lib/vagrant-qemu/action/import.rb

@@ -1,4 +1,5 @@
 require "log4r"
+require "open3"
 require "pathname"
 
 module VagrantPlugins
@@ -12,18 +13,52 @@ module VagrantPlugins
         end
 
         def call(env)
-          image_path = nil
+          image_path = Array.new
           if env[:machine].provider_config.image_path
-            image_path = Pathname.new(env[:machine].provider_config.image_path)
-          elsif env[:machine].box
-            image_path = env[:machine].box.directory.join("box.img")
+            paths = env[:machine].provider_config.image_path
+            paths = [paths] if !paths.kind_of?(Array)
+            paths.each do |p|
+              image_path.append(Pathname.new(p))
+            end
+          else
+            disks = env[:machine].box.metadata.fetch('disks', [])
+            if disks.empty?
+              # box v1 format
+              image_path.append(env[:machine].box.directory.join("box.img"))
+            else
+              # box v2 format
+              disks.each_with_index do |d, i|
+                if d['path'].nil?
+                  @logger.error("Missing box image path for disk #{i}")
+                  raise Errors::BoxInvalid, name: env[:machine].name, err: "Missing box image path for disk #{i}"
+                end
+                image_path.append(env[:machine].box.directory.join(d['path']))
+              end
+            end
           end
 
-          if !image_path || !image_path.file?
-            @logger.error("Invalid box image path: #{image_path}")
-            raise Errors::BoxInvalid, name: env[:machine].name, err: "Invalid box image path: #{image_path}"
-          else
-            @logger.info("Found box image path: #{image_path}")
+          if image_path.empty?
+            @logger.error("Empty box image path")
+            raise Errors::BoxInvalid, name: env[:machine].name, err: "Empty box image path"
+          end
+          image_path.each do |img|
+            if !img.file?
+              @logger.error("Invalid box image path: #{img}")
+              raise Errors::BoxInvalid, name: env[:machine].name, err: "Invalid box image path: #{img}"
+            end
+            img_str = img.to_s
+            stdout, stderr, status = Open3.capture3('qemu-img', 'info', '--output=json', img_str)
+            if !status.success?
+              @logger.error("Run qemu-img info failed, #{img_str}, out: #{stdout}, err: #{stderr}")
+              raise Errors::BoxInvalid, name: env[:machine].name, err: "Run qemu-img info failed, #{img_str}, out: #{stdout}, err: #{stderr}"
+            end
+            img_info = JSON.parse(stdout)
+            format = img_info['format']
+            if format != 'qcow2'
+              @logger.error("Invalid box image format, #{img_str}, format: #{format}")
+              raise Errors::BoxInvalid, name: env[:machine].name, err: "Invalid box image format, #{img_str}, format: #{format}"
+            end
+            @logger.info("Found box image path: #{img_info}")
           end
 
           qemu_dir = Pathname.new(env[:machine].provider_config.qemu_dir)

data/lib/vagrant-qemu/driver.rb

@@ -45,9 +45,15 @@ module VagrantPlugins
       def start(options)
         if !running?
           id_dir = @data_dir.join(@vm_id)
-          image_path = id_dir.join("linked-box.img").to_s
           pid_file = id_dir.join("qemu.pid").to_s
 
+          image_path = Array.new
+          image_count = id_dir.glob("linked-box*.img").count
+          for i in 0..image_count-1 do
+            suffix_index = i > 0 ? "-#{i}" : ''
+            image_path.append(id_dir.join("linked-box#{suffix_index}.img").to_s)
+          end
+
           id_tmp_dir = @tmp_dir.join(@vm_id)
           FileUtils.mkdir_p(id_tmp_dir)
 
@@ -95,7 +101,9 @@ module VagrantPlugins
 
           # drive
           if !options[:drive_interface].nil?
-            cmd += %W(-drive if=#{options[:drive_interface]},format=qcow2,file=#{image_path})
+            image_path.each do |img|
+              cmd += %W(-drive if=#{options[:drive_interface]},format=qcow2,file=#{img})
+            end
           end
           if options[:arch] == "aarch64" && !options[:firmware_format].nil?
             fm1_path = id_dir.join("edk2-aarch64-code.fd").to_s
@@ -162,7 +170,10 @@ module VagrantPlugins
         end
 
         # Create image
-        execute("qemu-img", "create", "-f", "qcow2", "-F", "qcow2", "-b", options[:image_path].to_s, id_dir.join("linked-box.img").to_s)
+        options[:image_path].each_with_index do |img, i|
+          suffix_index = i > 0 ? "-#{i}" : ''
+          execute("qemu-img", "create", "-f", "qcow2", "-F", "qcow2", "-b", img.to_s, id_dir.join("linked-box#{suffix_index}.img").to_s)
+        end
 
         server = {
           :id => new_id,

data/lib/vagrant-qemu/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module QEMU
-    VERSION = '0.3.5'
+    VERSION = '0.3.6'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-qemu
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - ppggff
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-27 00:00:00.000000000 Z
+date: 2024-02-27 00:00:00.000000000 Z
 dependencies: []
 description: Enables Vagrant to manage machines with QEMU.
 email: pgf00a@gmail.com