lib/vagrant-libvirt/templates/domain.xml.erb in vagrant-libvirt-0.0.25 vs lib/vagrant-libvirt/templates/domain.xml.erb in vagrant-libvirt-0.0.26

@@ -12,11 +12,15 @@
       <% end %>
     </cpu>
   <% end %>
 
   <os>
+  <% if @machine_type %>
+    <type machine='<%= @machine_type %>'>hvm</type>
+  <% else %>
     <type>hvm</type>
+  <% end %>
     <boot dev='hd'/>
     <kernel><%= @kernel %></kernel>
     <initrd><%= @initrd %></initrd>
     <cmdline><%= @cmd_line %></cmdline>
   </os>
@@ -42,18 +46,27 @@
 <%# this will get auto generated by libvirt
       <address type='pci' domain='0x0000' bus='0x00' slot='???' function='0x0'/>
 -%>
     </disk>
 <% end -%>
+
+<% @cdroms.each do |c| %>
+    <disk type='file' device='cdrom'>
+      <source file='<%= c[:path] %>'/>
+      <target dev='<%= c[:dev] %>' bus='<%= c[:bus] %>'/>
+      <readonly/>
+    </disk>
+<% end %>
+
     <serial type='pty'>
       <target port='0'/>
     </serial>
     <console type='pty'>
       <target port='0'/>
     </console>
     <input type='mouse' bus='ps2'/>
     <%# Video device -%>
-    <graphics type='<%= @graphics_type %>' port='<%= @graphics_port %>' autoport='<%= @graphics_autoport %>' listen='<%= @graphics_ip %>' keymap='en-us' <%= @graphics_passwd%> />
+    <graphics type='<%= @graphics_type %>' port='<%= @graphics_port %>' autoport='<%= @graphics_autoport %>' listen='<%= @graphics_ip %>' keymap='<%= @keymap %>' <%= @graphics_passwd%> />
       <video>
           <model type='<%= @video_type %>' vram='<%= @video_vram %>' heads='1'/>
       </video>
     <%#End Video -%>
   </devices>