[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Libvir] [PATCH 5/5] docs: Document nic model options for qemu



Signed-off-by: Jim Paris <jim jtan com>
---
 docs/format.html |    9 +++++++--
 docs/libvir.html |   13 +++++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/docs/format.html b/docs/format.html
index 5553d10..d73adb1 100644
--- a/docs/format.html
+++ b/docs/format.html
@@ -219,8 +219,13 @@ XML description is quite similar, here is a simple example:</p><pre>&lt;domain <
   <li>networking interface definitions definitions are somewhat different due
     to a different model from Xen see below</li>
 </ul><p>except those points the options should be quite similar to Xen HVM
-ones.</p><h3><a name="Net1" id="Net1">Networking options for QEmu and KVM (added in 0.2.0)</a></h3><p>The networking support in the QEmu and KVM case is more flexible, and
-support a variety of options:</p><ol><li>Userspace SLIRP stack
+ones.</p><h3><a name="Net1" id="Net1">Networking options for QEmu and KVM (added in 0.2.0)</a></h3><p>The networking support in the QEmu and KVM case is more flexible.
+Common options control how the interface is presented to the VM.  For example:</p><pre>
+&lt;interface type='user'&gt;
+  <span style="color: #0000E5; background-color: #FFFFFF">&lt;mac address="11:22:33:44:55:66"/&gt;</span>
+  <span style="color: #0000E5; background-color: #FFFFFF">&lt;nic model="rtl8139"/&gt;</span>
+&lt;/interface&gt;</pre><p>Supported models for <code>nic model</code> (added in ?.?.?) depend
+on the architecture and can be found in the QEmu documentation.</p><p>On the host side, the network interface can be connected in a number of ways:</p><ol><li>Userspace SLIRP stack
     <p>Provides a virtual LAN with NAT to the outside world. The virtual
     network has DHCP &amp; DNS services and will give the guest VM addresses
     starting from <code>10.0.2.15</code>. The default router will be
diff --git a/docs/libvir.html b/docs/libvir.html
index 7eb8a5b..7113b4a 100644
--- a/docs/libvir.html
+++ b/docs/libvir.html
@@ -951,8 +951,17 @@ ones.</p>
 
 <h3><a name="Net1">Networking options for QEmu and KVM (added in 0.2.0)</a></h3>
 
-<p>The networking support in the QEmu and KVM case is more flexible, and
-support a variety of options:</p>
+<p>The networking support in the QEmu and KVM case is more flexible.
+Common options control how the interface is presented to the VM.  For example:</p>
+    <pre>
+&lt;interface type='user'&gt;
+  <span style="color: #0000E5; background-color: #FFFFFF">&lt;mac address="11:22:33:44:55:66"/&gt;</span>
+  <span style="color: #0000E5; background-color: #FFFFFF">&lt;nic model="rtl8139"/&gt;</span>
+&lt;/interface&gt;</pre>
+<p>Supported models for <code>nic model</code> (added in ?.?.?) depend
+on the architecture and can be found in the QEmu documentation.</p>
+
+<p>On the host side, the network interface can be connected in a number of ways:</p>
 <ol>
   <li>Userspace SLIRP stack
     <p>Provides a virtual LAN with NAT to the outside world. The virtual
-- 
1.5.3.4


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]