ia64/xen-unstable

changeset 7448:fb265175f47c

This patch fixes the problem that VMX guest can not get brought up on
current tip (changeset 7425).

Signed-off-by: Xin Li <xin.b.li@intel.com>
author emellor@leeni.uk.xensource.com
date Wed Oct 19 18:18:30 2005 +0100 (2005-10-19)
parents 471e8ca6bc1f
children 5d746b39e873 6a7253b1ce8a
files tools/python/xen/lowlevel/xc/xc.c
line diff
     1.1 --- a/tools/python/xen/lowlevel/xc/xc.c	Wed Oct 19 16:25:39 2005 +0100
     1.2 +++ b/tools/python/xen/lowlevel/xc/xc.c	Wed Oct 19 18:18:30 2005 +0100
     1.3 @@ -424,11 +424,11 @@ static PyObject *pyxc_vmx_build(PyObject
     1.4      unsigned long store_mfn = 0;
     1.5  
     1.6      static char *kwd_list[] = { "dom", "control_evtchn", "store_evtchn",
     1.7 -                                "memsize", "image", "flags", "vcpus", NULL };
     1.8 +                                "memsize", "image", "vcpus", NULL };
     1.9  
    1.10 -    if ( !PyArg_ParseTupleAndKeywords(args, kwds, "iiiisii", kwd_list,
    1.11 +    if ( !PyArg_ParseTupleAndKeywords(args, kwds, "iiiisi", kwd_list,
    1.12                                        &dom, &control_evtchn, &store_evtchn,
    1.13 -                                      &memsize, &image, &flags, &vcpus) )
    1.14 +                                      &memsize, &image, &vcpus) )
    1.15          return NULL;
    1.16  
    1.17      if ( xc_vmx_build(xc->xc_handle, dom, memsize, image, control_evtchn,
    1.18 @@ -968,12 +968,10 @@ static PyMethodDef pyxc_methods[] = {
    1.19      { "vmx_build", 
    1.20        (PyCFunction)pyxc_vmx_build, 
    1.21        METH_VARARGS | METH_KEYWORDS, "\n"
    1.22 -      "Build a new Linux guest OS.\n"
    1.23 +      "Build a new VMX guest OS.\n"
    1.24        " dom     [int]:      Identifier of domain to build into.\n"
    1.25 -      " image   [str]:      Name of kernel image file. May be gzipped.\n"
    1.26 -      " memmap  [str]: 	    Memory map.\n\n"
    1.27 -      " ramdisk [str, n/a]: Name of ramdisk file, if any.\n"
    1.28 -      " cmdline [str, n/a]: Kernel parameters, if any.\n\n"
    1.29 +      " image   [str]:      Name of VMX loader image file.\n"
    1.30 +      " vcpus   [int, 1]:   Number of Virtual CPUS in domain.\n\n"
    1.31        "Returns: [int] 0 on success; -1 on error.\n" },
    1.32  
    1.33      { "bvtsched_global_set",