Commit 02d2adf4 authored by Alexander Schreiber's avatar Alexander Schreiber
Browse files

Merge r1534 from branches/ganeti/ganeti-1.2

Add HVM device type flag 4/4

Reviewed-by: ultrotter
parent ad2023a3
......@@ -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>
......@@ -253,6 +260,22 @@
None, disabling virtual CDROM support.
</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
......@@ -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>
......@@ -715,6 +740,22 @@
virtual CDROM support for this instance.
</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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment