ia64/xen-unstable

changeset 13924:a23587ebcbf6

[POWERPC][TOOLS] Fix xc.c mismerge.
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
author Hollis Blanchard <hollisb@us.ibm.com>
date Wed Jan 03 17:11:55 2007 -0600 (2007-01-03)
parents bcd4bf022047
children 6b82bbbedbe1
files tools/python/xen/lowlevel/xc/xc.c
line diff
     1.1 --- a/tools/python/xen/lowlevel/xc/xc.c	Wed Jan 03 15:25:58 2007 -0600
     1.2 +++ b/tools/python/xen/lowlevel/xc/xc.c	Wed Jan 03 17:11:55 2007 -0600
     1.3 @@ -930,7 +930,7 @@ static PyObject *pyxc_alloc_real_mode_ar
     1.4          return NULL;
     1.5  
     1.6      if ( xc_alloc_real_mode_area(self->xc_handle, dom, log) )
     1.7 -        return PyErr_SetFromErrno(xc_error);
     1.8 +        return pyxc_error_to_exception();
     1.9  
    1.10      Py_INCREF(zero);
    1.11      return zero;
    1.12 @@ -944,6 +944,7 @@ static PyObject *pyxc_prose_build(XcObje
    1.13      char *image, *ramdisk = NULL, *cmdline = "", *features = NULL;
    1.14      int flags = 0;
    1.15      int store_evtchn, console_evtchn;
    1.16 +    unsigned int mem_mb;
    1.17      unsigned long store_mfn = 0;
    1.18      unsigned long console_mfn = 0;
    1.19      void *arch_args = NULL;
    1.20 @@ -955,22 +956,22 @@ static PyObject *pyxc_prose_build(XcObje
    1.21                                  "ramdisk", "cmdline", "flags",
    1.22                                  "features", "arch_args", NULL };
    1.23  
    1.24 -    if ( !PyArg_ParseTupleAndKeywords(args, kwds, "iiis|ssiss#", kwd_list,
    1.25 -                                      &dom, &store_evtchn,
    1.26 +    if ( !PyArg_ParseTupleAndKeywords(args, kwds, "iiiis|ssiss#", kwd_list,
    1.27 +                                      &dom, &store_evtchn, &mem_mb,
    1.28                                        &console_evtchn, &image,
    1.29                                        /* optional */
    1.30                                        &ramdisk, &cmdline, &flags,
    1.31                                        &features, &arch_args, &unused) )
    1.32          return NULL;
    1.33  
    1.34 -    if ( xc_prose_build(self->xc_handle, dom, image,
    1.35 +    if ( xc_prose_build(self->xc_handle, dom, mem_mb, image,
    1.36                          ramdisk, cmdline, features, flags,
    1.37                          store_evtchn, &store_mfn,
    1.38                          console_evtchn, &console_mfn,
    1.39                          arch_args) != 0 ) {
    1.40          if (!errno)
    1.41               errno = EINVAL;
    1.42 -        return PyErr_SetFromErrno(xc_error);
    1.43 +        return pyxc_error_to_exception();
    1.44      }
    1.45      return Py_BuildValue("{s:i,s:i}", 
    1.46                           "store_mfn", store_mfn,