Changeset 2971 for package_branches

Timestamp:

Jan 31, 2010, 6:35:39 PM (15 years ago)

Author:

gdb

Message:

Merged invirt-xen-config into hvirt branch

Location:

package_branches/invirt-xen-config/hvirt

Files:

• . (modified) (1 prop)
• debian/changelog (modified) (2 diffs)
• debian/invirt-xen-config.init (modified) (1 diff)
• vif-invirtroute (modified) (5 diffs)

package_branches/invirt-xen-config/hvirt/debian/changelog

@@ +1 @@
+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
 
@@ -13 +31 @@
   * Don't try to start sysvms in the invirt-xen-config init script. The
     code has never been reliable.
-
- -- Evan Broder <broder@mit.edu>  Fri, 01 Jan 2010 17:58:57 -0600
-
+  * 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.
+
+  [ 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
 

package_branches/invirt-xen-config/hvirt/debian/invirt-xen-config.init

@@ -35 +35 @@
 do_start() {
     do_startup "start"
+    xm sched-credit -d 0 -w 512
 }
 

package_branches/invirt-xen-config/hvirt/vif-invirtroute

@@ -1 +1 @@
 #!/bin/bash
-
-
-
-
 
 #============================================================================
@@ -23 +19 @@
 # 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
@@ -49 +44 @@
     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'
@@ -57 +49 @@
 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
@@ -66 +56 @@
         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."