ia64/xen-unstable

changeset 5578:b38b3893fa76

bitkeeper revision 1.1753 (42bbe67ePvjh9K0djYf6xRw2rGNreQ)

Properly remove old plan9 builder from xc header fiel and from xend.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Fri Jun 24 10:54:54 2005 +0000 (2005-06-24)
parents 0b5f09002630
children 819726e7dd2b
files tools/libxc/xc.h tools/python/xen/lowlevel/xc/xc.c tools/python/xen/xend/XendDomainInfo.py tools/python/xen/xend/image.py
line diff
     1.1 --- a/tools/libxc/xc.h	Fri Jun 24 10:51:38 2005 +0000
     1.2 +++ b/tools/libxc/xc.h	Fri Jun 24 10:54:54 2005 +0000
     1.3 @@ -263,14 +263,6 @@ int xc_linux_build(int xc_handle,
     1.4                     unsigned int store_evtchn,
     1.5                     unsigned long *store_mfn);
     1.6  
     1.7 -int
     1.8 -xc_plan9_build (int xc_handle,
     1.9 -                u32 domid, 
    1.10 -                const char *image_name,
    1.11 -                const char *cmdline, 
    1.12 -                unsigned int control_evtchn, 
    1.13 -                unsigned long flags);
    1.14 -
    1.15  struct mem_map;
    1.16  int xc_vmx_build(int xc_handle,
    1.17                   u32 domid,
     2.1 --- a/tools/python/xen/lowlevel/xc/xc.c	Fri Jun 24 10:51:38 2005 +0000
     2.2 +++ b/tools/python/xen/lowlevel/xc/xc.c	Fri Jun 24 10:54:54 2005 +0000
     2.3 @@ -286,33 +286,6 @@ static PyObject *pyxc_linux_build(PyObje
     2.4      return Py_BuildValue("{s:i}", "store_mfn", store_mfn);
     2.5  }
     2.6  
     2.7 -static PyObject *pyxc_plan9_build(PyObject *self,
     2.8 -                                  PyObject *args,
     2.9 -                                  PyObject *kwds)
    2.10 -{
    2.11 -    XcObject *xc = (XcObject *)self;
    2.12 -
    2.13 -    u32   dom;
    2.14 -    char *image, *ramdisk = NULL, *cmdline = "";
    2.15 -    int   control_evtchn, flags = 0;
    2.16 -
    2.17 -    static char *kwd_list[] = { "dom", "control_evtchn",
    2.18 -                                "image", "ramdisk", "cmdline", "flags",
    2.19 -                                NULL };
    2.20 -
    2.21 -    if ( !PyArg_ParseTupleAndKeywords(args, kwds, "iis|ssi", kwd_list,
    2.22 -                                      &dom, &control_evtchn,
    2.23 -                                      &image, &ramdisk, &cmdline, &flags) )
    2.24 -        return NULL;
    2.25 -
    2.26 -    if ( xc_plan9_build(xc->xc_handle, dom, image,
    2.27 -                        cmdline, control_evtchn, flags) != 0 )
    2.28 -        return PyErr_SetFromErrno(xc_error);
    2.29 -
    2.30 -    Py_INCREF(zero);
    2.31 -    return zero;
    2.32 -}
    2.33 -
    2.34  static PyObject *pyxc_vmx_build(PyObject *self,
    2.35                                    PyObject *args,
    2.36                                    PyObject *kwds)
    2.37 @@ -931,15 +904,6 @@ static PyMethodDef pyxc_methods[] = {
    2.38        " vcpus   [int, 1]:   Number of Virtual CPUS in domain.\n\n"
    2.39        "Returns: [int] 0 on success; -1 on error.\n" },
    2.40  
    2.41 -    { "plan9_build",
    2.42 -      (PyCFunction)pyxc_plan9_build,
    2.43 -      METH_VARARGS | METH_KEYWORDS, "\n"
    2.44 -      "Build a new Plan 9 guest OS.\n"
    2.45 -      " dom     [long]:     Identifier of domain to build into.\n"
    2.46 -      " image   [str]:      Name of kernel image file. May be gzipped.\n"
    2.47 -      " cmdline [str, n/a]: Kernel parameters, if any.\n\n"
    2.48 -      "Returns: [int] 0 on success; -1 on error.\n" },
    2.49 -
    2.50      { "vmx_build", 
    2.51        (PyCFunction)pyxc_vmx_build, 
    2.52        METH_VARARGS | METH_KEYWORDS, "\n"
     3.1 --- a/tools/python/xen/xend/XendDomainInfo.py	Fri Jun 24 10:51:38 2005 +0000
     3.2 +++ b/tools/python/xen/xend/XendDomainInfo.py	Fri Jun 24 10:54:54 2005 +0000
     3.3 @@ -1020,11 +1020,9 @@ from image import          \
     3.4       addImageHandlerClass, \
     3.5       ImageHandler,         \
     3.6       LinuxImageHandler,    \
     3.7 -     Plan9ImageHandler,    \
     3.8       VmxImageHandler
     3.9  
    3.10  addImageHandlerClass(LinuxImageHandler)
    3.11 -addImageHandlerClass(Plan9ImageHandler)
    3.12  addImageHandlerClass(VmxImageHandler)
    3.13  
    3.14  # Ignore the fields we already handle.
     4.1 --- a/tools/python/xen/xend/image.py	Fri Jun 24 10:51:38 2005 +0000
     4.2 +++ b/tools/python/xen/xend/image.py	Fri Jun 24 10:54:54 2005 +0000
     4.3 @@ -221,19 +221,6 @@ class LinuxImageHandler(ImageHandler):
     4.4              return 0
     4.5          return ret
     4.6  
     4.7 -class Plan9ImageHandler(ImageHandler):
     4.8 -
     4.9 -    ostype = "plan9"
    4.10 -
    4.11 -    def buildDomain(self):
    4.12 -        return xc.plan9_build(dom            = self.vm.getDomain(),
    4.13 -                              image          = self.kernel,
    4.14 -                              control_evtchn = self.vm.channel.getRemotePort(),
    4.15 -                              cmdline        = self.cmdline,
    4.16 -                              ramdisk        = self.ramdisk,
    4.17 -                              flags          = self.flags,
    4.18 -                              vcpus          = self.vm.vcpus)
    4.19 -
    4.20  class VmxImageHandler(ImageHandler):
    4.21  
    4.22      __exports__ = ImageHandler.__exports__ + [