File clone-0.9.4.patch of Package libvirt - j0ke.net Open Build Service

File clone-0.9.4.patch of Package libvirt (Revision 83b96298a7cc99f92326e8bf62bcf0db)

Currently displaying revision 83b96298a7cc99f92326e8bf62bcf0db, show latest

--- src/lxc/lxc_container.c.orig	2011-07-25 07:43:18.000000000 +0200
+++ src/lxc/lxc_container.c	2011-08-08 21:00:36.682640642 +0200
@@ -991,6 +991,9 @@
                               handshakefd};
 
     /* allocate a stack for the container */
+#ifdef __ia64__
+    stacksize *= 2;
+#endif
     if (VIR_ALLOC_N(stack, stacksize) < 0) {
         virReportOOMError();
         return -1;
@@ -1009,7 +1012,11 @@
         cflags |= CLONE_NEWNET;
     }
 
+#ifdef __ia64__
+    pid = __clone2(lxcContainerChild, stack, stacksize, flags, &args);
+#else
     pid = clone(lxcContainerChild, stacktop, cflags, &args);
+#endif
     VIR_FREE(stack);
     VIR_DEBUG("clone() completed, new container PID is %d", pid);
 
@@ -1036,6 +1043,7 @@
     char *childStack;
     char *stack;
     int childStatus;
+    int stacksize = getpagesize() * 4;
 
     if (features & LXC_CONTAINER_FEATURE_USER)
         flags |= CLONE_NEWUSER;
@@ -1043,14 +1051,21 @@
     if (features & LXC_CONTAINER_FEATURE_NET)
         flags |= CLONE_NEWNET;
 
-    if (VIR_ALLOC_N(stack, getpagesize() * 4) < 0) {
+#ifdef __ia64__
+    stacksize *= 2;
+#endif
+    if (VIR_ALLOC_N(stack, stacksize) < 0) {
         VIR_DEBUG("Unable to allocate stack");
         return -1;
     }
 
-    childStack = stack + (getpagesize() * 4);
+    childStack = stack + stacksize;
 
+#ifdef __ia64__
+    cpid = __clone2(lxcContainerDummyChild, stack, stacksize, flags, NULL);
+#else
     cpid = clone(lxcContainerDummyChild, childStack, flags, NULL);
+#endif
     VIR_FREE(stack);
     if (cpid < 0) {
         char ebuf[1024];