vagrant-qemu 0.3.9 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b290a04b57476399ea06c4db8e7fd17187e57a54a5e80c2001ec74e432770d59
-  data.tar.gz: d2fbb592a4a934a0936f6b042631cff25c0fcb881dd3c9f0668b867598c2af75
+  metadata.gz: 65b2cb386bb53bca93a879047e5b6a61ac690fd63a55e785b719b2b5379fb678
+  data.tar.gz: b3b4b879c90d4b7df411019f6fe8c80ea572f4751887444fc8e9e041e634ea38
 SHA512:
-  metadata.gz: 98f2b48b70995ecd3db4cd41fc8332b36568ff6292f80af92c66d589fecd4801ec9e72a17e5a5a0b583d86931046d22c9125a7b8f5645da06232feedda307186
-  data.tar.gz: ee11adb08e7b876bed9c5bf124e0ec0a973bec87c31f81a199f98d610a7cf299b8a5d1dd94dc1bdfd24a96117e8844671e17105278018e7a70da10b58cf7dcd1
+  metadata.gz: e825fc1bee4029c89a1a0acc9af2b4a2ee1f646976ac64234ef19b57078a43dd32a7330aee2c1da7b63582a3f1358fbe17e0e632e1a5337d9387be5d810ab551
+  data.tar.gz: c989f426b5232f93ca87a5f4564e36c32f42b906ff8dbe3e11f671312535993b85ac888f3a1d823f7cbb4e2c1308c733e66d33e08032a0fe2c16819bd218e5fd

data/CHANGELOG.md

@@ -85,3 +85,11 @@
 # 0.3.9 (2025-02-22)
 
 * Support ssh_port in string (need better error message)
+
+# 0.3.10 (2025-05-06)
+
+* Add support for `qemu_bin` to customize QEMU binary
+
+# 0.3.11 (2025-05-06)
+
+* Re-publish with repacked gem

data/README.md

@@ -90,6 +90,7 @@ This provider exposes a few provider-specific configuration options:
   * `net_device` - The network device, default: `virtio-net-device`
   * `drive_interface` - The interface type for the main drive, default `virtio`
   * `image_path` - The path (or array of paths) to qcow2 image for box-less VM, default is nil value
+  * `qemu_bin` - Path to an alternative QEMU binary, default: autodetected
   * `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)
@@ -266,6 +267,12 @@ Vagrant.configure("2") do |config|
 end
 ```
 
