diff options
| author | awilliam@xenbuild.aw <awilliam@xenbuild.aw> | 2006-08-23 11:11:27 -0600 |
|---|---|---|
| committer | awilliam@xenbuild.aw <awilliam@xenbuild.aw> | 2006-08-23 11:11:27 -0600 |
| commit | 9f557e7ff279a5ef17ac303ff110ef8cad3869fe (patch) | |
| tree | ef7a135b52552141af609a49f9c0b055f7c32560 /tools/examples | |
| parent | 4ff30e11b25d8e526a2b79382e778b671c6f33cc (diff) | |
| parent | 829f87e0184620bc5f6e3d2ebdcb7c7dd3517e2b (diff) | |
| download | xen-9f557e7ff279a5ef17ac303ff110ef8cad3869fe.tar.gz xen-9f557e7ff279a5ef17ac303ff110ef8cad3869fe.tar.bz2 xen-9f557e7ff279a5ef17ac303ff110ef8cad3869fe.zip | |
merge with xen-unstable.hg
Diffstat (limited to 'tools/examples')
| -rw-r--r-- | tools/examples/xen-network-common.sh | 1 | ||||
| -rw-r--r-- | tools/examples/xend-config.sxp | 2 | ||||
| -rw-r--r-- | tools/examples/xmexample.hvm | 8 | ||||
| -rw-r--r-- | tools/examples/xmexample.vti | 4 |
4 files changed, 12 insertions, 3 deletions
diff --git a/tools/examples/xen-network-common.sh b/tools/examples/xen-network-common.sh index 37bdd77586..4c230a6402 100644 --- a/tools/examples/xen-network-common.sh +++ b/tools/examples/xen-network-common.sh @@ -143,6 +143,7 @@ add_to_bridge () { # Don't add $dev to $bridge if it's already on a bridge. if [ -e "/sys/class/net/${bridge}/brif/${dev}" ]; then + ip link set ${dev} up || true return fi brctl addif ${bridge} ${dev} diff --git a/tools/examples/xend-config.sxp b/tools/examples/xend-config.sxp index b11a80fc1b..9d1be3fb56 100644 --- a/tools/examples/xend-config.sxp +++ b/tools/examples/xend-config.sxp @@ -54,7 +54,7 @@ # (xend-relocation-hosts-allow '^localhost$ ^.*\.example\.org$') # #(xend-relocation-hosts-allow '') -(xend-relocation-hosts-allow '^localhost$ ^localhost\.localdomain$') +(xend-relocation-hosts-allow '^localhost$ ^localhost\\.localdomain$') # The limit (in kilobytes) on the size of the console buffer #(console-limit 1024) diff --git a/tools/examples/xmexample.hvm b/tools/examples/xmexample.hvm index 396274c860..731500225f 100644 --- a/tools/examples/xmexample.hvm +++ b/tools/examples/xmexample.hvm @@ -27,6 +27,10 @@ builder='hvm' # and modules. Allocating less than 32MBs is not recommended. memory = 128 +# Shadow pagetable memory for the domain, in MB. +# Should be at least 2KB per MB of domain memory, plus a few MB per vcpu. +shadow_memory = 8 + # A name for your domain. All domains must have different names. name = "ExampleHVMDomain" @@ -112,7 +116,9 @@ device_model = '/usr/' + arch_libdir + '/xen/bin/qemu-dm' #----------------------------------------------------------------------------- # boot on floppy (a), hard disk (c) or CD-ROM (d) -#boot=[a|c|d] +# default: hard disk, cd-rom, floppy +#boot="cda" + #----------------------------------------------------------------------------- # write to temporary files instead of disk image files #snapshot=1 diff --git a/tools/examples/xmexample.vti b/tools/examples/xmexample.vti index 77f55ae23e..3a0d8e1a3a 100644 --- a/tools/examples/xmexample.vti +++ b/tools/examples/xmexample.vti @@ -66,7 +66,9 @@ device_model = '/usr/' + arch_libdir + '/xen/bin/qemu-dm' #----------------------------------------------------------------------------- # boot on floppy (a), hard disk (c) or CD-ROM (d) -#boot=[a|c|d] +# default: hard disk, cd-rom, floppy +#boot="cda" + #----------------------------------------------------------------------------- # write to temporary files instead of disk image files #snapshot=1 |