Bastian Blank
2012-Aug-16 20:34 UTC
[Pkg-xen-changes] r1095 - in branches/wheezy/xen/debian: . patches
Author: waldi
Date: Thu Aug 16 20:34:51 2012
New Revision: 1095
Log:
* debian/changelog: Update.
* debian/patches: Merge patches.
Deleted:
branches/wheezy/xen/debian/patches/upstream-23940:187d59e32a58
Modified:
branches/wheezy/xen/debian/changelog
branches/wheezy/xen/debian/patches/series
branches/wheezy/xen/debian/patches/upstream-23936:cdb34816a40a-rework
Modified: branches/wheezy/xen/debian/changelog
=============================================================================---
branches/wheezy/xen/debian/changelog Thu Aug 16 20:29:03 2012 (r1094)
+++ branches/wheezy/xen/debian/changelog Thu Aug 16 20:34:51 2012 (r1095)
@@ -12,7 +12,7 @@
CVE-2012-3432
- Only check for shared pages while any exist on teardown.
CVE-2012-3433
- * Fixup broken patches.
+ * Fixup broken and remove applied patches.
-- Bastian Blank <waldi at debian.org> Mon, 30 Jul 2012 21:06:34 +0200
Modified: branches/wheezy/xen/debian/patches/series
=============================================================================---
branches/wheezy/xen/debian/patches/series Thu Aug 16 20:29:03 2012 (r1094)
+++ branches/wheezy/xen/debian/patches/series Thu Aug 16 20:34:51 2012 (r1095)
@@ -2,7 +2,6 @@
upstream-23937:5173834e8476
upstream-23938:fa04fbd56521-rework
upstream-23939:51288f69523f-rework
-upstream-23940:187d59e32a58
upstream-25290:7a6dcecb1781-rework
xen-x86-interrupt-pointer-missmatch.diff
Modified: branches/wheezy/xen/debian/patches/upstream-23936:cdb34816a40a-rework
=============================================================================---
branches/wheezy/xen/debian/patches/upstream-23936:cdb34816a40a-rework Thu Aug 16
20:29:03 2012 (r1094)
+++ branches/wheezy/xen/debian/patches/upstream-23936:cdb34816a40a-rework Thu
Aug 16 20:34:51 2012 (r1095)
@@ -4110,7 +4110,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);
@@ -4146,7 +4146,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);
@@ -4203,7 +4203,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);