+10. Use socket_vmnet to communicate between machines
+
+Thanks example from @Leandros.
+
+See [pr#73](https://github.com/ppggff/vagrant-qemu/pull/73) for details.
+
 ## Debug
 
 Serial port is exported to unix socket: `<user_home>/.vagrant.d/tmp/vagrant-qemu/<id>/qemu_socket_serial`, or `debug_port`.

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

@@ -22,6 +22,7 @@ module VagrantPlugins
             :memory => env[:machine].provider_config.memory,
             :net_device => env[:machine].provider_config.net_device,
             :drive_interface => env[:machine].provider_config.drive_interface,
+            :qemu_bin => env[:machine].provider_config.qemu_bin,
             :extra_qemu_args => env[:machine].provider_config.extra_qemu_args,
             :extra_netdev_args => env[:machine].provider_config.extra_netdev_args,
             :ports => fwPorts,

data/lib/vagrant-qemu/config.rb

@@ -14,6 +14,7 @@ module VagrantPlugins
       attr_accessor :net_device
       attr_accessor :drive_interface
       attr_accessor :image_path
+      attr_accessor :qemu_bin
       attr_accessor :qemu_dir
       attr_accessor :extra_qemu_args
       attr_accessor :extra_netdev_args
@@ -35,6 +36,7 @@ module VagrantPlugins
         @net_device = UNSET_VALUE
         @drive_interface = UNSET_VALUE
         @image_path = UNSET_VALUE
+        @qemu_bin = UNSET_VALUE
         @qemu_dir = UNSET_VALUE
         @extra_qemu_args = UNSET_VALUE
         @extra_netdev_args = UNSET_VALUE
@@ -66,6 +68,7 @@ module VagrantPlugins
         @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_bin = nil if @qemu_bin == UNSET_VALUE
         @qemu_dir = "/opt/homebrew/share/qemu" if @qemu_dir == UNSET_VALUE
         @extra_qemu_args = [] if @extra_qemu_args == UNSET_VALUE
         @extra_netdev_args = nil if @extra_netdev_args == UNSET_VALUE

data/lib/vagrant-qemu/driver.rb

@@ -78,7 +78,15 @@ module VagrantPlugins
           end
 
           cmd = []
-          cmd += %W(qemu-system-#{options[:arch]})
+          if options[:qemu_bin].nil?
+            cmd += %W(qemu-system-#{options[:arch]})
+          else
+            if options[:qemu_bin].kind_of?(Array)
+              cmd += options[:qemu_bin]
+            else
+              cmd += %W(#{options[:qemu_bin]})
+            end
+          end
 
           # basic
           cmd += %W(-machine #{options[:machine]}) if !options[:machine].nil?

data/lib/vagrant-qemu/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module QEMU
-    VERSION = '0.3.9'
+    VERSION = '0.3.11'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-qemu
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.11
 platform: ruby
 authors:
 - ppggff
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-22 00:00:00.000000000 Z
+date: 2025-05-06 00:00:00.000000000 Z
 dependencies: []
 description: Enables Vagrant to manage machines with QEMU.
 email: pgf00a@gmail.com
@@ -43,7 +43,6 @@ files:
 - lib/vagrant-qemu/version.rb
 - locales/en.yml
 - vagrant-qemu.gemspec
-- x
 homepage: https://github.com/ppggff/vagrant-qemu
 licenses:
 - MIT

data/x

@@ -1,76 +0,0 @@
-diff --git a/lib/vagrant-qemu/action.rb b/lib/vagrant-qemu/action.rb
-index bb87e38..8818aa9 100644
---- a/lib/vagrant-qemu/action.rb
-+++ b/lib/vagrant-qemu/action.rb
-@@ -116,7 +116,7 @@ module VagrantPlugins
-             end
- 
-             b1.use Provision
--            b1.use EnvSet, port_collision_repair: false
-+            b1.use EnvSet, port_collision_repair: true
-             b1.use PrepareForwardedPortCollisionParams
-             b1.use HandleForwardedPortCollisions
-             b1.use SyncedFolderCleanup
-diff --git a/lib/vagrant-qemu/action/prepare_forwarded_port_collision_params.rb b/lib/vagrant-qemu/action/prepare_forwarded_port_collision_params.rb
-index 159a785..b7c93a3 100644
---- a/lib/vagrant-qemu/action/prepare_forwarded_port_collision_params.rb
-+++ b/lib/vagrant-qemu/action/prepare_forwarded_port_collision_params.rb
-@@ -16,16 +16,23 @@ module VagrantPlugins
-       # Build the remap for any existing collision detections
-       remap = {}
-       env[:port_collision_remap] = remap
-+
-+      has_ssh_forward = false
-       machine.config.vm.networks.each do |type, options|
-         next if type != :forwarded_port
- 
-         # remap ssh.host to ssh_port
-         if options[:id] == "ssh"
-           remap[options[:host]] = machine.provider_config.ssh_port
-+          has_ssh_forward = true
-           break
-         end
-       end
- 
-+      if !has_ssh_forward
-+        machine.config.vm.networks.forward_port(22, machine.provider_config.ssh_port, [id: "ssh", auto_correct: true])
-+      end
-+
-       @app.call(env)
-       end
-     end
-diff --git a/lib/vagrant-qemu/action/start_instance.rb b/lib/vagrant-qemu/action/start_instance.rb
-index 13c1d9d..b434bb3 100644
---- a/lib/vagrant-qemu/action/start_instance.rb
-+++ b/lib/vagrant-qemu/action/start_instance.rb
-@@ -11,6 +11,7 @@ module VagrantPlugins
-         end
- 
-         def call(env)
-+          fwPorts = forwarded_ports(env)
-           options = {
-             :ssh_host => env[:machine].provider_config.ssh_host,
-             :ssh_port => env[:machine].provider_config.ssh_port,
-@@ -23,7 +24,7 @@ module VagrantPlugins
-             :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),
-+            :ports => fwPorts,
-             :control_port => env[:machine].provider_config.control_port,
-             :debug_port => env[:machine].provider_config.debug_port,
-             :no_daemonize => env[:machine].provider_config.no_daemonize,
-@@ -43,7 +44,12 @@ module VagrantPlugins
-             next if type != :forwarded_port
- 
-             # Don't include SSH
--            next if options[:id] == "ssh"
-+            if options[:id] == "ssh"
-+              if options[:host] != env[:machine].provider_config.ssh_port
-+                  env[:machine].provider_config.ssh_port = options[:host]
-+              end
-+              next
-+            end
- 
-             # Skip port if it is disabled
-             next if options[:disabled]