diff options
author | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-06-24 10:54:54 +0000 |
---|---|---|
committer | kaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk> | 2005-06-24 10:54:54 +0000 |
commit | dc0838d4990d1975a5eda824a61db310e98dfd58 (patch) | |
tree | e0911cdf631c78a3b6375cffe26973e6aebd8621 | |
parent | 06420e5d04dd8b3ccb5785f821b9368e66235c01 (diff) | |
download | xen-dc0838d4990d1975a5eda824a61db310e98dfd58.tar.gz xen-dc0838d4990d1975a5eda824a61db310e98dfd58.tar.bz2 xen-dc0838d4990d1975a5eda824a61db310e98dfd58.zip |
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>
-rw-r--r-- | tools/libxc/xc.h | 8 | ||||
-rw-r--r-- | tools/python/xen/lowlevel/xc/xc.c | 36 | ||||
-rw-r--r-- | tools/python/xen/xend/XendDomainInfo.py | 2 | ||||
-rw-r--r-- | tools/python/xen/xend/image.py | 13 |
4 files changed, 0 insertions, 59 deletions
diff --git a/tools/libxc/xc.h b/tools/libxc/xc.h index 46802edfb2..12d906abb1 100644 --- a/tools/libxc/xc.h +++ b/tools/libxc/xc.h @@ -263,14 +263,6 @@ int xc_linux_build(int xc_handle, unsigned int store_evtchn, unsigned long *store_mfn); -int -xc_plan9_build (int xc_handle, - u32 domid, - const char *image_name, - const char *cmdline, - unsigned int control_evtchn, - unsigned long flags); - struct mem_map; int xc_vmx_build(int xc_handle, u32 domid, diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c index 81721d961e..a7f08333f1 100644 --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/tools/python/xen/lowlevel/xc/xc.c @@ -286,33 +286,6 @@ static PyObject *pyxc_linux_build(PyObject *self, return Py_BuildValue("{s:i}", "store_mfn", store_mfn); } -static PyObject *pyxc_plan9_build(PyObject *self, - PyObject *args, - PyObject *kwds) -{ - XcObject *xc = (XcObject *)self; - - u32 dom; - char *image, *ramdisk = NULL, *cmdline = ""; - int control_evtchn, flags = 0; - - static char *kwd_list[] = { "dom", "control_evtchn", - "image", "ramdisk", "cmdline", "flags", - NULL }; - - if ( !PyArg_ParseTupleAndKeywords(args, kwds, "iis|ssi", kwd_list, - &dom, &control_evtchn, - &image, &ramdisk, &cmdline, &flags) ) - return NULL; - - if ( xc_plan9_build(xc->xc_handle, dom, image, - cmdline, control_evtchn, flags) != 0 ) - return PyErr_SetFromErrno(xc_error); - - Py_INCREF(zero); - return zero; -} - static PyObject *pyxc_vmx_build(PyObject *self, PyObject *args, PyObject *kwds) @@ -931,15 +904,6 @@ static PyMethodDef pyxc_methods[] = { " vcpus [int, 1]: Number of Virtual CPUS in domain.\n\n" "Returns: [int] 0 on success; -1 on error.\n" }, - { "plan9_build", - (PyCFunction)pyxc_plan9_build, - METH_VARARGS | METH_KEYWORDS, "\n" - "Build a new Plan 9 guest OS.\n" - " dom [long]: Identifier of domain to build into.\n" - " image [str]: Name of kernel image file. May be gzipped.\n" - " cmdline [str, n/a]: Kernel parameters, if any.\n\n" - "Returns: [int] 0 on success; -1 on error.\n" }, - { "vmx_build", (PyCFunction)pyxc_vmx_build, METH_VARARGS | METH_KEYWORDS, "\n" diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py index 2507140627..4716f4958e 100644 --- a/tools/python/xen/xend/XendDomainInfo.py +++ b/tools/python/xen/xend/XendDomainInfo.py @@ -1020,11 +1020,9 @@ from image import \ addImageHandlerClass, \ ImageHandler, \ LinuxImageHandler, \ - Plan9ImageHandler, \ VmxImageHandler addImageHandlerClass(LinuxImageHandler) -addImageHandlerClass(Plan9ImageHandler) addImageHandlerClass(VmxImageHandler) # Ignore the fields we already handle. diff --git a/tools/python/xen/xend/image.py b/tools/python/xen/xend/image.py index 5abc121e86..ac96641ce9 100644 --- a/tools/python/xen/xend/image.py +++ b/tools/python/xen/xend/image.py @@ -221,19 +221,6 @@ class LinuxImageHandler(ImageHandler): return 0 return ret -class Plan9ImageHandler(ImageHandler): - - ostype = "plan9" - - def buildDomain(self): - return xc.plan9_build(dom = self.vm.getDomain(), - image = self.kernel, - control_evtchn = self.vm.channel.getRemotePort(), - cmdline = self.cmdline, - ramdisk = self.ramdisk, - flags = self.flags, - vcpus = self.vm.vcpus) - class VmxImageHandler(ImageHandler): __exports__ = ImageHandler.__exports__ + [ |