# HG changeset patch
# User emellor@xxxxxxxxxxxxxxxxxxxxxx
# Node ID a8b759a40372c347241dcf9bf4e915c737760349
# Parent 139aabe357a4a039f10739e5a1370d5598a6d1c9
# Parent 06d08564b982812ceab787bc56104aae07fbad3a
Merged.
diff -r 139aabe357a4 -r a8b759a40372
linux-2.6-xen-sparse/arch/xen/x86_64/kernel/x8664_ksyms.c
--- a/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/x8664_ksyms.c Thu Nov 10
11:00:09 2005
+++ b/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/x8664_ksyms.c Thu Nov 10
11:00:39 2005
@@ -128,8 +128,10 @@
EXPORT_SYMBOL(rtc_lock);
-/* EXPORT_SYMBOL_GPL(set_nmi_callback);
- EXPORT_SYMBOL_GPL(unset_nmi_callback); */
+#ifdef CONFIG_X86_LOCAL_APIC
+EXPORT_SYMBOL_GPL(set_nmi_callback);
+EXPORT_SYMBOL_GPL(unset_nmi_callback);
+#endif
/* Export string functions. We normally rely on gcc builtin for most of these,
but gcc sometimes decides not to inline them. */
diff -r 139aabe357a4 -r a8b759a40372 tools/examples/network-bridge
--- a/tools/examples/network-bridge Thu Nov 10 11:00:09 2005
+++ b/tools/examples/network-bridge Thu Nov 10 11:00:39 2005
@@ -16,7 +16,7 @@
#
# Usage:
#
-# network (start|stop|status) {VAR=VAL}*
+# network-bridge (start|stop|status) {VAR=VAL}*
#
# Vars:
#
@@ -27,18 +27,27 @@
# netdev The interface to add to the bridge (default eth${vifnum}).
# antispoof Whether to use iptables to prevent spoofing (default no).
#
+# Internal Vars:
+# pdev="p${netdev}"
+# vdev="veth${vifnum}"
+# vif0="vif0.${vifnum}"
+#
# start:
-# Creates the bridge and enslaves netdev to it.
-# Copies the IP addresses from netdev to the bridge.
-# Deletes the routes to netdev and adds them on bridge.
+# Creates the bridge
+# Copies the IP and MAC addresses from netdev to vdev
+# Renames netdev to be pdev
+# Renames vdev to be netdev
+# Enslaves pdev, vdev to bridge
#
# stop:
-# Removes netdev from the bridge.
-# Deletes the routes to bridge and adds them to netdev.
+# Removes netdev from the bridge
+# Transfers addresses, routes from netdev to pdev
+# Renames netdev to vdev
+# Renames pdev to netdev
+# Deletes bridge
#
# status:
-# Print ifconfig for netdev and bridge.
-# Print routes.
+# Print addresses, interfaces, routes
#
#============================================================================
@@ -97,23 +106,12 @@
s@\([0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+/[0-9]\+\)@\1@
s/${src}/dev ${dst}/
" | sh -e
- # Remove automatic routes on destionation device
+ # Remove automatic routes on destination device
ip route list | sed -ne "
/dev ${dst}\( \|$\)/ {
s/^/ip route del /
p
}" | sh -e
-}
-
-# Usage: del_addrs src
-del_addrs () {
- local src=$1
- ip addr show dev ${src} | egrep '^ *inet ' | sed -e "
-s/inet/ip addr del/
-s@\([0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+\)/[0-9]\+@\1@
-s/${src}/dev ${src}/
-" | sh -e
- ip link set dev ${dst} up
}
# Usage: transfer_routes src dst
diff -r 139aabe357a4 -r a8b759a40372 tools/pygrub/setup.py
--- a/tools/pygrub/setup.py Thu Nov 10 11:00:09 2005
+++ b/tools/pygrub/setup.py Thu Nov 10 11:00:39 2005
@@ -34,6 +34,8 @@
fsys_mods.append(reiser)
fsys_pkgs.append("grub.fsys.reiser")
+pkgs = ['grub', 'grub.fsys']
+pkgs.extend(fsys_pkgs)
setup(name='pygrub',
version='0.3',
description='Boot loader that looks a lot like grub for Xen',
@@ -42,8 +44,7 @@
license='GPL',
package_dir={'grub': 'src'},
scripts = ["src/pygrub"],
- packages=['grub',
- 'grub.fsys'].extend(fsys_pkgs),
+ packages=pkgs,
ext_modules = fsys_mods
)
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home