[packages/xen] Starting update to 4.2.0
jajcus
jajcus at pld-linux.org
Mon Oct 22 16:07:09 CEST 2012
commit bf4f47e8626133528c3301cad53cffe474caf7df
Author: Jacek Konieczny <j.konieczny at eggsoft.pl>
Date: Mon Oct 22 16:06:06 2012 +0200
Starting update to 4.2.0
not finished yet
pygrubfix.patch | 13 +-
pygrubfix2.patch | 92 -----
...-3cf61880403b4e484539596a95937cc066243388.patch | 43 --
xen-4.1-testing.23190.patch | 64 ---
xen-curses.patch | 56 ++-
xen-net-disable-iptables-on-bridge.patch | 18 +-
xen-python_scripts.patch | 446 ++-------------------
xen-quemu-softloat-c99.patch | 57 +++
xen.spec | 58 +--
xend.empty.xml.patch | 15 -
10 files changed, 177 insertions(+), 685 deletions(-)
---
diff --git a/xen.spec b/xen.spec
index fb2b73f..e7c92ea 100644
--- a/xen.spec
+++ b/xen.spec
@@ -12,12 +12,12 @@
Summary: Xen - a virtual machine monitor
Summary(pl.UTF-8): Xen - monitor maszyny wirtualnej
Name: xen
-Version: 4.1.2
-Release: 4
+Version: 4.2.0
+Release: 0.1
License: GPL v2, interface parts on BSD-like
Group: Applications/System
Source0: http://bits.xensource.com/oss-xen/release/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 73561faf3c1b5e36ec5c089b5db848ad
+# Source0-md5: f4f217969afc38f09251039966d91a87
# used by stubdoms
Source10: %{xen_extfiles_url}/lwip-1.3.0.tar.gz
# Source10-md5: 36cc57650cffda9a0269493be2a169bb
@@ -29,8 +29,8 @@ Source13: %{xen_extfiles_url}/pciutils-2.2.9.tar.bz2
# Source13-md5: cec05e7785497c5e19da2f114b934ffd
Source14: %{xen_extfiles_url}/grub-0.97.tar.gz
# Source14-md5: cd3f3eb54446be6003156158d51f4884
-Source15: %{xen_extfiles_url}/ipxe-git-v1.0.0.tar.gz
-# Source15-md5: fb7df96781d337899066d82059346885
+Source15: http://xenbits.xen.org/xen-extfiles/ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz
+# Source15-md5: 7496268cebf47d5c9ccb0696e3b26065
Source30: proc-xen.mount
Source31: var-lib-xenstored.mount
Source32: blktapctrl.service
@@ -56,19 +56,19 @@ Patch1: %{name}-symbols.patch
Patch2: %{name}-curses.patch
Patch3: %{name}-xz.patch
Patch4: pygrubfix.patch
-Patch5: pygrubfix2.patch
-Patch6: qemu-xen-4.1-testing.git-3cf61880403b4e484539596a95937cc066243388.patch
-Patch7: xen-4.1-testing.23190.patch
+#Patch5: pygrubfix2.patch
+#Patch6: qemu-xen-4.1-testing.git-3cf61880403b4e484539596a95937cc066243388.patch
+#Patch7: xen-4.1-testing.23190.patch
Patch8: xend.catchbt.patch
-Patch9: xend.empty.xml.patch
+#Patch9: xend.empty.xml.patch
Patch10: xend-pci-loop.patch
Patch11: xen-dumpdir.patch
+# Warning: this disables ingress filtering implemented in xen scripts!
Patch12: xen-net-disable-iptables-on-bridge.patch
Patch13: xen-configure-xend.patch
Patch14: xen-initscript.patch
Patch15: xen-no_Werror.patch
-# stubdom patch
-Patch100: grub-ext4-support.patch
+Patch16: xen-quemu-softloat-c99.patch
URL: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
BuildRequires: OpenGL-devel
BuildRequires: SDL-devel
@@ -102,6 +102,7 @@ BuildRequires: transfig
BuildRequires: which
BuildRequires: xorg-lib-libX11-devel
BuildRequires: xorg-lib-libXext-devel
+BuildRequires: yajl-devel
BuildRequires: zlib-devel
Requires(post,preun): /sbin/chkconfig
Requires(post,preun,postun): systemd-units >= 38
@@ -300,33 +301,37 @@ Ten pakiet zapewnia bashowe dopełnianie poleceń dla Xena (xl).
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+#%patch1 -p1
+#%patch2 -p1
+#%patch3 -p1
%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
+#%patch5 -p1
+#%patch6 -p1
+#%patch7 -p1
%patch8 -p1
-%patch9 -p1
+#%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1
-%patch15 -p1
-
-%{__rm} -v tools/check/*.orig
+#%patch15 -p1
+%patch16 -p1
# stubdom sources
ln -s %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} stubdom
-ln -s %{PATCH100} stubdom/grub.patches/99grub-ext4-support.patch
ln -s %{SOURCE15} tools/firmware/etherboot/ipxe.tar.gz
%build
export CFLAGS="%{rpmcflags} -I/usr/include/ncurses"
export CXXFLAGS="%{rpmcflags} -I/usr/include/ncurses"
+cd tools
+%configure \
+ --disable-debug \
+ CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses"
+cd ..
+
%{__make} dist-xen dist-tools dist-docs \
%{!?with_ocaml:OCAML_TOOLS=n} \
prefix=%{_prefix} \
@@ -336,6 +341,7 @@ export CXXFLAGS="%{rpmcflags} -I/usr/include/ncurses"
unset CFLAGS
unset CXXFLAGS
+
%{__make} -j1 dist-stubdom \
%{!?with_ocaml:OCAML_TOOLS=n} \
CC="%{__cc}" \
@@ -389,11 +395,17 @@ cp -p tools/xenmon/README{,.xenmon}
%py_postclean
# remove unneeded files
-%{__rm} $RPM_BUILD_ROOT/boot/xen-4.1.gz
+%{__rm} $RPM_BUILD_ROOT/boot/xen-4.2.gz
%{__rm} $RPM_BUILD_ROOT/boot/xen-4.gz
%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/xen
%{__rm} $RPM_BUILD_ROOT%{_includedir}/%{name}/COPYING
+# strip complains on those
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/qemu-xen/openbios-ppc
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/qemu-xen/openbios-sparc32
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/qemu-xen/openbios-sparc64
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/qemu-xen/palcode-clipper
+
%clean
rm -rf $RPM_BUILD_ROOT
diff --git a/pygrubfix.patch b/pygrubfix.patch
index e039369..4df88c1 100644
--- a/pygrubfix.patch
+++ b/pygrubfix.patch
@@ -1,14 +1,15 @@
---- xen-4.1.0/tools/pygrub/src/pygrub.orig 2010-12-31 15:24:11.000000000 +0000
-+++ xen-4.1.0/tools/pygrub/src/pygrub 2011-01-30 18:58:17.000000000 +0000
-@@ -96,6 +96,7 @@
-
+diff -dur xen-4.2.0.orig/tools/pygrub/src/pygrub xen-4.2.0/tools/pygrub/src/pygrub
+--- xen-4.2.0.orig/tools/pygrub/src/pygrub 2012-09-17 12:21:18.000000000 +0200
++++ xen-4.2.0/tools/pygrub/src/pygrub 2012-10-22 10:57:09.000000000 +0200
+@@ -119,6 +119,7 @@
fd = os.open(file, os.O_RDONLY)
buf = os.read(fd, 512)
+ os.close(fd)
+ offzerocount = 0
for poff in (446, 462, 478, 494): # partition offsets
# MBR contains a 16 byte descriptor per partition
-@@ -105,6 +106,7 @@
+@@ -128,6 +129,7 @@
# offset == 0 implies this partition is not enabled
if offset == 0:
@@ -16,7 +17,7 @@
continue
if type == FDISK_PART_SOLARIS or type == FDISK_PART_SOLARIS_OLD:
-@@ -123,6 +125,9 @@
+@@ -148,6 +150,9 @@
else:
part_offs.append(offset)
diff --git a/pygrubfix2.patch b/pygrubfix2.patch
deleted file mode 100644
index 7f308c6..0000000
--- a/pygrubfix2.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- xen-4.1.2/tools/pygrub/src/pygrub.orig 2011-10-13 18:56:41.000000000 +0100
-+++ xen-4.1.2/tools/pygrub/src/pygrub 2011-10-13 20:46:58.000000000 +0100
-@@ -78,9 +78,17 @@
- def get_fs_offset_gpt(file):
- fd = os.open(file, os.O_RDONLY)
- # assume the first partition is an EFI system partition.
-- os.lseek(fd, SECTOR_SIZE * 2, 0)
-+ os.lseek(fd, SECTOR_SIZE, 0)
- buf = os.read(fd, 512)
-- return struct.unpack("<Q", buf[32:40])[0] * SECTOR_SIZE
-+ partcount = struct.unpack("<L", buf[80:84])[0]
-+ partsize = struct.unpack("<L", buf[84:88])[0]
-+ i = partcount
-+ offsets = []
-+ while i>0:
-+ buf = os.read(fd, partsize)
-+ offsets.append(struct.unpack("<Q", buf[32:40])[0] * SECTOR_SIZE)
-+ i -= 1
-+ return offsets
-
- FDISK_PART_SOLARIS=0xbf
- FDISK_PART_SOLARIS_OLD=0x82
-@@ -116,7 +124,9 @@
- continue # no solaris magic at that offset, ignore partition
-
- if type == FDISK_PART_GPT:
-- offset = get_fs_offset_gpt(file)
-+ for offset in get_fs_offset_gpt(file):
-+ part_offs.append(offset)
-+ break
-
- # Active partition has 0x80 as the first byte.
- # If active, prepend to front of list, otherwise append to back.
-@@ -394,7 +404,8 @@
- ["/boot/grub/menu.lst", "/boot/grub/grub.conf",
- "/grub/menu.lst", "/grub/grub.conf"]) + \
- map(lambda x: (x,grub.GrubConf.Grub2ConfigFile),
-- ["/boot/grub/grub.cfg", "/grub/grub.cfg"]) + \
-+ ["/boot/grub/grub.cfg", "/grub/grub.cfg",
-+ "/boot/grub2/grub.cfg", "/grub2/grub.cfg"]) + \
- map(lambda x: (x,grub.ExtLinuxConf.ExtLinuxConfigFile),
- ["/boot/isolinux/isolinux.cfg",
- "/boot/extlinux.conf"])
---- xen-4.1.2/tools/pygrub/src/GrubConf.py.orig 2011-10-08 19:42:10.000000000 +0100
-+++ xen-4.1.2/tools/pygrub/src/GrubConf.py 2011-10-14 21:08:44.000000000 +0100
-@@ -79,6 +79,8 @@
- val = val.replace("(", "").replace(")", "")
- if val[:5] == "msdos":
- val = val[5:]
-+ if val[:3] == "gpt":
-+ val = val[3:]
- self._part = int(val)
- part = property(get_part, set_part)
-
-@@ -368,6 +370,7 @@
- in_function = False
- img = None
- title = ""
-+ menu_level=0
- for l in lines:
- l = l.strip()
- # skip blank lines
-@@ -394,10 +397,18 @@
- img = []
- title = title_match.group(1)
- continue
--
-+
-+ if l.startswith("submenu"):
-+ menu_level += 1
-+ continue
-+
- if l.startswith("}"):
- if img is None:
-- raise RuntimeError, "syntax error: closing brace without menuentry"
-+ if menu_level > 0:
-+ menu_level -= 1
-+ continue
-+ else:
-+ raise RuntimeError, "syntax error: closing brace without menuentry"
-
- self.add_image(Grub2Image(title, img))
- img = None
-@@ -414,6 +425,8 @@
-
- if self.commands.has_key(com):
- if self.commands[com] is not None:
-+ if arg.strip() == "${saved_entry}":
-+ arg = "0"
- setattr(self, self.commands[com], arg.strip())
- else:
- logging.info("Ignored directive %s" %(com,))
diff --git a/qemu-xen-4.1-testing.git-3cf61880403b4e484539596a95937cc066243388.patch b/qemu-xen-4.1-testing.git-3cf61880403b4e484539596a95937cc066243388.patch
deleted file mode 100644
index 3b9933a..0000000
--- a/qemu-xen-4.1-testing.git-3cf61880403b4e484539596a95937cc066243388.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 3cf61880403b4e484539596a95937cc066243388 Mon Sep 17 00:00:00 2001
-From: Ian Campbell <Ian.Campbell at citrix.com>
-Date: Thu, 2 Feb 2012 13:47:06 +0000
-Subject: [PATCH] e1000: bounds packet size against buffer size
-
-Otherwise we can write beyond the buffer and corrupt memory. This is tracked
-as CVE-2012-0029.
-
-Signed-off-by: Anthony Liguori <aliguori at us.ibm.com>
-
-(Backported from qemu upstream 65f82df0d7a71ce1b10cd4c5ab08888d176ac840
- by Ian Campbell.)
-
-Signed-off-by: Ian Campbell <Ian.Campbell at citrix.com>
-(cherry picked from commit ebe37b2a3f844bad02dcc30d081f39eda06118f8)
----
- hw/e1000.c | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/tools/ioemu-qemu-xen/hw/e1000.c b/tools/ioemu-qemu-xen/hw/e1000.c
-index bb3689e..97104ed 100644
---- a/tools/ioemu-qemu-xen/hw/e1000.c
-+++ b/tools/ioemu-qemu-xen/hw/e1000.c
-@@ -444,6 +444,8 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp)
- bytes = split_size;
- if (tp->size + bytes > msh)
- bytes = msh - tp->size;
-+
-+ bytes = MIN(sizeof(tp->data) - tp->size, bytes);
- cpu_physical_memory_read(addr, tp->data + tp->size, bytes);
- if ((sz = tp->size + bytes) >= hdr && tp->size < hdr)
- memmove(tp->header, tp->data, hdr);
-@@ -459,6 +461,7 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp)
- // context descriptor TSE is not set, while data descriptor TSE is set
- DBGOUT(TXERR, "TCP segmentaion Error\n");
- } else {
-+ split_size = MIN(sizeof(tp->data) - tp->size, split_size);
- cpu_physical_memory_read(addr, tp->data + tp->size, split_size);
- tp->size += split_size;
- }
---
-1.7.2.5
-
diff --git a/xen-4.1-testing.23190.patch b/xen-4.1-testing.23190.patch
deleted file mode 100644
index 2c51bc8..0000000
--- a/xen-4.1-testing.23190.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-
-# HG changeset patch
-# User Stefano Stabellini <stefano.stabellini at eu.citrix.com>
-# Date 1321623485 0
-# Node ID 5a00ccfc63915650b8e1a262c2cad8e8d8670612
-# Parent e73ada19a69daf821aa7d80323f1bd76239b9bae
-x86: re-inject emulated level pirqs in PV on HVM guests if still asserted
-
-PV on HVM guests can loose level interrupts coming from emulated
-devices if they have been remapped onto event channels. The reason is
-that we are missing the code to inject a pirq again in the guest when
-the guest EOIs it, if it corresponds to an emulated level interrupt
-and the interrupt is still asserted.
-
-Fix this issue and also return error when the guest tries to get the
-irq_status of a non-existing pirq.
-
-
-Changes in this backport:
- - move the spinlock afterward to cover the new code only.
-
-Signed-off-by: Stefano Stabellini <stefano.stabellini at eu.citrix.com>
-Committed-by: Keir Fraser <keir at xen.org>
-xen-unstable changeset: 24007:0526644ad2a6
-xen-unstable date: Thu Oct 27 16:07:18 2011 +0100
-
-diff -r e73ada19a69d -r 5a00ccfc6391 xen/arch/x86/physdev.c
---- a/xen/arch/x86/physdev.c Thu Nov 17 09:13:25 2011 +0000
-+++ b/xen/arch/x86/physdev.c Fri Nov 18 13:38:05 2011 +0000
-@@ -268,6 +268,20 @@
- ret = pirq_guest_eoi(v->domain, eoi.irq);
- else
- ret = 0;
-+ spin_lock(&v->domain->event_lock);
-+ if ( is_hvm_domain(v->domain) &&
-+ domain_pirq_to_emuirq(v->domain, eoi.irq) > 0 )
-+ {
-+ struct hvm_irq *hvm_irq = &v->domain->arch.hvm_domain.irq;
-+ int gsi = domain_pirq_to_emuirq(v->domain, eoi.irq);
-+
-+ /* if this is a level irq and count > 0, send another
-+ * notification */
-+ if ( gsi >= NR_ISAIRQS /* ISA irqs are edge triggered */
-+ && hvm_irq->gsi_assert_count[gsi] )
-+ send_guest_pirq(v->domain, eoi.irq);
-+ }
-+ spin_unlock(&v->domain->event_lock);
- break;
- }
-
-@@ -323,9 +337,10 @@
- break;
- irq_status_query.flags = 0;
- if ( is_hvm_domain(v->domain) &&
-- domain_pirq_to_irq(v->domain, irq) <= 0 )
-+ domain_pirq_to_irq(v->domain, irq) <= 0 &&
-+ domain_pirq_to_emuirq(v->domain, irq) == IRQ_UNBOUND )
- {
-- ret = copy_to_guest(arg, &irq_status_query, 1) ? -EFAULT : 0;
-+ ret = -EINVAL;
- break;
- }
-
-
diff --git a/xen-curses.patch b/xen-curses.patch
index 7826ca6..7e4af16 100644
--- a/xen-curses.patch
+++ b/xen-curses.patch
@@ -1,6 +1,30 @@
-diff -uNr xen-3.4.3/tools/xenstat/Makefile xen-3.4.3.new//tools/xenstat/Makefile
---- xen-3.4.3/tools/xenstat/Makefile 2010-06-03 19:42:38.000000000 +0200
-+++ xen-3.4.3.new//tools/xenstat/Makefile 2011-01-22 08:25:29.621404344 +0100
+diff -dur xen-4.2.0.orig/tools/qemu-xen/configure xen-4.2.0/tools/qemu-xen/configure
+--- xen-4.2.0.orig/tools/qemu-xen/configure 2012-09-10 20:10:52.000000000 +0200
++++ xen-4.2.0/tools/qemu-xen/configure 2012-10-22 10:53:22.000000000 +0200
+@@ -1859,7 +1859,7 @@
+ if test "$curses" != "no" ; then
+ curses_found=no
+ cat > $TMPC << EOF
+-#include <curses.h>
++#include <ncurses/curses.h>
+ #ifdef __OpenBSD__
+ #define resize_term resizeterm
+ #endif
+diff -dur xen-4.2.0.orig/tools/qemu-xen/console.h xen-4.2.0/tools/qemu-xen/console.h
+--- xen-4.2.0.orig/tools/qemu-xen/console.h 2012-09-10 20:10:52.000000000 +0200
++++ xen-4.2.0/tools/qemu-xen/console.h 2012-10-22 10:53:12.000000000 +0200
+@@ -329,7 +329,7 @@
+ }
+
+ #ifdef CONFIG_CURSES
+-#include <curses.h>
++#include <ncurses/curses.h>
+ typedef chtype console_ch_t;
+ #else
+ typedef unsigned long console_ch_t;
+diff -dur xen-4.2.0.orig/tools/xenstat/Makefile xen-4.2.0/tools/xenstat/Makefile
+--- xen-4.2.0.orig/tools/xenstat/Makefile 2012-09-17 12:21:19.000000000 +0200
++++ xen-4.2.0/tools/xenstat/Makefile 2012-10-22 10:51:45.000000000 +0200
@@ -6,7 +6,7 @@
# This doesn't cross-compile (cross-compile environments rarely have curses)
@@ -10,29 +34,3 @@ diff -uNr xen-3.4.3/tools/xenstat/Makefile xen-3.4.3.new//tools/xenstat/Makefile
SUBDIRS += xentop
endif
endif
---- xen-4.1.2/tools/ioemu-qemu-xen/configure~ 2011-02-11 18:54:51.000000000 +0100
-+++ xen-4.1.2/tools/ioemu-qemu-xen/configure 2011-10-28 21:47:32.610940849 +0200
-@@ -968,10 +968,10 @@
- if test "$curses" = "yes" ; then
- curses=no
- cat > $TMPC << EOF
--#include <curses.h>
-+#include <ncurses/curses.h>
- int main(void) { return curses_version(); }
- EOF
-- if $cc $ARCH_CFLAGS -o $TMPE $TMPC -lcurses > /dev/null 2> /dev/null ; then
-+ if $cc $ARCH_CFLAGS -o $TMPE $TMPC -lncurses > /dev/null 2> /dev/null ; then
- curses=yes
- fi
- fi # test "$curses"
---- xen-4.1.2/tools/ioemu-qemu-xen/curses.c~ 2011-02-11 18:54:51.000000000 +0100
-+++ xen-4.1.2/tools/ioemu-qemu-xen/curses.c 2011-10-28 21:47:04.862996728 +0200
-@@ -26,7 +26,7 @@
- #include "console.h"
- #include "sysemu.h"
-
--#include <curses.h>
-+#include <ncurses/curses.h>
-
- #ifndef _WIN32
- #include <signal.h>
diff --git a/xen-net-disable-iptables-on-bridge.patch b/xen-net-disable-iptables-on-bridge.patch
index e7a8930..8908041 100644
--- a/xen-net-disable-iptables-on-bridge.patch
+++ b/xen-net-disable-iptables-on-bridge.patch
@@ -1,6 +1,7 @@
---- xen-4.1.0-orig/tools/hotplug/Linux/vif-bridge 2008-08-22 10:49:07.000000000 +0100
-+++ xen-4.1.0-new/tools/hotplug/Linux/vif-bridge 2008-08-29 11:29:38.000000000 +0100
-@@ -96,10 +96,6 @@ case "$command" in
+diff -dur -x '*.orig' -x '*.rej' -x '*~' xen-4.2.0.orig/tools/hotplug/Linux/vif-bridge xen-4.2.0/tools/hotplug/Linux/vif-bridge
+--- xen-4.2.0.orig/tools/hotplug/Linux/vif-bridge 2012-09-17 12:21:18.000000000 +0200
++++ xen-4.2.0/tools/hotplug/Linux/vif-bridge 2012-10-22 13:05:43.000000000 +0200
+@@ -101,10 +101,6 @@
;;
esac
@@ -8,12 +9,13 @@
- handle_iptable
-fi
-
+ call_hooks vif post
+
log debug "Successful vif-bridge $command for $dev, bridge $bridge."
- if [ "$type_if" = vif -a "$command" = "online" ]
- then
---- xen-3.3.0-orig/tools/hotplug/Linux/xen-network-common.sh 2008-08-22 10:49:07.000000000 +0100
-+++ xen-3.3.0-new/tools/hotplug/Linux/xen-network-common.sh 2008-08-29 11:29:38.000000000 +0100
-@@ -99,6 +99,13 @@ create_bridge () {
+diff -dur -x '*.orig' -x '*.rej' -x '*~' xen-4.2.0.orig/tools/hotplug/Linux/xen-network-common.sh xen-4.2.0/tools/hotplug/Linux/xen-network-common.sh
+--- xen-4.2.0.orig/tools/hotplug/Linux/xen-network-common.sh 2012-09-17 12:21:18.000000000 +0200
++++ xen-4.2.0/tools/hotplug/Linux/xen-network-common.sh 2012-10-22 13:05:02.000000000 +0200
+@@ -115,6 +115,13 @@
brctl addbr ${bridge}
brctl stp ${bridge} off
brctl setfd ${bridge} 0
diff --git a/xen-python_scripts.patch b/xen-python_scripts.patch
index a875ebc..219c0a1 100644
--- a/xen-python_scripts.patch
+++ b/xen-python_scripts.patch
@@ -1,436 +1,72 @@
-diff -Naur xen-3.4.2.orig/tools/misc/sbdf2devicepath xen-3.4.2/tools/misc/sbdf2devicepath
---- xen-3.4.2.orig/tools/misc/sbdf2devicepath 2009-11-10 16:12:56.000000000 +0100
-+++ xen-3.4.2/tools/misc/sbdf2devicepath 2010-02-13 18:26:29.000000000 +0100
+diff -dur xen-4.2.0.orig/docs/pythfilter.py xen-4.2.0/docs/pythfilter.py
+--- xen-4.2.0.orig/docs/pythfilter.py 2012-09-17 12:21:17.000000000 +0200
++++ xen-4.2.0/docs/pythfilter.py 2012-10-22 10:46:31.000000000 +0200
@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- # -*- mode: python; -*-
- #============================================================================
- # This library is free software; you can redistribute it and/or
-diff -Naur xen-3.4.2.orig/tools/misc/sxp-pretty xen-3.4.2/tools/misc/sxp-pretty
---- xen-3.4.2.orig/tools/misc/sxp-pretty 2009-11-10 16:12:56.000000000 +0100
-+++ xen-3.4.2/tools/misc/sxp-pretty 2010-02-13 18:26:29.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- # -*- mode: python; -*-
- #============================================================================
- # This library is free software; you can redistribute it and/or
-diff -Naur xen-3.4.2.orig/tools/misc/xen-bugtool xen-3.4.2/tools/misc/xen-bugtool
---- xen-3.4.2.orig/tools/misc/xen-bugtool 2009-11-10 16:12:56.000000000 +0100
-+++ xen-3.4.2/tools/misc/xen-bugtool 2010-02-13 18:26:29.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
-
- # -*- mode: python; -*-
-
-diff -Naur xen-3.4.2.orig/tools/misc/xencons xen-3.4.2/tools/misc/xencons
---- xen-3.4.2.orig/tools/misc/xencons 2009-11-10 16:12:56.000000000 +0100
-+++ xen-3.4.2/tools/misc/xencons 2010-02-13 18:26:29.000000000 +0100
+-#!/usr/bin/env python
++#!/usr/bin/python
+
+ # pythfilter.py v1.5.5, written by Matthias Baas (baas at ira.uka.de)
+
+diff -dur xen-4.2.0.orig/tools/misc/xenpvnetboot xen-4.2.0/tools/misc/xenpvnetboot
+--- xen-4.2.0.orig/tools/misc/xenpvnetboot 2012-09-17 12:21:18.000000000 +0200
++++ xen-4.2.0/tools/misc/xenpvnetboot 2012-10-22 10:46:30.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
-
- ##############################################
- # Console client for Xen guest OSes
-diff -Naur xen-3.4.2.orig/tools/misc/xend xen-3.4.2/tools/misc/xend
---- xen-3.4.2.orig/tools/misc/xend 2009-11-10 16:12:56.000000000 +0100
-+++ xen-3.4.2/tools/misc/xend 2010-02-13 18:26:29.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- # -*- mode: python; -*-
- #============================================================================
- # Copyright (C) 2004 Mike Wray <mike.wray at hp.com>
-diff -Naur xen-3.4.2.orig/tools/misc/xen-python-path xen-3.4.2/tools/misc/xen-python-path
---- xen-3.4.2.orig/tools/misc/xen-python-path 2009-11-10 16:12:56.000000000 +0100
-+++ xen-3.4.2/tools/misc/xen-python-path 2010-02-13 18:26:29.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- # -*- mode: python; -*-
- #============================================================================
- # This library is free software; you can redistribute it and/or
-diff -Naur xen-3.4.2.orig/tools/misc/xensymoops xen-3.4.2/tools/misc/xensymoops
---- xen-3.4.2.orig/tools/misc/xensymoops 2009-11-10 16:12:56.000000000 +0100
-+++ xen-3.4.2/tools/misc/xensymoops 2010-02-13 18:26:29.000000000 +0100
+ #
+ # Copyright (C) 2010 Oracle. All rights reserved.
+ #
+diff -dur xen-4.2.0.orig/tools/python/xen/remus/save.py xen-4.2.0/tools/python/xen/remus/save.py
+--- xen-4.2.0.orig/tools/python/xen/remus/save.py 2012-09-17 12:21:18.000000000 +0200
++++ xen-4.2.0/tools/python/xen/remus/save.py 2012-10-22 10:46:30.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
- # An oops analyser for Xen
- # Usage: xensymoops path-to-xen.s < oops-message
-diff -Naur xen-3.4.2.orig/tools/misc/xm xen-3.4.2/tools/misc/xm
---- xen-3.4.2.orig/tools/misc/xm 2009-11-10 16:12:56.000000000 +0100
-+++ xen-3.4.2/tools/misc/xm 2010-02-13 18:26:29.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- # -*- mode: python; -*-
- import sys
+ import os, select, socket, threading, time, signal, xmlrpclib
-diff -Naur xen-3.4.2.orig/tools/misc/xsview xen-3.4.2/tools/misc/xsview
---- xen-3.4.2.orig/tools/misc/xsview 2009-11-10 16:12:56.000000000 +0100
-+++ xen-3.4.2/tools/misc/xsview 2010-02-13 18:26:29.000000000 +0100
+diff -dur xen-4.2.0.orig/tools/python/xen/remus/vm.py xen-4.2.0/tools/python/xen/remus/vm.py
+--- xen-4.2.0.orig/tools/python/xen/remus/vm.py 2012-09-17 12:21:18.000000000 +0200
++++ xen-4.2.0/tools/python/xen/remus/vm.py 2012-10-22 10:46:30.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
- import sys
+ import xmlrpclib
-diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/logconf.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/logconf.py
---- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/logconf.py 2009-11-10 16:12:56.000000000 +0100
-+++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/logconf.py 2010-02-13 18:26:29.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- #
- # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
- #
-diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test0.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test0.py
---- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test0.py 2009-11-10 16:12:56.000000000 +0100
-+++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test0.py 2010-02-13 18:26:29.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- #
- # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
- #
-diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test10.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test10.py
---- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test10.py 2009-11-10 16:12:56.000000000 +0100
-+++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test10.py 2010-02-13 18:26:29.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- #
- # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
- #
-diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test11.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test11.py
---- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test11.py 2009-11-10 16:12:56.000000000 +0100
-+++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test11.py 2010-02-13 18:26:29.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- #
- # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
- #
-diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test12.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test12.py
---- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test12.py 2009-11-10 16:12:56.000000000 +0100
-+++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test12.py 2010-02-13 18:26:29.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- #
- # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
- #
-diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test13.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test13.py
---- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test13.py 2009-11-10 16:12:56.000000000 +0100
-+++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test13.py 2010-02-13 18:26:29.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- #
- # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
- #
-diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test14.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test14.py
---- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test14.py 2009-11-10 16:12:56.000000000 +0100
-+++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test14.py 2010-02-13 18:26:29.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- #
- # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
- #
-diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test15.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test15.py
---- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test15.py 2009-11-10 16:12:56.000000000 +0100
-+++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test15.py 2010-02-13 18:26:29.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- #
- # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
- #
-diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test16.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test16.py
---- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test16.py 2009-11-10 16:12:56.000000000 +0100
-+++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test16.py 2010-02-13 18:26:29.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- #
- # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
- #
-diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test17.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test17.py
---- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test17.py 2009-11-10 16:12:56.000000000 +0100
-+++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test17.py 2010-02-13 18:26:29.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- #
- # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
- #
-diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test18.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test18.py
---- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test18.py 2009-11-10 16:12:56.000000000 +0100
-+++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test18.py 2010-02-13 18:26:29.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- #
- # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
- #
-diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test19.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test19.py
---- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test19.py 2009-11-10 16:12:56.000000000 +0100
-+++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test19.py 2010-02-13 18:26:29.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- #
- # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
- #
-diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test1.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test1.py
---- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test1.py 2009-11-10 16:12:56.000000000 +0100
-+++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test1.py 2010-02-13 18:26:29.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- #
- # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
- #
-diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test20.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test20.py
---- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test20.py 2009-11-10 16:12:56.000000000 +0100
-+++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test20.py 2010-02-13 18:26:29.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- #
- # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
- #
-diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test21.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test21.py
---- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test21.py 2009-11-10 16:12:56.000000000 +0100
-+++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test21.py 2010-02-13 18:26:29.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- #
- # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
- #
-diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test22.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test22.py
---- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test22.py 2009-11-10 16:12:56.000000000 +0100
-+++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test22.py 2010-02-13 18:26:29.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- #
- # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
- #
-diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test2.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test2.py
---- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test2.py 2009-11-10 16:12:56.000000000 +0100
-+++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test2.py 2010-02-13 18:26:29.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- #
- # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
- #
-diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test3.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test3.py
---- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test3.py 2009-11-10 16:12:56.000000000 +0100
-+++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test3.py 2010-02-13 18:26:29.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- #
- # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
- #
-diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test4.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test4.py
---- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test4.py 2009-11-10 16:12:56.000000000 +0100
-+++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test4.py 2010-02-13 18:26:29.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- #
- # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
- #
-diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test5.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test5.py
---- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test5.py 2009-11-10 16:12:56.000000000 +0100
-+++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test5.py 2010-02-13 18:26:29.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- #
- # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
- #
-diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test6.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test6.py
---- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test6.py 2009-11-10 16:12:56.000000000 +0100
-+++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test6.py 2010-02-13 18:26:29.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- #
- # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
- #
-diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test7.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test7.py
---- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test7.py 2009-11-10 16:12:56.000000000 +0100
-+++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test7.py 2010-02-13 18:26:29.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- #
- # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
- #
-diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test8.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test8.py
---- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test8.py 2009-11-10 16:12:56.000000000 +0100
-+++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test8.py 2010-02-13 18:26:29.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- #
- # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
- #
-diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test9.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test9.py
---- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test9.py 2009-11-10 16:12:56.000000000 +0100
-+++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test9.py 2010-02-13 18:26:29.000000000 +0100
+diff -dur xen-4.2.0.orig/tools/python/xen/xend/XendSXPDev.py xen-4.2.0/tools/python/xen/xend/XendSXPDev.py
+--- xen-4.2.0.orig/tools/python/xen/xend/XendSXPDev.py 2012-09-17 12:21:19.000000000 +0200
++++ xen-4.2.0/tools/python/xen/xend/XendSXPDev.py 2012-10-22 10:46:30.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
#
- # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
- #
-diff -Naur xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test.py xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test.py
---- xen-3.4.2.orig/tools/python/logging/logging-0.4.9.2/test/log_test.py 2009-11-10 16:12:56.000000000 +0100
-+++ xen-3.4.2/tools/python/logging/logging-0.4.9.2/test/log_test.py 2010-02-13 18:26:29.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- #
- # Copyright 2001-2002 by Vinay Sajip. All Rights Reserved.
- #
-diff -Naur xen-3.4.2.orig/tools/python/xen/util/bugtool.py xen-3.4.2/tools/python/xen/util/bugtool.py
---- xen-3.4.2.orig/tools/python/xen/util/bugtool.py 2009-11-10 16:12:56.000000000 +0100
-+++ xen-3.4.2/tools/python/xen/util/bugtool.py 2010-02-13 18:26:29.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
+ # Helper functions for dealing with the sxp representation of devices
- # This library is free software; you can redistribute it and/or
- # modify it under the terms of version 2.1 of the GNU Lesser General Public
-diff -Naur xen-3.4.2.orig/tools/python/xen/util/pci.py xen-3.4.2/tools/python/xen/util/pci.py
---- xen-3.4.2.orig/tools/python/xen/util/pci.py 2009-11-10 16:12:56.000000000 +0100
-+++ xen-3.4.2/tools/python/xen/util/pci.py 2010-02-13 18:26:29.000000000 +0100
+diff -dur xen-4.2.0.orig/tools/qemu-xen/scripts/analyse-9p-simpletrace.py xen-4.2.0/tools/qemu-xen/scripts/analyse-9p-simpletrace.py
+--- xen-4.2.0.orig/tools/qemu-xen/scripts/analyse-9p-simpletrace.py 2012-09-10 20:10:52.000000000 +0200
++++ xen-4.2.0/tools/qemu-xen/scripts/analyse-9p-simpletrace.py 2012-10-22 10:46:30.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
+ # Pretty print 9p simpletrace log
+ # Usage: ./analyse-9p-simpletrace <trace-events> <trace-pid>
#
- # PCI Device Information Class
- # - Helps obtain information about which I/O resources a PCI device needs
-diff -Naur xen-3.4.2.orig/tools/python/xen/util/vscsi_util.py xen-3.4.2/tools/python/xen/util/vscsi_util.py
---- xen-3.4.2.orig/tools/python/xen/util/vscsi_util.py 2009-11-10 16:12:56.000000000 +0100
-+++ xen-3.4.2/tools/python/xen/util/vscsi_util.py 2010-02-13 18:26:29.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- # -*- mode: python; -*-
-
- #============================================================================
-diff -Naur xen-3.4.2.orig/tools/python/xen/xend/arch.py xen-3.4.2/tools/python/xen/xend/arch.py
---- xen-3.4.2.orig/tools/python/xen/xend/arch.py 2009-11-10 16:12:56.000000000 +0100
-+++ xen-3.4.2/tools/python/xen/xend/arch.py 2010-02-13 18:26:29.000000000 +0100
+diff -dur xen-4.2.0.orig/tools/qemu-xen/scripts/simpletrace.py xen-4.2.0/tools/qemu-xen/scripts/simpletrace.py
+--- xen-4.2.0.orig/tools/qemu-xen/scripts/simpletrace.py 2012-09-10 20:10:52.000000000 +0200
++++ xen-4.2.0/tools/qemu-xen/scripts/simpletrace.py 2012-10-22 10:46:30.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
#
- # This library is free software; you can redistribute it and/or
- # modify it under the terms of version 2.1 of the GNU Lesser General Public
-diff -Naur xen-3.4.2.orig/tools/python/xen/xend/osdep.py xen-3.4.2/tools/python/xen/xend/osdep.py
---- xen-3.4.2.orig/tools/python/xen/xend/osdep.py 2009-11-10 16:12:56.000000000 +0100
-+++ xen-3.4.2/tools/python/xen/xend/osdep.py 2010-02-13 18:26:29.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
+ # Pretty-printer for simple trace backend binary trace files
#
- # This library is free software; you can redistribute it and/or
- # modify it under the terms of version 2.1 of the GNU Lesser General Public
-diff -Naur xen-3.4.2.orig/tools/python/xen/xend/sxp.py xen-3.4.2/tools/python/xen/xend/sxp.py
---- xen-3.4.2.orig/tools/python/xen/xend/sxp.py 2009-11-10 16:12:56.000000000 +0100
-+++ xen-3.4.2/tools/python/xen/xend/sxp.py 2010-02-13 18:26:29.000000000 +0100
+diff -dur xen-4.2.0.orig/tools/remus/remus xen-4.2.0/tools/remus/remus
+--- xen-4.2.0.orig/tools/remus/remus 2012-09-17 12:21:19.000000000 +0200
++++ xen-4.2.0/tools/remus/remus 2012-10-22 10:46:30.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
- #============================================================================
- # This library is free software; you can redistribute it and/or
- # modify it under the terms of version 2.1 of the GNU Lesser General Public
-diff -Naur xen-3.4.2.orig/tools/python/xen/xend/XendClient.py xen-3.4.2/tools/python/xen/xend/XendClient.py
---- xen-3.4.2.orig/tools/python/xen/xend/XendClient.py 2009-11-10 16:12:56.000000000 +0100
-+++ xen-3.4.2/tools/python/xen/xend/XendClient.py 2010-02-13 18:26:29.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- #============================================================================
- # This library is free software; you can redistribute it and/or
- # modify it under the terms of version 2.1 of the GNU Lesser General Public
-diff -Naur xen-3.4.2.orig/tools/security/python/xensec_tools/acm_getlabel xen-3.4.2/tools/security/python/xensec_tools/acm_getlabel
---- xen-3.4.2.orig/tools/security/python/xensec_tools/acm_getlabel 2009-11-10 16:12:56.000000000 +0100
-+++ xen-3.4.2/tools/security/python/xensec_tools/acm_getlabel 2010-02-13 18:26:29.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- # -*- mode: python; -*-
- import sys
- import traceback
-diff -Naur xen-3.4.2.orig/tools/security/xensec_ezpolicy xen-3.4.2/tools/security/xensec_ezpolicy
---- xen-3.4.2.orig/tools/security/xensec_ezpolicy 2009-11-10 16:12:56.000000000 +0100
-+++ xen-3.4.2/tools/security/xensec_ezpolicy 2010-02-13 18:26:29.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
- #===========================================================================
- # This program is free software; you can redistribute it and/or
- # modify it under the terms of version 2.1 of the GNU Lesser General Public
-diff -Naur xen-3.4.2.orig/tools/xenmon/xenmon.py xen-3.4.2/tools/xenmon/xenmon.py
---- xen-3.4.2.orig/tools/xenmon/xenmon.py 2009-11-10 16:12:57.000000000 +0100
-+++ xen-3.4.2/tools/xenmon/xenmon.py 2010-02-13 18:26:29.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
-
- #####################################################################
- # xenmon is a front-end for xenbaked.
-diff -Naur xen-3.4.2.orig/tools/xentrace/xentrace_format xen-3.4.2/tools/xentrace/xentrace_format
---- xen-3.4.2.orig/tools/xentrace/xentrace_format 2009-11-10 16:12:57.000000000 +0100
-+++ xen-3.4.2/tools/xentrace/xentrace_format 2010-02-13 18:26:29.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
-
- # by Mark Williamson, (C) 2004 Intel Research Cambridge
-
-diff -Naur xen-3.4.2.orig/xen/tools/compat-build-header.py xen-3.4.2/xen/tools/compat-build-header.py
---- xen-3.4.2.orig/xen/tools/compat-build-header.py 2009-11-10 16:12:59.000000000 +0100
-+++ xen-3.4.2/xen/tools/compat-build-header.py 2010-02-13 18:26:29.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
-
- import re,sys
-
-diff -Naur xen-3.4.2.orig/xen/tools/compat-build-source.py xen-3.4.2/xen/tools/compat-build-source.py
---- xen-3.4.2.orig/xen/tools/compat-build-source.py 2009-11-10 16:12:59.000000000 +0100
-+++ xen-3.4.2/xen/tools/compat-build-source.py 2010-02-13 18:26:29.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/python
-
- import re,sys
-
-diff -Naur xen-3.4.2.orig/tools/check/check_python_devel xen-3.4.2/tools/check/check_python_devel
---- xen-3.4.2.orig/tools/check/check_python_devel 2009-11-10 16:12:55.000000000 +0100
-+++ xen-3.4.2/tools/check/check_python_devel 2010-02-13 18:27:11.000000000 +0100
-@@ -6,7 +6,7 @@
- python -c '
- import os.path, sys
- for p in sys.path:
-- if os.path.exists(p + "/config/Makefile"):
-+ if os.path.exists(p + "/../config/Makefile"):
- sys.exit(0)
- sys.exit(1)
- ' || fail "can't find python devel files"
-
+ #
+ # This is a save process which also buffers outgoing I/O between
+ # rounds, so that external viewers never see anything that hasn't
diff --git a/xen-quemu-softloat-c99.patch b/xen-quemu-softloat-c99.patch
new file mode 100644
index 0000000..f33d2f1
--- /dev/null
+++ b/xen-quemu-softloat-c99.patch
@@ -0,0 +1,57 @@
+From: http://git.qemu.org/?p=qemu.git;a=commitdiff;h=3bf7e40ab9140e577a6e7e17d3f5711b28aed833
+
+From: Avi Kivity <avi at redhat.com>
+Date: Tue, 27 Dec 2011 15:11:20 +0000 (+0200)
+Subject: softfloat: fix for C99
+
+softfloat: fix for C99
+
+C99 appears to consider compound literals as non-constants, and complains
+when they are used in static initializers. Switch to ordinary initializer
+syntax.
+
+
+diff -dur xen-4.2.0.orig/tools/qemu-xen/fpu/softfloat-specialize.h xen-4.2.0/tools/qemu-xen/fpu/softfloat-specialize.h
+--- xen-4.2.0.orig/tools/qemu-xen/fpu/softfloat-specialize.h 2012-09-10 20:10:52.000000000 +0200
++++ xen-4.2.0/tools/qemu-xen/fpu/softfloat-specialize.h 2012-10-22 14:58:26.000000000 +0200
+@@ -89,8 +89,8 @@
+ #define floatx80_default_nan_low LIT64( 0xC000000000000000 )
+ #endif
+
+-const floatx80 floatx80_default_nan = make_floatx80(floatx80_default_nan_high,
+- floatx80_default_nan_low);
++const floatx80 floatx80_default_nan
++ = make_floatx80_init(floatx80_default_nan_high, floatx80_default_nan_low);
+
+ /*----------------------------------------------------------------------------
+ | The pattern for a default generated quadruple-precision NaN. The `high' and
+@@ -104,8 +104,8 @@
+ #define float128_default_nan_low LIT64( 0x0000000000000000 )
+ #endif
+
+-const float128 float128_default_nan = make_float128(float128_default_nan_high,
+- float128_default_nan_low);
++const float128 float128_default_nan
++ = make_float128_init(float128_default_nan_high, float128_default_nan_low);
+
+ /*----------------------------------------------------------------------------
+ | Raises the exceptions specified by `flags'. Floating-point traps can be
+diff -dur xen-4.2.0.orig/tools/qemu-xen/fpu/softfloat.h xen-4.2.0/tools/qemu-xen/fpu/softfloat.h
+--- xen-4.2.0.orig/tools/qemu-xen/fpu/softfloat.h 2012-09-10 20:10:52.000000000 +0200
++++ xen-4.2.0/tools/qemu-xen/fpu/softfloat.h 2012-10-22 14:58:26.000000000 +0200
+@@ -129,6 +129,7 @@
+ uint16_t high;
+ } floatx80;
+ #define make_floatx80(exp, mant) ((floatx80) { mant, exp })
++#define make_floatx80_init(exp, mant) { .low = mant, .high = exp }
+ typedef struct {
+ #ifdef HOST_WORDS_BIGENDIAN
+ uint64_t high, low;
+@@ -137,6 +138,7 @@
+ #endif
+ } float128;
+ #define make_float128(high_, low_) ((float128) { .high = high_, .low = low_ })
++#define make_float128_init(high_, low_) { .high = high_, .low = low_ }
+
+ /*----------------------------------------------------------------------------
+ | Software IEC/IEEE floating-point underflow tininess-detection mode.
diff --git a/xend.empty.xml.patch b/xend.empty.xml.patch
deleted file mode 100644
index e3f29d3..0000000
--- a/xend.empty.xml.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://lists.xensource.com/archives/html/xen-devel/2011-11/msg00218.html
-
-diff -r 54a5e994a241 -r 76391f599433 tools/python/xen/xend/XendStateStore.py
---- a/tools/python/xen/xend/XendStateStore.py Wed Nov 02 17:09:09 2011 +0000
-+++ b/tools/python/xen/xend/XendStateStore.py Thu Nov 03 12:02:44 2011 -0400
-@@ -101,6 +101,9 @@ class XendStateStore:
- if not os.path.exists(xml_path):
- return {}
-
-+ if not os.path.getsize(xml_path) == 0:
-+ return {}
-+
- dom = minidom.parse(xml_path)
- root = dom.documentElement
- state = {}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xen.git/commitdiff/bf4f47e8626133528c3301cad53cffe474caf7df
More information about the pld-cvs-commit
mailing list