From 64a709e7bed339093c05cd710af4247d44673cd0 Mon Sep 17 00:00:00 2001 From: Hiroyuki Sato Date: Fri, 12 Sep 2014 23:12:30 +0900 Subject: [PATCH 1/2] Update document about qemu builder for [GH-1407]. https://github.com/mitchellh/packer/pull/1407 --- website/source/docs/builders/qemu.html.markdown | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/website/source/docs/builders/qemu.html.markdown b/website/source/docs/builders/qemu.html.markdown index f7f4314f2..732b0582c 100644 --- a/website/source/docs/builders/qemu.html.markdown +++ b/website/source/docs/builders/qemu.html.markdown @@ -155,6 +155,12 @@ each category, the available options are alphabetized and described. must point to the same file (same checksum). By default this is empty and `iso_url` is used. Only one of `iso_url` or `iso_urls` can be specified. +* `machine_type` (string) - Select the emulated machine by name. + Use "qemu-system-x86_64 -machine help"(Ubuntu), + "/usr/libexec/qemu-kvm -machine help"(RHEL7) to list available machines. + The Qemu default uses "pc-1.0" by default. If you use packer on RHEL7, + specify this value to "pc". + * `net_device` (string) - The driver to use for the network interface. Allowed values "ne2k_pci," "i82551," "i82557b," "i82559er," "rtl8139," "e1000," "pcnet" or "virtio." The Qemu builder uses "virtio" by default. From c650f6f6af0f0c443069c8177ca5dfb7ff079dad Mon Sep 17 00:00:00 2001 From: Hiroyuki Sato Date: Fri, 12 Sep 2014 23:28:10 +0900 Subject: [PATCH 2/2] Fix typo --- website/source/docs/builders/qemu.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/source/docs/builders/qemu.html.markdown b/website/source/docs/builders/qemu.html.markdown index 732b0582c..bb5a1b9fb 100644 --- a/website/source/docs/builders/qemu.html.markdown +++ b/website/source/docs/builders/qemu.html.markdown @@ -158,7 +158,7 @@ each category, the available options are alphabetized and described. * `machine_type` (string) - Select the emulated machine by name. Use "qemu-system-x86_64 -machine help"(Ubuntu), "/usr/libexec/qemu-kvm -machine help"(RHEL7) to list available machines. - The Qemu default uses "pc-1.0" by default. If you use packer on RHEL7, + The Qemu builder uses "pc-1.0" by default. If you use packer on RHEL7, specify this value to "pc". * `net_device` (string) - The driver to use for the network interface. Allowed