vagrant-qemu 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0275c3e86c8ab803e7a99cd437b6aef40f670d885438a29f6b233323b5744876
-  data.tar.gz: 3b52bb52aa9f434683d32bd806b9bd2b6d3420e17095d999312a8921732ab9cc
+  metadata.gz: bd9a87ef8218106cb56d6d2482611ebd09b62fd10e5db9b67c40e0067c8d7872
+  data.tar.gz: 838154d84757fdc3d7a6dab09da20a4636f8ab6ab6ccec9254f7d39f3af580c5
 SHA512:
-  metadata.gz: 1d52b130c592143216d4742efa5c426b75e5dc362e2c3435bb3958cebbfff9790293964ef60c8c3b44dbd786f91eae8a60c8270a2e31ee6bb256bab3d6a84f77
-  data.tar.gz: 24a12127ab0778f258f57cc80976b4e414d2b4b209d57d5d39f72f883e9b3770bdbd76ceb1c4cf9fba4aa0c2fa3f80bbb3b32c14a751e03d7e61dea0e12b0701
+  metadata.gz: 0b711ec022033763ea5900e01b2498a20cda7117ac2b03a82f1ca3934aebe95fc8c8bc8388f584cc8906641a43a5c7ea1f359ea5593fe5820440eb239ed2212d
+  data.tar.gz: 245de895d3a118525a5fdb5545e271b43f98bc50b596bcb0da26d3814c97abd3f2c8ee925eede68015087dffaac156a2f51bab424231ad06416818ae8ab9df25

data/CHANGELOG.md

@@ -16,3 +16,8 @@
 # 0.1.6 (2022-01-25)
 
 * Add config 'net_device'.
+
+# 0.1.7 (2022-03-26)
+
+* Add basic support to forwarded ports.
+* Move unix_socket to `<user_home>/.vagrant.d/tmp`.

data/README.md

@@ -13,6 +13,7 @@ to control and provision machines using QEMU.
 * Provision the instances with any built-in Vagrant provisioner
 * Synced folder support via SMB
 * Basic operation: up, ssh, halt, destroy
