[DRE-commits] [vagrant-libvirt] 126/163: Merge pull request #319 from ldx/os-type-attrs

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to annotated tag 0.0.26
in repository vagrant-libvirt.

commit 47950170bb029bc02be695b22869710ee3ce247e
Merge: c881f98 94fb320
Author: Dmitry Vasilets <pronix.service at gmail.com>
Date:   Thu Mar 26 08:15:26 2015 +0100

    Merge pull request #319 from ldx/os-type-attrs
    
    Add 'machine_type' parameter.

 README.md                                    | 1 +
 lib/vagrant-libvirt/action/create_domain.rb  | 1 +
 lib/vagrant-libvirt/config.rb                | 3 +++
 lib/vagrant-libvirt/templates/domain.xml.erb | 4 ++++
 4 files changed, 9 insertions(+)

diff --cc README.md
index 385be25,2f2dcbd..a26b4c8
--- a/README.md
+++ b/README.md
@@@ -156,8 -156,8 +156,9 @@@ en
  * `graphics_ip` - Sets the IP for the display protocol to bind to.  Defaults to "127.0.0.0.1".
  * `graphics_passwd` - Sets the password for the display protocol. Working for vnc and spice. by default working without passsword.
  * `video_type` - Sets the graphics card type exposed to the guest.  Defaults to "cirrus".  [Possible values](http://libvirt.org/formatdomain.html#elementsVideo) are "vga", "cirrus", "vmvga", "xen", "vbox", or "qxl".
 +* `keymap` - Set keymap for vm. default: en-us
  * `video_vram` - Used by some graphics card types to vary the amount of RAM dedicated to video.  Defaults to 9216.
+ * `machine` - Sets machine type. Equivalent to qemu `-machine`. Use `qemu-system-x86_64 -machine help` to get a list of supported machines.
  
  
  Specific domain settings can be set for each domain separately in multi-VM

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/vagrant-libvirt.git