Merged invirt-xen-config into hvirt branch

svn path=/package_branches/invirt-xen-config/hvirt/; revision=2971

diff --git a/debian/changelog b/debian/changelog
index f655f5b..809c1b6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+invirt-xen-config (0.0.27hvirt4) unstable; urgency=low
+
+  * Changed another xen.network -> xen
+
+ -- Greg Brockman <gdb@mit.edu>  Sun, 31 Jan 2010 18:32:59 -0500
+
+invirt-xen-config (0.0.27hvirt3) unstable; urgency=low
+
+  * Merged further updates to pkg version 0.0.27 into hvirt branch
+
+ -- Greg Brockman <gdb@mit.edu>  Fri, 01 Jan 2010 18:38:50 -0500
+
+invirt-xen-config (0.0.27hvirt2) unstable; urgency=low
+
+  * Merged updates to pkg version 0.0.27 into hvirt branch
+
+ -- Greg Brockman <gdb@mit.edu>  Fri, 01 Jan 2010 18:38:50 -0500
+
 invirt-xen-config (0.0.27hvirt1) unstable; urgency=low
 
   * Merged pkg version 0.0.27 into hvirt branch
@@ -12,9 +30,15 @@ invirt-xen-config (0.0.27) unstable; urgency=low
   [ Evan Broder ]
   * Don't try to start sysvms in the invirt-xen-config init script. The
     code has never been reliable.
+  * Don't create iptables rules in vif-invirtroute - they don't do anything.
+  * For simplicity, and because we've never used it, tear the IPv6
+    "support" out of vif-invirtroute.
 
- -- Evan Broder <broder@mit.edu>  Fri, 01 Jan 2010 17:58:57 -0600
+  [ Quentin Smith ]
+  * Increase dom0's weight to improve IO performance.
 
+ -- Evan Broder <broder@mit.edu>  Sun, 03 Jan 2010 14:37:34 -0600
+ 
 invirt-xen-config (0.0.26hvirt1) unstable; urgency=low
 
   * Make the internal IP into a parameter

diff --git a/debian/invirt-xen-config.init b/debian/invirt-xen-config.init
index 8b3b226..83569e8 100755 (executable)
--- a/debian/invirt-xen-config.init
+++ b/debian/invirt-xen-config.init
@@ -34,6 +34,7 @@ do_startup() {
 
 do_start() {
     do_startup "start"
+    xm sched-credit -d 0 -w 512
 }
 
 do_reload() {

diff --git a/vif-invirtroute b/vif-invirtroute
index 2b3a88d..c76a95e 100755 (executable)
--- a/vif-invirtroute
+++ b/vif-invirtroute
@@ -1,9 +1,5 @@
 #!/bin/bash
 
-
-
-
-
 #============================================================================
 # /etc/xen/vif-route
 #
@@ -22,8 +18,7 @@
 # Read from the store:
 # ip      list of IP networks for the vif, space-separated (default given in
 #         this script).
-# V6PREFIX  prefix of v6 address to use
-# Note that the v6 support is kind of broken because there's not really a way to populate the v6 prefix
+#
 # This script will set up proxy arp  for any ip addresses that are being routed
 # type read to determine if the device is ioemu
 
@@ -48,16 +43,11 @@ case "$command" in
         ;;
     offline)
         do_without_error ifdown ${vif}
-       if [ -f /var/run/radvd/radvd.pid.${vif} ] ; then
-           do_without_error kill `cat /var/run/radvd/radvd.pid.${vif}`
-           fi
         ipcmd='del'
         cmdprefix='do_without_error'
         ;;
 esac
 
-v6prefix=${v6prefix:-}
-v6prefix=$(xenstore_read_default "$XENBUS_PATH/v6prefix" "$v6prefix")
 vif_type=$(xenstore_read_default "$XENBUS_PATH/type" "viffront")
 if [  ${vif_type} != "ioemu"  -o  x${qemu_online} = xyes ] ; then
     if [ "${ip}" ] ; then
@@ -65,24 +55,13 @@ if [  ${vif_type} != "ioemu"  -o  x${qemu_online} = xyes ] ; then
     # the guest using those addresses.
        for addr in ${ip} ; do
            ${cmdprefix} ip route ${ipcmd} ${addr} dev ${dev} src ${main_ip}
-           arpspoof -i $(invirt-getconf xen.network.iface) -t 18.181.0.1 ${addr}&
+           arpspoof -i $(invirt-getconf xen.iface) -t 18.181.0.1 ${addr}&
            sleep 5
            kill %arpspoof
        done 
     fi
-
-    if [ x${v6prefix} != x ] ; then
-       sed -e "s/@interface@/${dev}/" -e "s+@prefix@+${v6prefix}+" /etc/xen/radvd.conf.template >/var/run/radvd.conf.${vif}
-       ${cmdprefix} ip -6 addr  ${ipcmd}  fe80::/64 scope link  dev ${dev} 
-       if [ $1 = online ] ; then
-           radvd  -u radvd -C /var/run/radvd.conf.${vif} -p /var/run/radvd/radvd.pid.${vif}
-       fi
-       ${cmdprefix} ip -6 route ${ipcmd} ${v6prefix} dev ${dev} 
-    fi
 fi
 
-handle_iptable
-
 log debug "Successful vif-route $command for $vif."
 if [ "$command" == "online" ]
 then