[Xen-changelog] [xen-unstable] [POWERPC][TOOLS] Fix xc.c mismerge.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Hollis Blanchard <hollisb@xxxxxxxxxx>
# Date 1167865915 21600
# Node ID a23587ebcbf6d48c894a3591ff86b79990d22416
# Parent  bcd4bf0220473ba12a6c36e1cafe38d68d284c6b
[POWERPC][TOOLS] Fix xc.c mismerge.
Signed-off-by: Hollis Blanchard <hollisb@xxxxxxxxxx>
---
 tools/python/xen/lowlevel/xc/xc.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff -r bcd4bf022047 -r a23587ebcbf6 tools/python/xen/lowlevel/xc/xc.c
--- a/tools/python/xen/lowlevel/xc/xc.c Wed Jan 03 15:25:58 2007 -0600
+++ b/tools/python/xen/lowlevel/xc/xc.c Wed Jan 03 17:11:55 2007 -0600
@@ -930,7 +930,7 @@ static PyObject *pyxc_alloc_real_mode_ar
         return NULL;
 
     if ( xc_alloc_real_mode_area(self->xc_handle, dom, log) )
-        return PyErr_SetFromErrno(xc_error);
+        return pyxc_error_to_exception();
 
     Py_INCREF(zero);
     return zero;
@@ -944,6 +944,7 @@ static PyObject *pyxc_prose_build(XcObje
     char *image, *ramdisk = NULL, *cmdline = "", *features = NULL;
     int flags = 0;
     int store_evtchn, console_evtchn;
+    unsigned int mem_mb;
     unsigned long store_mfn = 0;
     unsigned long console_mfn = 0;
     void *arch_args = NULL;
@@ -955,22 +956,22 @@ static PyObject *pyxc_prose_build(XcObje
                                 "ramdisk", "cmdline", "flags",
                                 "features", "arch_args", NULL };
 
-    if ( !PyArg_ParseTupleAndKeywords(args, kwds, "iiis|ssiss#", kwd_list,
-                                      &dom, &store_evtchn,
+    if ( !PyArg_ParseTupleAndKeywords(args, kwds, "iiiis|ssiss#", kwd_list,
+                                      &dom, &store_evtchn, &mem_mb,
                                       &console_evtchn, &image,
                                       /* optional */
                                       &ramdisk, &cmdline, &flags,
                                       &features, &arch_args, &unused) )
         return NULL;
 
-    if ( xc_prose_build(self->xc_handle, dom, image,
+    if ( xc_prose_build(self->xc_handle, dom, mem_mb, image,
                         ramdisk, cmdline, features, flags,
                         store_evtchn, &store_mfn,
                         console_evtchn, &console_mfn,
                         arch_args) != 0 ) {
         if (!errno)
              errno = EINVAL;
-        return PyErr_SetFromErrno(xc_error);
+        return pyxc_error_to_exception();
     }
     return Py_BuildValue("{s:i,s:i}", 
                          "store_mfn", store_mfn,

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog