diff --git a/README.md b/README.md index c22d125..db4f847 100644 --- a/README.md +++ b/README.md @@ -156,7 +156,7 @@ end * `memory` - Amount of memory in MBytes. Defaults to 512 if not set. * `cpus` - Number of virtual cpus. Defaults to 1 if not set. * `nested` - [Enable nested virtualization](https://github.com/torvalds/linux/blob/master/Documentation/virtual/kvm/nested-vmx.txt). Default is false. -* `cpu_mode` - What cpu mode to use for nested virtualization. Defaults to 'host-model' if not set. +* `cpu_mode` - [What cpu type to emulate](https://libvirt.org/formatdomain.html#elementsCPU). Defaults to 'host-model' if not set. Allowed values: host-model, host-passthrough. * `loader` - Sets path to custom UEFI loader. * `volume_cache` - Controls the cache mechanism. Possible values are "default", "none", "writethrough", "writeback", "directsync" and "unsafe". [See driver->cache in libvirt documentation](http://libvirt.org/formatdomain.html#elementsDisks). * `kernel` - To launch the guest with a kernel residing on host filesystems. Equivalent to qemu `-kernel`. diff --git a/lib/vagrant-libvirt/templates/domain.xml.erb b/lib/vagrant-libvirt/templates/domain.xml.erb index 1259a8b..cb87975 100644 --- a/lib/vagrant-libvirt/templates/domain.xml.erb +++ b/lib/vagrant-libvirt/templates/domain.xml.erb @@ -3,15 +3,17 @@ <%= @memory_size %> <%= @cpus %> - <% if @nested %> - - <% if @cpu_mode != 'host-passthrough' %> - qemu64 + + + <% if @cpu_mode != 'host-passthrough' %> + qemu64 + <% if @nested %> <% end %> - - <% end %> + <% end %> + + <% if @machine_type %> @@ -79,9 +81,9 @@ - <% @inputs.each do |input| %> - - <% end %> +<% @inputs.each do |input| %> + +<% end %> <%# Video device -%> />