vagrant-qemu 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e058e7e0ade14ed01928a0a1f6132cd114091bfeb6d609adcd560c82be77262
-  data.tar.gz: e0c795473dce2bc209fdb199983b63d1ed90533fda753db18e3ebce8a41a7e40
+  metadata.gz: c30b268793fc83d9e8f8e87c6a8f4bcee6b918bc93e290fca5d7fa5bbf997fb8
+  data.tar.gz: 0f4601e7634001be4f8073587dd695dacac7c5ff6822c06530d8b09cae4f19e2
 SHA512:
-  metadata.gz: bbff7dc3f75ef9432aa1a1cc80ad8246d69c596cfc4a1182727a6bb6b2f67ce0529438addee24672d1bde65268d2c6ce502501df64059ce788d91414b2d872bb
-  data.tar.gz: 70ad6126a2d9132e0a91a0ec968110e4a16eded9a183cad842bb35b5c4aa568d0a278eb5a6356bd1b03baeceb9cb3a629e799bf7d95b0b917c8e553ec58c29a7
+  metadata.gz: c0799387634f0395de31a58e7e94b2e5668527b4a1f02e793d7bc0efdfc8b44879146a6e5a714866e99a8447ffd4ac23985efac9ca3d4d05462a217d3ae88a6b
+  data.tar.gz: 9ca32661b5d7078e9e4641d2acb3c131686b9e52458405618bfe0074abc77829d36f9b858c24202f9cd01fe96793a4e5595e39dc8eecb6678c1ad38f8cfcd2e4

data/CHANGELOG.md

@@ -58,3 +58,11 @@
 # 0.3.4 (2023-03-09)
 
 * Add config 'drive_interface'.
+
+# 0.3.5 (2023-07-27)
+
+* Fix forwarded ports bug. #39
+* Add config 'firmware_format', 'ssh_host', 'other_default'.
+* Allow no cpu for riscv64.
+* Allow more config options to be nil.
+* Let id start with "vq_".

data/README.md

@@ -72,17 +72,19 @@ Same as [vagrant-libvirt version-1](https://github.com/vagrant-libvirt/vagrant-l
 
 ## Configuration
 
+### Options
+
 This provider exposes a few provider-specific configuration options:
 
 * basic
-  * `ssh_port` - The SSH port number used to access VM (IP is 127.0.0.1),
-  default: `50022`
+  * `ssh_port` - The SSH port number used to access VM, default: `50022`
   * `arch` - The architecture of VM, default: `aarch64`
   * `machine` - The machine type of VM, default: `virt,accel=hvf,highmem=off`
   * `cpu` - The cpu model of VM, default: `cortex-a72`
   * `smp` - The smp setting (Simulate an SMP system with n CPUs) of VM, default: `2`
   * `memory` - The memory setting of VM, default: `4G`
 * debug/expert
+  * `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
@@ -92,6 +94,10 @@ This provider exposes a few provider-specific configuration options:
   * `control_port` - The port number used to control vm from vagrant, default is nil value. (nil means use unix socket)
   * `debug_port` - The port number used to export serial port of the vm for debug, default is nil value. (nil means use unix socket, see "Debug" below for details)
   * `no_daemonize` - Disable the "daemonize" mode of QEMU, default is false. (see "Windows host" below as example)
+  * `firmware_format` - The format of aarch64 firmware images (`edk2-aarch64-code.fd` and `edk2-arm-vars.fd`) loaded from `qemu_dir`, default: `raw`
+  * `other_default` - The other default arguments used by this plugin, default: `%W(-parallel null -monitor none -display none -vga none)`
+
+### Usage
 
 These can be set like typical provider-specific configuration:
 
@@ -106,6 +112,24 @@ Vagrant.configure(2) do |config|
 end
 ```
 
+### With `nil` value
+
+To be able to custom the result qemu command deeply, you can set some config options
+to `nil` value to skip related qemu arguments.
+
+* `machine`: skip `-machine xxx`
+* `cpu`: skip `-cpu xxx`
+* `smp`: skip `-smp xxx`
+* `memory`: skip `-m xxx`
+* `net_device`: skip all network related arguments:
+  * `-device xxx,netdev=net0`
+  * `-netdev user,id=net0,xxx`
+  * NOTES: there will be no network, ssh won't work
+* `drive_interface`: skip drive for the main image, `-drive if=xxx,xxx`
+* `firmware_format`: skip firmware setup for aarch64, `-drive if=pflash,xxx`
+
+With `other_default = []`, all default arguments will be skipped.
+
 ## Example
 
 1. Try with a sample box

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

@@ -40,6 +40,7 @@ module VagrantPlugins
             :image_path => image_path,
             :qemu_dir => qemu_dir,
             :arch => env[:machine].provider_config.arch,
+            :firmware_format => env[:machine].provider_config.firmware_format
           }
 
           env[:ui].detail("Creating and registering the VM...")

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