+* Basic suport to forwarded ports, see [vagrant doc](https://www.vagrantup.com/docs/networking/forwarded_ports) for details
 
 ## Usage
 
@@ -58,6 +59,7 @@ This provider exposes a few provider-specific configuration options:
 * `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`
+* `net_device` - The network device, default: `virtio-net-device`
 * `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`
 
@@ -108,6 +110,32 @@ Vagrant.configure(2) do |config|
 end
 ```
 
+4. Work with a x86_64 box (basic config)
+
+```
+Vagrant.configure(2) do |config|
+  config.vm.box = "centos/7"
+
+  config.vm.provider "qemu" do |qe|
+    qe.arch = "x86_64"
+    qe.machine = "q35"
+    qe.cpu = "max"
+    qe.net_device = "virtio-net-pci"
+  end
+end
+```
+
+5. Forwarded ports
+
+```
+# Basic Vagrant config (API version 2)
+Vagrant.configure(2) do |config|
+  # ... other stuff
+
+  config.vm.network "forwarded", guest: 80, host: 8080
+end
+```
+
 ## Build
 
 To build the `vagrant-qemu` plugin, clone this repository out, and use
@@ -127,7 +155,6 @@ bundle exec rake build
 
 * Support NFS shared folder
 * Support package VM to box
-* Test on more architectures
 * More configures
 * Better error messages
 * Network

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

@@ -0,0 +1,26 @@
+module VagrantPlugins
+	module QEMU
+	  module Action
+		class PrepareForwardedPortCollisionParams
+		  def initialize(app, env)
+			@app = app
+		  end
+  
+		  def call(env)
+			machine = env[:machine]
+  
+			# TODO: not supported
+			other_used_ports = {}
+			env[:port_collision_extra_in_use] = other_used_ports
+  
+			# Build the remap for any existing collision detections
+			remap = {}
+			env[:port_collision_remap] = remap
+  
+			@app.call(env)
+		  end
+		end
+	  end
+	end
+  end
+  

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

@@ -19,12 +19,35 @@ module VagrantPlugins
             :smp => env[:machine].provider_config.smp,
             :memory => env[:machine].provider_config.memory,
             :net_device => env[:machine].provider_config.net_device,
+            :ports => forwarded_ports(env)
           }
 
           env[:ui].output(I18n.t("vagrant_qemu.starting"))
           env[:machine].provider.driver.start(options)
           @app.call(env)
         end
+
+        def forwarded_ports(env)
+          result = []
+
+          env[:machine].config.vm.networks.each do |type, options|
+            next if type != :forwarded_port
+
+            # Don't include SSH
+            next if options[:id] == "ssh"
+
+            # 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]}")
+          end
+
+          result
+        end
       end
     end
   end

data/lib/vagrant-qemu/action.rb

@@ -116,6 +116,9 @@ module VagrantPlugins
             end
 
             b1.use Provision
+            b1.use EnvSet, port_collision_repair: false
+            b1.use PrepareForwardedPortCollisionParams
+            b1.use HandleForwardedPortCollisions
             b1.use SyncedFolderCleanup
             b1.use SyncedFolders
             b1.use WarnNetworks
@@ -169,6 +172,7 @@ module VagrantPlugins
       autoload :Destroy, action_root.join("destroy")
       autoload :TimedProvision, action_root.join("timed_provision") # some plugins now expect this action to exist
       autoload :WarnNetworks, action_root.join("warn_networks")
+      autoload :PrepareForwardedPortCollisionParams, action_root.join("prepare_forwarded_port_collision_params")
     end
   end
 end

data/lib/vagrant-qemu/driver.rb

@@ -11,10 +11,12 @@ module VagrantPlugins
       # @return [String] VM ID
       attr_reader :vm_id
       attr_reader :data_dir
+      attr_reader :tmp_dir
 
-      def initialize(id, dir)
+      def initialize(id, dir, tmp)
         @vm_id = id
         @data_dir = dir
+        @tmp_dir = tmp.join("vagrant-qemu")
       end
 
       def get_current_state
@@ -32,6 +34,8 @@ module VagrantPlugins
         if created?
           id_dir = @data_dir.join(@vm_id)
           FileUtils.rm_rf(id_dir)
+          id_tmp_dir = @tmp_dir.join(@vm_id)
+          FileUtils.rm_rf(id_tmp_dir)
         end
       end
 
@@ -39,9 +43,12 @@ module VagrantPlugins
         if !running?
           id_dir = @data_dir.join(@vm_id)
           image_path = id_dir.join("linked-box.img").to_s
-          unix_socket_path = id_dir.join("qemu_socket").to_s
           pid_file = id_dir.join("qemu.pid").to_s
 
+          id_tmp_dir = @tmp_dir.join(@vm_id)
+          FileUtils.mkdir_p(id_tmp_dir)
+          unix_socket_path = id_tmp_dir.join("qemu_socket").to_s
+
           cmd = []
           cmd += %W(qemu-system-#{options[:arch]})
 
@@ -51,7 +58,13 @@ module VagrantPlugins
           cmd += %W(-smp #{options[:smp]})
           cmd += %W(-m #{options[:memory]})
           cmd += %W(-device #{options[:net_device]},netdev=net0)
-          cmd += %W(-netdev user,id=net0,hostfwd=tcp::#{options[:ssh_port]}-:22)
+
+          # ports
+          hostfwd = "hostfwd=tcp::#{options[:ssh_port]}-:22"
+          options[:ports].each do |v|
+            hostfwd += ",hostfwd=#{v}"
+          end
+          cmd += %W(-netdev user,id=net0,#{hostfwd})
 
           # drive
           cmd += %W(-drive if=virtio,format=qcow2,file=#{image_path})
@@ -75,8 +88,8 @@ module VagrantPlugins
 
       def stop
         if running?
-          id_dir = @data_dir.join(@vm_id)
-          unix_socket_path = id_dir.join("qemu_socket").to_s
+          id_tmp_dir = @tmp_dir.join(@vm_id)
+          unix_socket_path = id_tmp_dir.join("qemu_socket").to_s
           sent = false
           execute("nc", "-w", "5", "-U", unix_socket_path) do |type, data|
             case type
@@ -96,6 +109,8 @@ module VagrantPlugins
         # Make dir
         id_dir = @data_dir.join(new_id)
         FileUtils.mkdir_p(id_dir)
+        id_tmp_dir = @tmp_dir.join(new_id)
+        FileUtils.mkdir_p(id_tmp_dir)
 
         # Prepare firmware
         execute("cp", options[:qemu_dir].join("edk2-aarch64-code.fd").to_s, id_dir.join("edk2-aarch64-code.fd").to_s)

data/lib/vagrant-qemu/provider.rb

@@ -29,7 +29,7 @@ module VagrantPlugins
       end
 
       def machine_id_changed
-        @driver = Driver.new(@machine.id, @machine.data_dir)
+        @driver = Driver.new(@machine.id, @machine.data_dir, @machine.env.tmp_path)
       end
 
       def ssh_info

data/lib/vagrant-qemu/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module QEMU
-    VERSION = '0.1.6'
+    VERSION = '0.1.7'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-qemu
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - ppggff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-25 00:00:00.000000000 Z
+date: 2022-03-26 00:00:00.000000000 Z
 dependencies: []
 description: Enables Vagrant to manage machines with QEMU.
 email: pgf00a@gmail.com
@@ -29,6 +29,7 @@ files:
 - lib/vagrant-qemu/action/message_already_created.rb
 - lib/vagrant-qemu/action/message_not_created.rb
 - lib/vagrant-qemu/action/message_will_not_destroy.rb
+- lib/vagrant-qemu/action/prepare_forwarded_port_collision_params.rb
 - lib/vagrant-qemu/action/read_state.rb
 - lib/vagrant-qemu/action/start_instance.rb
 - lib/vagrant-qemu/action/stop_instance.rb