direct-io.hg
changeset 7728:a8b759a40372
Merged.
author | emellor@leeni.uk.xensource.com |
---|---|
date | Thu Nov 10 12:00:39 2005 +0100 (2005-11-10) |
parents | 139aabe357a4 06d08564b982 |
children | bdb8c00ddb85 |
files |
line diff
1.1 --- a/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/x8664_ksyms.c Thu Nov 10 12:00:09 2005 +0100 1.2 +++ b/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/x8664_ksyms.c Thu Nov 10 12:00:39 2005 +0100 1.3 @@ -128,8 +128,10 @@ EXPORT_SYMBOL(get_wchan); 1.4 1.5 EXPORT_SYMBOL(rtc_lock); 1.6 1.7 -/* EXPORT_SYMBOL_GPL(set_nmi_callback); 1.8 - EXPORT_SYMBOL_GPL(unset_nmi_callback); */ 1.9 +#ifdef CONFIG_X86_LOCAL_APIC 1.10 +EXPORT_SYMBOL_GPL(set_nmi_callback); 1.11 +EXPORT_SYMBOL_GPL(unset_nmi_callback); 1.12 +#endif 1.13 1.14 /* Export string functions. We normally rely on gcc builtin for most of these, 1.15 but gcc sometimes decides not to inline them. */
2.1 --- a/tools/examples/network-bridge Thu Nov 10 12:00:09 2005 +0100 2.2 +++ b/tools/examples/network-bridge Thu Nov 10 12:00:39 2005 +0100 2.3 @@ -16,7 +16,7 @@ 2.4 # 2.5 # Usage: 2.6 # 2.7 -# network (start|stop|status) {VAR=VAL}* 2.8 +# network-bridge (start|stop|status) {VAR=VAL}* 2.9 # 2.10 # Vars: 2.11 # 2.12 @@ -27,18 +27,27 @@ 2.13 # netdev The interface to add to the bridge (default eth${vifnum}). 2.14 # antispoof Whether to use iptables to prevent spoofing (default no). 2.15 # 2.16 +# Internal Vars: 2.17 +# pdev="p${netdev}" 2.18 +# vdev="veth${vifnum}" 2.19 +# vif0="vif0.${vifnum}" 2.20 +# 2.21 # start: 2.22 -# Creates the bridge and enslaves netdev to it. 2.23 -# Copies the IP addresses from netdev to the bridge. 2.24 -# Deletes the routes to netdev and adds them on bridge. 2.25 +# Creates the bridge 2.26 +# Copies the IP and MAC addresses from netdev to vdev 2.27 +# Renames netdev to be pdev 2.28 +# Renames vdev to be netdev 2.29 +# Enslaves pdev, vdev to bridge 2.30 # 2.31 # stop: 2.32 -# Removes netdev from the bridge. 2.33 -# Deletes the routes to bridge and adds them to netdev. 2.34 +# Removes netdev from the bridge 2.35 +# Transfers addresses, routes from netdev to pdev 2.36 +# Renames netdev to vdev 2.37 +# Renames pdev to netdev 2.38 +# Deletes bridge 2.39 # 2.40 # status: 2.41 -# Print ifconfig for netdev and bridge. 2.42 -# Print routes. 2.43 +# Print addresses, interfaces, routes 2.44 # 2.45 #============================================================================ 2.46 2.47 @@ -97,7 +106,7 @@ s/inet/ip addr add/ 2.48 s@\([0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+/[0-9]\+\)@\1@ 2.49 s/${src}/dev ${dst}/ 2.50 " | sh -e 2.51 - # Remove automatic routes on destionation device 2.52 + # Remove automatic routes on destination device 2.53 ip route list | sed -ne " 2.54 /dev ${dst}\( \|$\)/ { 2.55 s/^/ip route del / 2.56 @@ -105,17 +114,6 @@ s/${src}/dev ${dst}/ 2.57 }" | sh -e 2.58 } 2.59 2.60 -# Usage: del_addrs src 2.61 -del_addrs () { 2.62 - local src=$1 2.63 - ip addr show dev ${src} | egrep '^ *inet ' | sed -e " 2.64 -s/inet/ip addr del/ 2.65 -s@\([0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+\)/[0-9]\+@\1@ 2.66 -s/${src}/dev ${src}/ 2.67 -" | sh -e 2.68 - ip link set dev ${dst} up 2.69 -} 2.70 - 2.71 # Usage: transfer_routes src dst 2.72 # Get all IP routes to device $src, delete them, and 2.73 # add the same routes to device $dst.
3.1 --- a/tools/pygrub/setup.py Thu Nov 10 12:00:09 2005 +0100 3.2 +++ b/tools/pygrub/setup.py Thu Nov 10 12:00:39 2005 +0100 3.3 @@ -34,6 +34,8 @@ if os.path.exists("/usr/include/reiserfs 3.4 fsys_mods.append(reiser) 3.5 fsys_pkgs.append("grub.fsys.reiser") 3.6 3.7 +pkgs = ['grub', 'grub.fsys'] 3.8 +pkgs.extend(fsys_pkgs) 3.9 setup(name='pygrub', 3.10 version='0.3', 3.11 description='Boot loader that looks a lot like grub for Xen', 3.12 @@ -42,8 +44,7 @@ setup(name='pygrub', 3.13 license='GPL', 3.14 package_dir={'grub': 'src'}, 3.15 scripts = ["src/pygrub"], 3.16 - packages=['grub', 3.17 - 'grub.fsys'].extend(fsys_pkgs), 3.18 + packages=pkgs, 3.19 ext_modules = fsys_mods 3.20 ) 3.21