ChangeSet 1.1753, 2005/06/24 11:54:54+01:00, kaf24@xxxxxxxxxxxxxxxxxxxx
Properly remove old plan9 builder from xc header fiel and from xend.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
libxc/xc.h | 8 --------
python/xen/lowlevel/xc/xc.c | 36 ------------------------------------
python/xen/xend/XendDomainInfo.py | 2 --
python/xen/xend/image.py | 13 -------------
4 files changed, 59 deletions(-)
diff -Nru a/tools/libxc/xc.h b/tools/libxc/xc.h
--- a/tools/libxc/xc.h 2005-06-24 07:03:00 -04:00
+++ b/tools/libxc/xc.h 2005-06-24 07:03:00 -04:00
@@ -263,14 +263,6 @@
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 -Nru a/tools/python/xen/lowlevel/xc/xc.c
b/tools/python/xen/lowlevel/xc/xc.c
--- a/tools/python/xen/lowlevel/xc/xc.c 2005-06-24 07:03:00 -04:00
+++ b/tools/python/xen/lowlevel/xc/xc.c 2005-06-24 07:03:00 -04:00
@@ -286,33 +286,6 @@
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)
@@ -929,15 +902,6 @@
" ramdisk [str, n/a]: Name of ramdisk file, if any.\n"
" cmdline [str, n/a]: Kernel parameters, if any.\n\n"
" 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",
diff -Nru a/tools/python/xen/xend/XendDomainInfo.py
b/tools/python/xen/xend/XendDomainInfo.py
--- a/tools/python/xen/xend/XendDomainInfo.py 2005-06-24 07:03:00 -04:00
+++ b/tools/python/xen/xend/XendDomainInfo.py 2005-06-24 07:03:00 -04:00
@@ -1020,11 +1020,9 @@
addImageHandlerClass, \
ImageHandler, \
LinuxImageHandler, \
- Plan9ImageHandler, \
VmxImageHandler
addImageHandlerClass(LinuxImageHandler)
-addImageHandlerClass(Plan9ImageHandler)
addImageHandlerClass(VmxImageHandler)
# Ignore the fields we already handle.
diff -Nru a/tools/python/xen/xend/image.py b/tools/python/xen/xend/image.py
--- a/tools/python/xen/xend/image.py 2005-06-24 07:03:00 -04:00
+++ b/tools/python/xen/xend/image.py 2005-06-24 07:03:00 -04:00
@@ -221,19 +221,6 @@
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__ + [
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home