vagrant-qemu 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cf28812b77cd3e5b87bfc8fd01f1e1c2f112e5a98cb528103321df039e45e46
-  data.tar.gz: 1581e6455fff4b467bb7a03707b804fdc072390c0d1fe4e8275a8097b3659c22
+  metadata.gz: 1e058e7e0ade14ed01928a0a1f6132cd114091bfeb6d609adcd560c82be77262
+  data.tar.gz: e0c795473dce2bc209fdb199983b63d1ed90533fda753db18e3ebce8a41a7e40
 SHA512:
-  metadata.gz: b1fa789613c99fbd9fce98848933e8d2b36e39f4fe71670fc30b51bd1678e4c3a84808ce3c29714ad78155a8be5891b31544e0ab5afe44557ef0734e861b9b1c
-  data.tar.gz: f4688e1ec563f474a0a599f8f141e74a49ebb1f4c2632bf9d407a4790687b5d1d995bccf3e5195eae6ffd2fee256696651a880b2c23d822cc1db73199b6fc7a4
+  metadata.gz: bbff7dc3f75ef9432aa1a1cc80ad8246d69c596cfc4a1182727a6bb6b2f67ce0529438addee24672d1bde65268d2c6ce502501df64059ce788d91414b2d872bb
+  data.tar.gz: 70ad6126a2d9132e0a91a0ec968110e4a16eded9a183cad842bb35b5c4aa568d0a278eb5a6356bd1b03baeceb9cb3a629e799bf7d95b0b917c8e553ec58c29a7

data/.gitignore

@@ -11,6 +11,8 @@ pkg/*
 tags
 Gemfile.lock
 vendor
+vendor/**
+vendor/**/*
 
 # Vagrant
 .vagrant

data/CHANGELOG.md

@@ -50,3 +50,11 @@
 # 0.3.2 (2022-09-20)
 
 * Use kill 0 to check whether a process is running
+
+# 0.3.3 (2022-10-11)
+
+* Fix a compatibility issue about ruby 3.x
+
+# 0.3.4 (2023-03-09)
+
+* Add config 'drive_interface'.

data/README.md

@@ -13,6 +13,7 @@ Tested:
 * QEMU >= 7.0.0
 * CentOS (centos-7-aarch64-2009-4K)
 * Ubuntu (see [Wiki](https://github.com/ppggff/vagrant-qemu/wiki) for detais)
+* Debian buster64 on x86_64 (see [Wiki](https://github.com/ppggff/vagrant-qemu/wiki) for detais)
 
 Others:
 
@@ -83,6 +84,7 @@ This provider exposes a few provider-specific configuration options:
   * `memory` - The memory setting of VM, default: `4G`
 * debug/expert
   * `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
   * `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)
@@ -147,7 +149,7 @@ Vagrant.configure(2) do |config|
   config.vm.provider "qemu" do |qe|
     qe.arch = "x86_64"
     qe.machine = "q35"
-    qe.cpu = "max"
+    qe.cpu = "qemu64"
     qe.net_device = "virtio-net-pci"
   end
 end

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

@@ -19,6 +19,7 @@ module VagrantPlugins
             :smp => env[:machine].provider_config.smp,
             :memory => env[:machine].provider_config.memory,
             :net_device => env[:machine].provider_config.net_device,
+            :drive_interface => env[:machine].provider_config.drive_interface,
             :extra_qemu_args => env[:machine].provider_config.extra_qemu_args,
             :extra_netdev_args => env[:machine].provider_config.extra_netdev_args,
             :ports => forwarded_ports(env),

data/lib/vagrant-qemu/config.rb

@@ -10,6 +10,7 @@ module VagrantPlugins
       attr_accessor :smp
       attr_accessor :memory
       attr_accessor :net_device
+      attr_accessor :drive_interface
       attr_accessor :image_path
       attr_accessor :qemu_dir
       attr_accessor :extra_qemu_args
@@ -26,6 +27,7 @@ module VagrantPlugins
         @smp = UNSET_VALUE
         @memory = UNSET_VALUE
         @net_device = UNSET_VALUE
+        @drive_interface = UNSET_VALUE
         @image_path = UNSET_VALUE
         @qemu_dir = UNSET_VALUE
         @extra_qemu_args = UNSET_VALUE
@@ -52,6 +54,7 @@ module VagrantPlugins
         @smp = "2" if @smp == UNSET_VALUE
         @memory = "4G" if @memory == UNSET_VALUE
         @net_device = "virtio-net-device" if @net_device == UNSET_VALUE
+        @drive_interface = "virtio" if @drive_interface == UNSET_VALUE
         @image_path = nil if @image_path == UNSET_VALUE
         @qemu_dir = "/opt/homebrew/share/qemu" if @qemu_dir == UNSET_VALUE
         @extra_qemu_args = [] if @extra_qemu_args == UNSET_VALUE

data/lib/vagrant-qemu/driver.rb

@@ -89,7 +89,7 @@ module VagrantPlugins
           cmd += %W(-netdev user,id=net0,#{hostfwd}#{extra_netdev})
 
           # drive
-          cmd += %W(-drive if=virtio,format=qcow2,file=#{image_path})
+          cmd += %W(-drive if=#{options[:drive_interface]},format=qcow2,file=#{image_path})
           if options[:arch] == "aarch64"
             fm1_path = id_dir.join("edk2-aarch64-code.fd").to_s
             fm2_path = id_dir.join("edk2-arm-vars.fd").to_s
@@ -111,7 +111,8 @@ module VagrantPlugins
           # user-defined
           cmd += options[:extra_qemu_args]
 
-          execute(*cmd, {:detach => options[:no_daemonize]})
+          opts = {:detach => options[:no_daemonize]}
+          execute(*cmd, **opts)
         end
       end
 
@@ -148,6 +149,7 @@ module VagrantPlugins
         if options[:arch] == "aarch64"
           execute("cp", options[:qemu_dir].join("edk2-aarch64-code.fd").to_s, id_dir.join("edk2-aarch64-code.fd").to_s)
           execute("cp", options[:qemu_dir].join("edk2-arm-vars.fd").to_s, id_dir.join("edk2-arm-vars.fd").to_s)
+          execute("chmod", "644", id_dir.join("edk2-arm-vars.fd").to_s)
         end
 
         # Create image

data/lib/vagrant-qemu/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module QEMU
-    VERSION = '0.3.2'
+    VERSION = '0.3.4'
   end
 end

data/vagrant-qemu.gemspec

@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
     #     as git).
     #
     gitignore.any? do |ignore|
-      File.fnmatch(ignore, file, File::FNM_PATHNAME) ||
+      File.fnmatch(ignore, file, File::FNM_PATHNAME|File::FNM_DOTMATCH) ||
         File.fnmatch(ignore, File.basename(file), File::FNM_PATHNAME)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-qemu
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - ppggff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-20 00:00:00.000000000 Z
+date: 2023-03-09 00:00:00.000000000 Z
 dependencies: []
 description: Enables Vagrant to manage machines with QEMU.
 email: pgf00a@gmail.com
@@ -62,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Enables Vagrant to manage machines with QEMU.