@@ -12,6 +12,7 @@ module VagrantPlugins
 
         def call(env)
           options = {
+            :ssh_host => env[:machine].provider_config.ssh_host,
             :ssh_port => env[:machine].provider_config.ssh_port,
             :arch => env[:machine].provider_config.arch,
             :machine => env[:machine].provider_config.machine,
@@ -25,7 +26,9 @@ module VagrantPlugins
             :ports => forwarded_ports(env),
             :control_port => env[:machine].provider_config.control_port,
             :debug_port => env[:machine].provider_config.debug_port,
-            :no_daemonize => env[:machine].provider_config.no_daemonize
+            :no_daemonize => env[:machine].provider_config.no_daemonize,
+            :firmware_format => env[:machine].provider_config.firmware_format,
+            :other_default => env[:machine].provider_config.other_default
           }
 
           env[:ui].output(I18n.t("vagrant_qemu.starting"))
@@ -45,11 +48,7 @@ module VagrantPlugins
             # Skip port if it is disabled
             next if options[:disabled]
 
-            host_ip = ""
-            host_ip = "#{options[:host_ip]}:" if options[:host_ip]
-            guest_ip = ""
-            guest_ip = "#{options[:guest_ip]}:" if options[:guest_ip]
-            result.push("#{options[:protocol]}:#{host_ip}:#{options[:host]}-#{guest_ip}:#{options[:guest]}")
+            result.push("#{options[:protocol]}:#{options[:host_ip]}:#{options[:host]}-#{options[:guest_ip]}:#{options[:guest]}")
           end
 
           result

data/lib/vagrant-qemu/config.rb

@@ -3,6 +3,7 @@ require "vagrant"
 module VagrantPlugins
   module QEMU
     class Config < Vagrant.plugin("2", :config)
+      attr_accessor :ssh_host
       attr_accessor :ssh_port
       attr_accessor :arch
       attr_accessor :machine
@@ -18,8 +19,11 @@ module VagrantPlugins
       attr_accessor :control_port
       attr_accessor :debug_port
       attr_accessor :no_daemonize
+      attr_accessor :firmware_format
+      attr_accessor :other_default
 
       def initialize
+        @ssh_host = UNSET_VALUE
         @ssh_port = UNSET_VALUE
         @arch = UNSET_VALUE
         @machine = UNSET_VALUE
@@ -35,6 +39,8 @@ module VagrantPlugins
         @control_port = UNSET_VALUE
         @debug_port = UNSET_VALUE
         @no_daemonize = UNSET_VALUE
+        @firmware_format = UNSET_VALUE
+        @other_default = UNSET_VALUE
       end
 
       #-------------------------------------------------------------------
@@ -47,6 +53,7 @@ module VagrantPlugins
       end
 
       def finalize!
+        @ssh_host = "127.0.0.1" if @ssh_host == UNSET_VALUE
         @ssh_port = 50022 if @ssh_port == UNSET_VALUE
         @arch = "aarch64" if @arch == UNSET_VALUE
         @machine = "virt,accel=hvf,highmem=on" if @machine == UNSET_VALUE
@@ -62,6 +69,8 @@ module VagrantPlugins
         @control_port = nil if @control_port == UNSET_VALUE
         @debug_port = nil if @debug_port == UNSET_VALUE
         @no_daemonize = false if @no_daemonize == UNSET_VALUE
+        @firmware_format = "raw" if @firmware_format == UNSET_VALUE
+        @other_default = %W(-parallel null -monitor none -display none -vga none) if @other_default == UNSET_VALUE
       end
 
       def validate(machine)

data/lib/vagrant-qemu/driver.rb

