[Pkg-xen-changes] r1160 - in trunk/xen/debian: . patches

[Bastian Blank]

Author: waldi
Date: Sat May 11 21:22:17 2013
New Revision: 1160

Log:
* debian/changelog: Update.
* debian/patches: Fix some toolchain issues.

Added:
   trunk/xen/debian/patches/toolchain.diff
Modified:
   trunk/xen/debian/changelog
   trunk/xen/debian/patches/series

Modified: trunk/xen/debian/changelog
==============================================================================
--- trunk/xen/debian/changelog	Sat May 11 21:18:03 2013	(r1159)
+++ trunk/xen/debian/changelog	Sat May 11 21:22:17 2013	(r1160)
@@ -2,6 +2,7 @@
 
   * New upstream release.
   * Enable usage of seabios.
+  * Fix some toolchain issues.
 
  -- Bastian Blank <waldi at debian.org>  Thu, 14 Feb 2013 21:01:05 +0100
 

Modified: trunk/xen/debian/patches/series
==============================================================================
--- trunk/xen/debian/patches/series	Sat May 11 21:18:03 2013	(r1159)
+++ trunk/xen/debian/patches/series	Sat May 11 21:22:17 2013	(r1160)
@@ -71,3 +71,4 @@
 
 #tools-ocaml-fix-build.diff
 tools-xenstore-compatibility.diff
+toolchain.diff

Added: trunk/xen/debian/patches/toolchain.diff
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/xen/debian/patches/toolchain.diff	Sat May 11 21:22:17 2013	(r1160)
@@ -0,0 +1,20 @@
+--- a/tools/debugger/gdbsx/xg/xg_main.c
++++ b/tools/debugger/gdbsx/xg/xg_main.c
+@@ -178,7 +178,7 @@
+     hypercall.op = __HYPERVISOR_domctl;
+     hypercall.arg[0] = (unsigned long)&domctl;
+ 
+-    rc = ioctl(_dom0_fd, IOCTL_PRIVCMD_HYPERCALL, (ulong)&hypercall);
++    rc = ioctl(_dom0_fd, IOCTL_PRIVCMD_HYPERCALL, (unsigned long)&hypercall);
+     if (domctlarg && sz)
+         munlock(domctlarg, sz);
+     return rc;
+@@ -218,7 +218,7 @@
+     hypercall.arg[0] = (unsigned long)XENVER_capabilities;
+     hypercall.arg[1] = (unsigned long)&xen_caps;
+ 
+-    rc = ioctl(_dom0_fd, IOCTL_PRIVCMD_HYPERCALL, (ulong)&hypercall);
++    rc = ioctl(_dom0_fd, IOCTL_PRIVCMD_HYPERCALL, (unsigned long)&hypercall);
+     munlock(&xen_caps, sizeof(xen_caps));
+     XGTRC("XENCAPS:%s\n", xen_caps);
+