[Pkg-xen-changes] r1085 - in branches/wheezy/xen/debian: . patches

[Bastian Blank]

Author: waldi
Date: Mon Aug  6 15:39:30 2012
New Revision: 1085

Log:
* debian/changelog: Update version to 4.1.3~rc3-1.
* debian/patches/tools-pygrub-remove-static-solaris-support.patch,
  debian/patches/upstream-23936:cdb34816a40a-rework: Fixup.

Modified:
   branches/wheezy/xen/debian/changelog
   branches/wheezy/xen/debian/patches/tools-pygrub-remove-static-solaris-support.patch
   branches/wheezy/xen/debian/patches/upstream-23936:cdb34816a40a-rework

Modified: branches/wheezy/xen/debian/changelog
==============================================================================
--- branches/wheezy/xen/debian/changelog	Sat Jul 28 08:23:49 2012	(r1084)
+++ branches/wheezy/xen/debian/changelog	Mon Aug  6 15:39:30 2012	(r1085)
@@ -1,3 +1,15 @@
+xen (4.1.3~rc3-1) UNRELEASED; urgency=low
+
+  * New upstream release candidate: (closes: #683286)
+    - Fix error handling for unexpected conditions.
+    - Update CPUID masking to latest Intel spec.
+    - Allow large ACPI ids.
+    - Fix IOMMU support for PCI-to-PCIe bridges.
+    - Disallow access to some sensitive IO-ports.
+  * Fixup broken patches.
+
+ -- Bastian Blank <waldi at debian.org>  Mon, 30 Jul 2012 21:06:34 +0200
+
 xen (4.1.3~rc1+hg-20120614.a9c0a89c08f2-5) unstable; urgency=low
 
   [ Ian Campbell ]

Modified: branches/wheezy/xen/debian/patches/tools-pygrub-remove-static-solaris-support.patch
==============================================================================
--- branches/wheezy/xen/debian/patches/tools-pygrub-remove-static-solaris-support.patch	Sat Jul 28 08:23:49 2012	(r1084)
+++ branches/wheezy/xen/debian/patches/tools-pygrub-remove-static-solaris-support.patch	Mon Aug  6 15:39:30 2012	(r1085)
@@ -8,7 +8,7 @@
  
  import curses, _curses, curses.wrapper, curses.textpad, curses.ascii
  import getopt
-@@ -585,48 +584,6 @@
+@@ -595,51 +594,6 @@
  
      return grubcfg
  
@@ -23,7 +23,8 @@
 -# If nothing has been specified, look for a Solaris domU. If found, perform the
 -# necessary tweaks.
 -def sniff_solaris(fs, cfg):
--    if not fs.file_exists("/platform/i86xpv/kernel/unix"):
+-    if not fs.file_exists("/platform/i86xpv/kernel/unix") and \
+-       not fs.file_exists("/platform/i86xpv/kernel/amd64/unix"):
 -        return cfg
 -
 -    if not cfg["kernel"]:
@@ -31,9 +32,11 @@
 -          fs.file_exists("/platform/i86xpv/kernel/amd64/unix"):
 -            cfg["kernel"] = "/platform/i86xpv/kernel/amd64/unix"
 -            cfg["ramdisk"] = "/platform/i86pc/amd64/boot_archive"
--        else:
+-        elif fs.file_exists("/platform/i86xpv/kernel/unix"):
 -            cfg["kernel"] = "/platform/i86xpv/kernel/unix"
 -            cfg["ramdisk"] = "/platform/i86pc/boot_archive"
+-        else:
+-            return cfg
 -
 -    # Unpleasant. Typically we'll have 'root=foo -k' or 'root=foo /kernel -k',
 -    # and we need to maintain Xen properties (root= and ip=) and the kernel
@@ -57,7 +60,7 @@
  def sniff_netware(fs, cfg):
      if not fs.file_exists("/nwserver/xnloader.sys"):
          return cfg
-@@ -751,10 +708,7 @@
+@@ -764,10 +718,7 @@
          try:
              fs = fsimage.open(file, offset, bootfsoptions)
  

Modified: branches/wheezy/xen/debian/patches/upstream-23936:cdb34816a40a-rework
==============================================================================
--- branches/wheezy/xen/debian/patches/upstream-23936:cdb34816a40a-rework	Sat Jul 28 08:23:49 2012	(r1084)
+++ branches/wheezy/xen/debian/patches/upstream-23936:cdb34816a40a-rework	Mon Aug  6 15:39:30 2012	(r1085)
@@ -2430,7 +2430,7 @@
 -
 -	for (i=0; i<len; i++) {
 -		if (Bool_val(Field(cpumap, i)))
--			c_cpumap[i/8] |= i << (i&7);
+-			c_cpumap[i/8] |= 1 << (i&7);
 -	}
 -	retval = xc_vcpu_setaffinity(_H(xch), _D(domid),
 -	                             Int_val(vcpu), c_cpumap);
@@ -2466,7 +2466,7 @@
 -	ret = caml_alloc(len, 0);
 -
 -	for (i=0; i<len; i++) {
--		if (c_cpumap[i%8] & 1 << (i&7))
+-		if (c_cpumap[i/8] & 1 << (i&7))
 -			Store_field(ret, i, Val_true);
 -		else
 -			Store_field(ret, i, Val_false);
@@ -2523,7 +2523,7 @@
 -
 -CAMLprim value stub_xc_readconsolering(value xch)
 -{
--	unsigned int size = RING_SIZE;
+-	unsigned int size = RING_SIZE - 1;
 -	char *ring_ptr = ring;
 -
 -	CAMLparam1(xch);