@@ -71,30 +71,37 @@ module VagrantPlugins
           cmd += %W(qemu-system-#{options[:arch]})
 
           # basic
-          cmd += %W(-machine #{options[:machine]})
-          cmd += %W(-cpu #{options[:cpu]})
-          cmd += %W(-smp #{options[:smp]})
-          cmd += %W(-m #{options[:memory]})
-          cmd += %W(-device #{options[:net_device]},netdev=net0)
-
-          # ports
-          hostfwd = "hostfwd=tcp::#{options[:ssh_port]}-:22"
-          options[:ports].each do |v|
-            hostfwd += ",hostfwd=#{v}"
-          end
-          extra_netdev = ""
-          if !options[:extra_netdev_args].nil?
-            extra_netdev = ",#{options[:extra_netdev_args]}"
+          cmd += %W(-machine #{options[:machine]}) if !options[:machine].nil?
+          cmd += %W(-cpu #{options[:cpu]}) if !options[:cpu].nil?
+          cmd += %W(-smp #{options[:smp]}) if !options[:smp].nil?
+          cmd += %W(-m #{options[:memory]}) if !options[:memory].nil?
+
+          # network
+          if !options[:net_device].nil?
+            # net device
+            cmd += %W(-device #{options[:net_device]},netdev=net0)
+
+            # ports
+            hostfwd = "hostfwd=tcp::#{options[:ssh_port]}-:22"
+            options[:ports].each do |v|
+              hostfwd += ",hostfwd=#{v}"
+            end
+            extra_netdev = ""
+            if !options[:extra_netdev_args].nil?
+              extra_netdev = ",#{options[:extra_netdev_args]}"
+            end
+            cmd += %W(-netdev user,id=net0,#{hostfwd}#{extra_netdev})
           end
-          cmd += %W(-netdev user,id=net0,#{hostfwd}#{extra_netdev})
 
           # drive
-          cmd += %W(-drive if=#{options[:drive_interface]},format=qcow2,file=#{image_path})
-          if options[:arch] == "aarch64"
+          if !options[:drive_interface].nil?
+            cmd += %W(-drive if=#{options[:drive_interface]},format=qcow2,file=#{image_path})
+          end
+          if options[:arch] == "aarch64" && !options[:firmware_format].nil?
             fm1_path = id_dir.join("edk2-aarch64-code.fd").to_s
             fm2_path = id_dir.join("edk2-arm-vars.fd").to_s
-            cmd += %W(-drive if=pflash,format=raw,file=#{fm1_path},readonly=on)
-            cmd += %W(-drive if=pflash,format=raw,file=#{fm2_path})
+            cmd += %W(-drive if=pflash,format=#{options[:firmware_format]},file=#{fm1_path},readonly=on)
+            cmd += %W(-drive if=pflash,format=#{options[:firmware_format]},file=#{fm2_path})
           end
 
           # control
@@ -103,11 +110,13 @@ module VagrantPlugins
           cmd += %W(-chardev socket,id=ser0,#{debug_socket},server=on,wait=off)
           cmd += %W(-serial chardev:ser0)
           cmd += %W(-pidfile #{pid_file})
-          cmd += %W(-parallel null -monitor none -display none -vga none)
           if !options[:no_daemonize]
             cmd += %W(-daemonize)
           end
 
+          # other default
+          cmd += options[:other_default]
+
           # user-defined
           cmd += options[:extra_qemu_args]
 
@@ -137,7 +146,7 @@ module VagrantPlugins
       end
 
       def import(options)
-        new_id = SecureRandom.urlsafe_base64(8)
+        new_id = "vq_" + SecureRandom.urlsafe_base64(8)
 
         # Make dir
         id_dir = @data_dir.join(new_id)
@@ -146,7 +155,7 @@ module VagrantPlugins
         FileUtils.mkdir_p(id_tmp_dir)
 
         # Prepare firmware
-        if options[:arch] == "aarch64"
+        if options[:arch] == "aarch64" && !options[:firmware_format].nil?
           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)

data/lib/vagrant-qemu/provider.rb

@@ -37,7 +37,7 @@ module VagrantPlugins
         return nil if state.id != :running
 
         return {
-          host: "127.0.0.1",
+          host: @machine.provider_config.ssh_host,
           port: @machine.provider_config.ssh_port
         }
       end

data/lib/vagrant-qemu/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-qemu
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - ppggff
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-09 00:00:00.000000000 Z
+date: 2023-07-27 00:00:00.000000000 Z
 dependencies: []
 description: Enables Vagrant to manage machines with QEMU.
 email: pgf00a@gmail.com
@@ -47,7 +47,7 @@ homepage: https://github.com/ppggff/vagrant-qemu
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -62,8 +62,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
 summary: Enables Vagrant to manage machines with QEMU.
 test_files: []