From 24cef5fdfde88b831a787172eab54a0fe34cab76 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Tue, 8 Jul 2008 17:44:56 +0000 Subject: [PATCH] Fix three typos pointed out by Anton Protopopov --- ChangeLog | 12 +++ docs/drvqemu.html | 101 ++++++++-------------- docs/drvqemu.html.in | 2 +- docs/formatnetwork.html | 166 +++++++++++-------------------------- docs/formatnetwork.html.in | 4 +- 5 files changed, 100 insertions(+), 185 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3ec0650184..9c2b4c3f47 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Tue Jul 8 18:42:56 BST 2008 Daniel P. Berrange + + * docs/drvqemu.html.in, docs/formatnetwork.html.in: Fix three + typos pointed out by Anton Protopopov + +Tue Jul 8 13:02:56 BST 2008 Daniel P. Berrange + + * docs/libvirt.rng: Updated schema to follow latest XML syntax + supported by drivers. Based off work by John Levon + * tests/qemuxml2argvdata/qemuxml2argv-input-xen.xml: Fix boot + syntax to comply with schema + Mon Jul 7 12:46:56 BST 2008 Daniel P. Berrange * src/openvz_driver.c: Don't cast pointers to ints, and fix diff --git a/docs/drvqemu.html b/docs/drvqemu.html index fa2068d6e9..dcf88b032d 100644 --- a/docs/drvqemu.html +++ b/docs/drvqemu.html @@ -16,137 +16,109 @@

QEMU/KVM hypervisor driver

@@ -156,24 +128,23 @@ line syntax and monitor interaction. This includes KVM, and Xenner.

Deployment pre-requisites

-
    -
  • QEMU emulators: The driver will probe /usr/bin +
    • + QEMU emulators: The driver will probe /usr/bin for the presence of qemu, qemu-system-x86_64, qemu-system-mips,qemu-system-mipsel, qemu-system-sparc,qemu-system-ppc. The results of this can be seen from the capabilities XML output. -
      • -
    • KVM hypervisor: The driver will probe /usr/bin +
    • + KVM hypervisor: The driver will probe /usr/bin for the presence of qemu-kvm and /dev/kvm device node. If both are found, then KVM fullyvirtualized, hardware accelerated guests will be available. -
      • -
    • Xenner hypervisor: The driver will probe /usr/bin +
    • + Xenner hypervisor: The driver will probe /usr/bin for the presence of xenner and /dev/kvm device node. If both are found, then Xen paravirtualized guests can be run using the KVM hardware acceleration. -
      • -
    +

Example domain XML config

@@ -200,7 +171,7 @@ <target dev='hda'/> </disk> <interface type='network'> - <source name='default'/> + <source network='default'/> </interface> <graphics type='vnc' port='-1'/> </devices> diff --git a/docs/drvqemu.html.in b/docs/drvqemu.html.in index fd2bb12669..bb484b7f9d 100644 --- a/docs/drvqemu.html.in +++ b/docs/drvqemu.html.in @@ -58,7 +58,7 @@ <target dev='hda'/> </disk> <interface type='network'> - <source name='default'/> + <source network='default'/> </interface> <graphics type='vnc' port='-1'/> </devices> diff --git a/docs/formatnetwork.html b/docs/formatnetwork.html index 8cfb362958..faebbb90cd 100644 --- a/docs/formatnetwork.html +++ b/docs/formatnetwork.html @@ -16,160 +16,123 @@

Network XML format

-

This page provides an introduction to the network XML format. For background information on the concepts referred to here, consult the network driver architecture @@ -195,25 +158,16 @@ <name>default</name> <uuid>3e3fce45-4f53-4fa7-bb32-11f34168b82b</uuid> ... -

-
- name -
-
The content of the name element provides +
name
The content of the name element provides a short name for the virtual network. This name should consist only of alpha-numeric characters and is required to be unique within the scope of a single host. It is used to form the filename for storing the persistent - configuration file. Since 0.3.0
-
- uuid -
-
The content of the uuid element provides + configuration file. Since 0.3.0
uuid
The content of the uuid element provides a globally unique identifier for the virtual network. The format must be RFC 4122 compliant, eg 3e3fce45-4f53-4fa7-bb32-11f34168b82b. If omitted when defining/creating a new network, a random - UUID is generated. Since 0.3.0
-
+ UUID is generated. Since 0.3.0

Connectivity

@@ -226,11 +180,7 @@ <bridge name="virbr0" /> <forward mode="nat" dev="eth0"/> ... -
-
- bridge -
-
The name attribute on the bridge element +
bridge
The name attribute on the bridge element defines the name of a bridge device which will be used to construct the virtual network. The virtual machines will be connected to this bridge device allowing them to talk to each other. The bridge device @@ -239,11 +189,7 @@ virbr0 is reserved for the "default" virtual network. This element should always be provided when defining a new network. Since 0.3.0 -
-
- forward -
-
Inclusion of the forward element indicates that +
forward
Inclusion of the forward element indicates that the virtual network is to be connected to the physical LAN. If no attributes are set, NAT forwarding will be used for connectivity. Firewall rules will allow forwarding to any other network device whether @@ -253,8 +199,7 @@ then the traffic will not have NAT applied. This presumes that the local LAN router has suitable routing table entries to return traffic to this host. Since 0.3.0; 'mode' attribute since - 0.4.2
-
+ 0.4.2

Addressing

@@ -270,36 +215,23 @@ </dhcp> </ip> </network> -
-
- ip -
-
The address attribute defines an IPv4 address in +
ip
The address attribute defines an IPv4 address in dotted-decimal format, that will be configured on the bridge device associated with the virtual network. To the guests this address will be their default route. The netmask attribute defines the significant bits of the network address, again specified in dotted-decimal format. Since 0.3.0 -
-
- dhcp -
-
Immediately within the ip element there is an +
dhcp
Immediately within the ip element there is an optional dhcp element. The presence of this element enables DHCP services on the virtual network. It will further contain one or more range elements. Since 0.3.0 -
-
- range -
-
The start and end attributes on the +
range
The start and end attributes on the range element specify the boundaries of a pool of IPv4 addresses to be provided to DHCP clients. These two addresses must lie within the scope of the network defined on the parent ip element. Since 0.3.0 -
-
+

Example configuration

@@ -319,7 +251,7 @@ <network> <name>default</name> <bridge name="virbr0" /> - <forward type="nat"/> + <forward mode="nat"/> <ip address="192.168.122.1" netmask="255.255.255.0"> <dhcp> <range start="192.168.122.2" end="192.168.122.254" /> @@ -341,7 +273,7 @@ <network> <name>local</name> <bridge name="virbr1" /> - <forward type="route" dev="eth1"/> + <forward mode="route" dev="eth1"/> <ip address="192.168.122.1" netmask="255.255.255.0"> <dhcp> <range start="192.168.122.2" end="192.168.122.254" /> diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index 9c46a8946a..ca37b05f59 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -146,7 +146,7 @@ <network> <name>default</name> <bridge name="virbr0" /> - <forward type="nat"/> + <forward mode="nat"/> <ip address="192.168.122.1" netmask="255.255.255.0"> <dhcp> <range start="192.168.122.2" end="192.168.122.254" /> @@ -169,7 +169,7 @@ <network> <name>local</name> <bridge name="virbr1" /> - <forward type="route" dev="eth1"/> + <forward mode="route" dev="eth1"/> <ip address="192.168.122.1" netmask="255.255.255.0"> <dhcp> <range start="192.168.122.2" end="192.168.122.254" />