Initial commit of xen 3.1.0, includes some tweeks from bug #179412 and rbu's overlay

svn path=/xen/; revision=31

11 files changed, 34 insertions, 220 deletions

diff --git a/app-emulation/xen-tools/files/digest-xen-tools-3.0.2-r4 b/app-emulation/xen-tools/files/digest-xen-tools-3.0.2-r4
deleted file mode 100644
index 724d092..0000000
--- a/app-emulation/xen-tools/files/digest-xen-tools-3.0.2-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 544eab940a0734a55459d648e5c3b224 xen-3.0.2-src.tgz 4933621
-RMD160 34e4431a981891319f8a5ea0c3f604e7d8d7d7af xen-3.0.2-src.tgz 4933621
-SHA256 f18ffab16a457fa721d11933c75f8288f6958c88c2669857c7c11d5107ba2951 xen-3.0.2-src.tgz 4933621
diff --git a/app-emulation/xen-tools/files/digest-xen-tools-3.1.0 b/app-emulation/xen-tools/files/digest-xen-tools-3.1.0
new file mode 100644
index 0000000..e436de9
--- /dev/null
+++ b/app-emulation/xen-tools/files/digest-xen-tools-3.1.0
@@ -0,0 +1,3 @@
+MD5 b7ae1f652b071862ae4c90b72d549627 xen-3.1.0-src.tgz 6831094
+RMD160 2fd65a3b81e522d0ed2d62fd11e5977167f1ceb3 xen-3.1.0-src.tgz 6831094
+SHA256 b5d7cea6deeee1439e8883fed4b3f1a8e4f675b4af8148178721f99bd76676b7 xen-3.1.0-src.tgz 6831094
diff --git a/app-emulation/xen-tools/files/xen-tools-3.0.2--as-needed.patch b/app-emulation/xen-tools/files/xen-tools-3.0.2--as-needed.patch
deleted file mode 100644
index 362e495..0000000
--- a/app-emulation/xen-tools/files/xen-tools-3.0.2--as-needed.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- xen-3.0.2/tools/xenmon/Makefile	2006-06-01 13:40:40.468687762 +0100
-+++ xen-3.0.2/tools/xenmon/Makefile	2006-06-01 13:41:04.000000000 +0100
-@@ -43,6 +43,6 @@
- 
- 
- %: %.c Makefile
--	$(CC) $(CFLAGS) $(LDFLAGS) -lxenctrl -o $@ $<
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lxenctrl
- 
- 
diff --git a/app-emulation/xen-tools/files/xen-tools-3.0.2-bxclobber.patch b/app-emulation/xen-tools/files/xen-tools-3.0.2-bxclobber.patch
deleted file mode 100644
index 8f0b561..0000000
--- a/app-emulation/xen-tools/files/xen-tools-3.0.2-bxclobber.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-# HG changeset patch
-# User vhanquez@kneesa.uk.xensource.com
-# Date Mon Apr 10 14:51:10 2006 +0000
-# Node ID bdec77028194e6f51872b66b0575ed86ad542333
-# parent: 07af1b34d4c49ac52faaff6cb315231655212316
-fix bug #609 - error: PIC register `bx' clobbered in `asm'
-
-Signed-off-by: Vincent Hanquez <vincent@xensource.com>
-
-
---- a/tools/ioemu/hw/vga.c	Mon Apr 10 14:47:51 2006 +0100
-+++ b/tools/ioemu/hw/vga.c	Mon Apr 10 14:51:10 2006 +0000
-@@ -1369,10 +1369,10 @@ static inline unsigned int cpuid_edx(uns
- {
-     unsigned int eax, edx;
- 
--    __asm__("cpuid"
-+    __asm__("pushl %%ebx; cpuid; popl %%ebx"
-             : "=a" (eax), "=d" (edx)
-             : "0" (op)
--            : "bx", "cx");
-+            : "cx");
- 
-     return edx;
- }
-
diff --git a/app-emulation/xen-tools/files/xen-tools-3.0.2-pushpop.patch b/app-emulation/xen-tools/files/xen-tools-3.0.2-pushpop.patch
deleted file mode 100644
index 807e007..0000000
--- a/app-emulation/xen-tools/files/xen-tools-3.0.2-pushpop.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-# HG changeset patch
-# User kaf24@firebug.cl.cam.ac.uk
-# Date Mon Apr 10 17:25:42 2006 +0100
-# Node ID c89d62e7015a25a48225daa929616a5ed44205b4
-# parent: 4088dd0856a9cbc7ef050d7272e81666b7dfbcc7
-Fix push/pop usage in tools/ioemu for x86/64.
-
-Signed-off-by: Keir Fraser <keir@xensource.com>
-
-
-
---- a/tools/ioemu/hw/vga.c	Mon Apr 10 17:16:25 2006 +0100
-+++ b/tools/ioemu/hw/vga.c	Mon Apr 10 17:25:42 2006 +0100
-@@ -1369,10 +1369,16 @@ static inline unsigned int cpuid_edx(uns
- {
-     unsigned int eax, edx;
- 
--    __asm__("pushl %%ebx; cpuid; popl %%ebx"
-+#ifdef __x86_64__
-+#define __bx "rbx"
-+#else
-+#define __bx "ebx"
-+#endif
-+    __asm__("push %%"__bx"; cpuid; pop %%"__bx
-             : "=a" (eax), "=d" (edx)
-             : "0" (op)
-             : "cx");
-+#undef __ebx
- 
-     return edx;
- }
-
diff --git a/app-emulation/xen-tools/files/xen-tools-3.0.2-test-uuid.patch b/app-emulation/xen-tools/files/xen-tools-3.0.2-test-uuid.patch
deleted file mode 100644
index b4829e4..0000000
--- a/app-emulation/xen-tools/files/xen-tools-3.0.2-test-uuid.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-# Backported from
-# http://lists.xensource.com/archives/html/xen-changelog/2006-04/msg00086.html
-
---- tools/python/xen/xend/tests/test_uuid.py	2006-07-22 12:10:00.000000000 +1000
-+++ tools/python/xen/xend/tests/test_uuid.py	2006-07-22 12:11:01.000000000 +1000
-@@ -21,9 +21,9 @@
-             self.assertEqual(uuid.toString(inp), expected)
-             self.assertEqual(uuid.fromString(expected), inp)
- 
--        t([0 for _ in range(0, 16)], "00000000-00000000-00000000-00000000")
-+        t([0 for _ in range(0, 16)], "00000000-0000-0000-0000-000000000000")
-         t([185, 158, 125, 206, 250, 178, 125, 57, 2, 6, 162, 74, 178, 236,
--           196, 5], "b99e7dce-fab27d39-0206a24a-b2ecc405")
-+           196, 5], "b99e7dce-fab2-7d39-0206-a24ab2ecc405")
- 
- 
- def test_suite():
diff --git a/app-emulation/xen-tools/files/xen-tools-3.0.2-test-xauthority.patch b/app-emulation/xen-tools/files/xen-tools-3.0.2-test-xauthority.patch
deleted file mode 100644
index c462c59..0000000
--- a/app-emulation/xen-tools/files/xen-tools-3.0.2-test-xauthority.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-# Backported from
-# http://lists.xensource.com/archives/html/xen-changelog/2006-04/msg00087.html
-
---- tools/python/xen/xm/create.py	2006-07-22 12:50:35.000000000 +1000
-+++ tools/python/xen/xm/create.py	2006-07-22 12:52:52.000000000 +1000
-@@ -850,6 +850,16 @@
-     opts.info("Started domain %s" % (dom))
-     return int(sxp.child_value(dominfo, 'domid'))
- 
-+def get_xauthority():
-+    xauth = os.getenv("XAUTHORITY")
-+    if not xauth:
-+        home = os.getenv("HOME")
-+        if not home:
-+            import posix, pwd
-+            home = pwd.getpwuid(posix.getuid())[5]
-+        xauth = home + "/.Xauthority"
-+    return xauth
-+
- def parseCommandLine(argv):
-     gopts.reset()
-     args = gopts.parse(argv)
-@@ -864,14 +874,7 @@
-         gopts.vals.display = os.getenv("DISPLAY")
- 
-     if not gopts.vals.xauthority:
--        xauth = os.getenv("XAUTHORITY")
--        if not xauth:
--            home = os.getenv("HOME")
--            if not home:
--                import posix, pwd
--                home = pwd.getpwuid(posix.getuid())[5]
--            xauth = home + "/.Xauthority"
--        gopts.vals.xauthority = xauth
-+        gopts.vals.xauthority = get_xauthority()
- 
-     # Process remaining args as config variables.
-     for arg in args:
---- tools/python/xen/xm/tests/test_create.py	2006-07-22 12:59:13.000000000 +1000
-+++ tools/python/xen/xm/tests/test_create.py	2006-07-22 12:59:13.000000000 +1000
-@@ -51,6 +51,7 @@
-                  'path'      : '.:/etc/xen',
-                  'builder'   : 'linux',
-                  'nics'      : -1,
-+                 'xauthority': xen.xm.create.get_xauthority(),
-                  })
- 
- 
-@@ -99,6 +100,7 @@
-                  'interface'   : 'eth0',
-                  'path'        : '.:/etc/xen',
-                  'builder'     : 'linux',
-+                 'xauthority': xen.xm.create.get_xauthority(),
-                })
- 
- 
-@@ -138,6 +140,7 @@
-                  'path'       : '.:/etc/xen',
-                  'builder'    : 'linux',
-                  'nics'       : -1,
-+                 'xauthority': xen.xm.create.get_xauthority(),
-                  })
-             
- 
-@@ -188,6 +191,7 @@
-                  'dhcp'        : 'off',
-                  'interface'   : 'eth0',
-                  'path'        : '.:/etc/xen',
-+                 'xauthority': xen.xm.create.get_xauthority(),
-                })
- 
- 
diff --git a/app-emulation/xen-tools/files/xen-tools-3.0.2-xc_ptrace.patch b/app-emulation/xen-tools/files/xen-tools-3.0.2-xc_ptrace.patch
deleted file mode 100644
index af51c3d..0000000
--- a/app-emulation/xen-tools/files/xen-tools-3.0.2-xc_ptrace.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- tools/libxc/xc_ptrace.c-orig	2006-10-13 15:53:29.000000000 +1000
-+++ tools/libxc/xc_ptrace.c	2006-10-13 15:54:06.000000000 +1000
-@@ -597,17 +597,13 @@
-             online_vcpus_changed(cpumap);
-         break;
- 
--    case PTRACE_SETFPREGS:
--    case PTRACE_SETFPXREGS:
--    case PTRACE_PEEKUSER:
--    case PTRACE_POKEUSER:
--    case PTRACE_SYSCALL:
--    case PTRACE_KILL:
--        goto out_unspported; /* XXX not yet supported */
--
-     case PTRACE_TRACEME:
-         printf("PTRACE_TRACEME is an invalid request under Xen\n");
-         goto out_error;
-+
-+    default:
-+        goto out_unspported; /* XXX not yet supported */
-+
-     }
- 
-     return retval;
diff --git a/app-emulation/xen-tools/files/xen-tools-3.0.4_p1-remove-monitor-mode-from-vnc.patch b/app-emulation/xen-tools/files/xen-tools-3.0.4_p1-remove-monitor-mode-from-vnc.patch
deleted file mode 100644
index 07e9735..0000000
--- a/app-emulation/xen-tools/files/xen-tools-3.0.4_p1-remove-monitor-mode-from-vnc.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/tools/ioemu/vnc.c b/tools/ioemu/vnc.c
-index 6d7cc31..9e2d535 100644
---- a/tools/ioemu/vnc.c
-+++ b/tools/ioemu/vnc.c
-@@ -962,18 +962,6 @@ static void do_key_event(VncState *vs, int down, uint32_t sym)
- 	case XK_Num_Lock:
- 	    vs->numlock = !vs->numlock;
- 	    break;
--
--	case XK_1 ... XK_9:
--	    if ((vs->ctl_keys & 3) != 3)
--		break;
--
--	    console_select(sym - XK_1);
--	    if (is_graphic_console()) {
--		/* tell the vga console to redisplay itself */
--		vga_hw_invalidate();
--		vnc_dpy_update(vs->ds, 0, 0, vs->ds->width, vs->ds->height);
--	    }
--	    break;
- 	}
-     }
- }
diff --git a/app-emulation/xen-tools/files/xen-tools-3.0.4_p1-vnclisten.patch b/app-emulation/xen-tools/files/xen-tools-3.0.4_p1-vnclisten.patch
deleted file mode 100644
index a22bebe..0000000
--- a/app-emulation/xen-tools/files/xen-tools-3.0.4_p1-vnclisten.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -rpuN xen-3.0.4_1-src.orig/tools/python/xen/xend/XendConfig.py xen-3.0.4_1-src/tools/python/xen/xend/XendConfig.py
---- xen-3.0.4_1-src.orig/tools/python/xen/xend/XendConfig.py	Mon Dec 11 15:06:53 2006 +0000
-+++ xen-3.0.4_1-src/tools/python/xen/xend/XendConfig.py	Tue Jan 30 13:36:15 2007 -0500
-@@ -229,7 +229,8 @@ LEGACY_IMAGE_CFG = [
-     ('sdl', int),
-     ('vncdisplay', int),
-     ('vncunused', int),
--    ('vncpasswd', str),    
-+    ('vncpasswd', str),
-+    ('vnclisten', str),
- ]
-
- LEGACY_IMAGE_HVM_CFG = [
diff --git a/app-emulation/xen-tools/files/xen-tools-3.1.0-python-site-packages.patch b/app-emulation/xen-tools/files/xen-tools-3.1.0-python-site-packages.patch
new file mode 100644
index 0000000..ea5a217
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-tools-3.1.0-python-site-packages.patch
@@ -0,0 +1,31 @@
+With xen-3.1.0 on Pardus 2007, "/usr/sbin/xend start" returns "Cannot find Xen 
+Python modules." cause Xen Python modules installed 
+into "/usr/lib/python2.4/site-packages/"
+
+Following patch adds site-packages into search path
+
+Signed-off-by: S.Çağlar Onur <caglar@pardus.org.tr>
+
+diff -r aee991c7723a tools/misc/xen-python-path
+--- a/tools/misc/xen-python-path	Wed May 09 16:34:47 2007 +0100
++++ b/tools/misc/xen-python-path	Sat May 19 02:24:24 2007 +0300
+@@ -30,12 +30,13 @@ import sys
+ 
+ for p in ['python%s' % sys.version[:3], 'python']:
+     for l in ['/usr/lib64', '/usr/lib']:
+-        d = os.path.join(l, p)
+-        if os.path.exists(os.path.join(d, AUXBIN)):
+-            sys.path.append(d)
+-            import xen.util.auxbin
+-            print os.path.join(xen.util.auxbin.libpath(), p)
+-            sys.exit(0)
++        for k in ['', 'site-packages/']:
++            d = os.path.join(l, p, k)
++            if os.path.exists(os.path.join(d, AUXBIN)):
++                sys.path.append(d)
++                import xen.util.auxbin
++                print os.path.join(xen.util.auxbin.libpath(), p)
++                sys.exit(0)
+ 
+ print >>sys.stderr, "Cannot find Xen Python modules."
+ sys.exit(1)