From 02d2adf455e43fcec9c341380f5b4037c057d71b Mon Sep 17 00:00:00 2001
From: Alexander Schreiber <als@google.com>
Date: Fri, 29 Aug 2008 16:57:54 +0000
Subject: [PATCH] Merge r1534 from branches/ganeti/ganeti-1.2

Add HVM device type flag 4/4

Reviewed-by: ultrotter
---
 man/gnt-instance.sgml |   41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/man/gnt-instance.sgml b/man/gnt-instance.sgml
index a9dbd14..8e904be 100644
--- a/man/gnt-instance.sgml
+++ b/man/gnt-instance.sgml
@@ -83,6 +83,13 @@
             <replaceable>cdrom-image-path</replaceable></arg>
           <sbr>
 
+          <arg>--hvm-nic-type <replaceable>NICTYPE</replaceable></arg>
+          <sbr>
+
+          <arg>--hvm-disk-type
+          <replaceale>DISKTYPE</replaceable></arg>
+          <sbr>
+
           <arg>--vnc-bind-address
             <replaceable>vnc-bind-address</replaceable></arg>
           <sbr>
@@ -254,6 +261,22 @@
         </para>
 
         <para>
+          The <option>--hvm-nic-type</option> specifies the NIC type
+          Xen should use for this HVM instance. Valid choices are
+          rtl8139, ne2k_pci, ne2k_isa and paravirtual with rtl8139
+          as the default. The paravirtual setting is intended for use
+          with the GPL PV drivers inside HVM Windows instances.
+        </para>
+
+        <para>
+          The <option>--hvm-disk-type</option> specifies the disk type
+          Xen should use for the HVM instance. Valid choices are ioemu
+          and paravirtual with ioemu as the default. The paravirtual
+          setting is intended for use with the GPL PV drivers inside
+          HVM Windows instances.
+        </para>
+
+        <para>
           The <option>--vnc-bind-address</option> option specifies the
           address that the VNC listener for this instance should bind
           to. Valid values are IPv4 addresses. Use the address 0.0.0.0
@@ -655,6 +678,8 @@
           <arg>--hvm-pae <replaceable>PAE-support</replaceable></arg>
           <arg>--hvm-cdrom-image-path
             <replaceable>cdrom-image-path</replaceable></arg>
+          <arg>--hvm-nic-type <replaceable>NICTYPE</replaceable></arg>
+          <arg>--hvm-disk-type <replaceable>DISKTYPE</replaceable></arg>
           <arg>--vnc-bind-address
             <replaceable>vnc-bind-address</replaceable></arg>
 
@@ -716,6 +741,22 @@
         </para>
 
         <para>
+          The <option>--hvm-nic-type</option> specifies the NIC type
+          Xen should use for this HVM instance. Valid choices are
+          rtl8139, ne2k_pci, ne2k_isa and paravirtual with rtl8139
+          as the default. The paravirtual setting is intended for use
+          with the GPL PV drivers inside HVM Windows instances.
+        </para>
+
+        <para>
+          The <option>--hvm-disk-type</option> specifies the disk type
+          Xen should use for the HVM instance. Valid choices are ioemu
+          and paravirtual with ioemu as the default. The paravirtual
+          setting is intended for use with the GPL PV drivers inside
+          HVM Windows instances.
+        </para>
+
+        <para>
           The <option>--vnc-bind-address</option> specifies the
           address that the VNC listener for this instance should bind
           to. Valid values are IPv4 addresses. Use the address 0.0.0.0
-- 
1.7.10.4