# HG changeset patch
# User Hollis Blanchard <hollisb@xxxxxxxxxx>
# Date 1174514580 18000
# Node ID 265e257388b52929e9e2bc62f9cf0818aac94e67
# Parent ed84ed49bb81e73add5a307e42cf5aeeeac2afd5
[POWERPC][LIBXC] Remove Prose builder.
It is no longer being maintained and probably shouldn't have existed in the
first place, since it was almost identical to xc_linux_build.c.
Signed-off-by: Hollis Blanchard <hollisb@xxxxxxxxxx>
---
tools/libxc/powerpc64/xc_prose_build.c | 215 ---------------------------------
tools/libxc/powerpc64/Makefile | 1
tools/python/xen/lowlevel/xc/xc.c | 51 -------
tools/python/xen/xend/image.py | 30 ----
4 files changed, 297 deletions(-)
diff -r ed84ed49bb81 -r 265e257388b5 tools/libxc/powerpc64/Makefile
--- a/tools/libxc/powerpc64/Makefile Wed Mar 21 17:02:59 2007 -0500
+++ b/tools/libxc/powerpc64/Makefile Wed Mar 21 17:03:00 2007 -0500
@@ -1,7 +1,6 @@ GUEST_SRCS-y += powerpc64/flatdevtree.c
GUEST_SRCS-y += powerpc64/flatdevtree.c
GUEST_SRCS-y += powerpc64/mk_flatdevtree.c
GUEST_SRCS-y += powerpc64/xc_linux_build.c
-GUEST_SRCS-y += powerpc64/xc_prose_build.c
GUEST_SRCS-y += powerpc64/utils.c
CTRL_SRCS-y += powerpc64/xc_memory.c
diff -r ed84ed49bb81 -r 265e257388b5 tools/libxc/powerpc64/xc_prose_build.c
--- a/tools/libxc/powerpc64/xc_prose_build.c Wed Mar 21 17:02:59 2007 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,215 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * Copyright IBM Corporation 2006, 2007
- *
- * Authors: Hollis Blanchard <hollisb@xxxxxxxxxx>
- * Jonathan Appavoo <jappavoo@xxxxxxxxxx>
- */
-
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <inttypes.h>
-
-#include <xen/xen.h>
-#include <xen/memory.h>
-#include <xc_private.h>
-#include <xg_private.h>
-#include <xenctrl.h>
-
-#include "utils.h"
-
-#define INITRD_ADDR (24UL << 20)
-
-static int init_boot_vcpu(
- int xc_handle,
- int domid,
- struct domain_setup_info *dsi,
- unsigned long kern_addr)
-{
- vcpu_guest_context_t ctxt;
- int rc;
-
- memset(&ctxt.user_regs, 0x55, sizeof(ctxt.user_regs));
- ctxt.user_regs.pc = dsi->v_kernentry;
- ctxt.user_regs.msr = 0;
- ctxt.user_regs.gprs[1] = 0; /* Linux uses its own stack */
- ctxt.user_regs.gprs[3] = 0;
- ctxt.user_regs.gprs[4] = kern_addr;
- ctxt.user_regs.gprs[5] = 0; /* reserved for specifying OF handler */
- /* There is a buggy kernel that does not zero the "local_paca", so
- * we must make sure this register is 0 */
- ctxt.user_regs.gprs[13] = 0;
-
- DPRINTF("xc_vcpu_setvcpucontext:\n"
- " pc 0x%016"PRIx64", msr 0x%016"PRIx64"\n"
- " r1-5 %016"PRIx64" %016"PRIx64" %016"PRIx64" %016"PRIx64
- " %016"PRIx64"\n",
- ctxt.user_regs.pc, ctxt.user_regs.msr,
- ctxt.user_regs.gprs[1],
- ctxt.user_regs.gprs[2],
- ctxt.user_regs.gprs[3],
- ctxt.user_regs.gprs[4],
- ctxt.user_regs.gprs[5]);
- rc = xc_vcpu_setcontext(xc_handle, domid, 0, &ctxt);
- if (rc < 0)
- perror("setdomaininfo");
-
- return rc;
-}
-
-static int load_initrd(
- int xc_handle,
- int domid,
- xen_pfn_t *page_array,
- const char *initrd_path,
- unsigned long *base,
- unsigned long *len)
-{
- uint8_t *initrd_img;
- int rc = -1;
-
- /* load the initrd file */
- initrd_img = load_file(initrd_path, len);
- if (initrd_img == NULL)
- return -1;
-
- DPRINTF("copying initrd to 0x%lx[0x%lx]\n", INITRD_ADDR, *len);
- if (install_image(xc_handle, domid, page_array, initrd_img, INITRD_ADDR,
- *len))
- goto out;
-
- *base = INITRD_ADDR;
- rc = 0;
-
-out:
- free(initrd_img);
- return rc;
-}
-
-static unsigned long create_start_info(
- start_info_t *start_info,
- unsigned int console_evtchn, unsigned int store_evtchn,
- unsigned long nr_pages, unsigned long rma_pages, const char *cmdline)
-{
- unsigned long start_info_addr;
- uint64_t rma_top;
-
- memset(start_info, 0, sizeof(*start_info));
- snprintf(start_info->magic, sizeof(start_info->magic),
- "xen-%d.%d-powerpc64HV", 3, 0);
-
- rma_top = rma_pages << PAGE_SHIFT;
- DPRINTF("RMA top = 0x%"PRIX64"\n", rma_top);
-
- start_info->nr_pages = nr_pages;
- start_info->shared_info = rma_top - PAGE_SIZE;
- start_info->store_mfn = (rma_top >> PAGE_SHIFT) - 2;
- start_info->store_evtchn = store_evtchn;
- start_info->console.domU.mfn = (rma_top >> PAGE_SHIFT) - 3;
- start_info->console.domU.evtchn = console_evtchn;
- strncpy((char *)start_info->cmd_line, cmdline, MAX_GUEST_CMDLINE);
- /* just in case we truncated cmdline with strncpy add 0 at the end */
- start_info->cmd_line[MAX_GUEST_CMDLINE-1]=0;
- start_info_addr = rma_top - 4*PAGE_SIZE;
-
- return start_info_addr;
-}
-
-static void free_page_array(xen_pfn_t *page_array)
-{
- free(page_array);
-}
-
-int xc_prose_build(int xc_handle,
- uint32_t domid,
- unsigned int mem_mb,
- const char *image_name,
- const char *initrd_name,
- const char *cmdline,
- const char *features,
- unsigned long flags,
- unsigned int store_evtchn,
- unsigned long *store_mfn,
- unsigned int console_evtchn,
- unsigned long *console_mfn)
-{
- start_info_t start_info;
- struct domain_setup_info dsi;
- xen_pfn_t *page_array = NULL;
- unsigned long nr_pages;
- unsigned long kern_addr;
- unsigned long initrd_base = 0;
- unsigned long initrd_len = 0;
- unsigned long start_info_addr;
- unsigned long rma_pages;
- int rc = 0;
-
- DPRINTF("%s\n", __func__);
-
- DPRINTF("cmdline=%s\n", cmdline);
-
- nr_pages = mem_mb << (20 - PAGE_SHIFT);
- DPRINTF("nr_pages 0x%lx\n", nr_pages);
-
- rma_pages = (1 << 26) >> PAGE_SHIFT; /* 64 MB */
-
- if (get_rma_page_array(xc_handle, domid, &page_array, rma_pages)) {
- rc = -1;
- goto out;
- }
-
- DPRINTF("loading image '%s'\n", image_name);
- if (load_elf_kernel(xc_handle, domid, image_name, &dsi, page_array)) {
- rc = -1;
- goto out;
- }
- kern_addr = 0;
-
- if (initrd_name && initrd_name[0] != '\0') {
- DPRINTF("loading initrd '%s'\n", initrd_name);
- if (load_initrd(xc_handle, domid, page_array, initrd_name,
- &initrd_base, &initrd_len)) {
- rc = -1;
- goto out;
- }
- }
-
- /* start_info stuff: about to be removed */
- start_info_addr = create_start_info(&start_info, console_evtchn,
- store_evtchn, nr_pages,
- rma_pages, cmdline);
- *console_mfn = page_array[start_info.console.domU.mfn];
- *store_mfn = page_array[start_info.store_mfn];
- if (install_image(xc_handle, domid, page_array, &start_info,
- start_info_addr, sizeof(start_info_t))) {
- rc = -1;
- goto out;
- }
-
- if (init_boot_vcpu(xc_handle, domid, &dsi, kern_addr)) {
- rc = -1;
- goto out;
- }
-
-out:
- free_page_array(page_array);
- return rc;
-}
diff -r ed84ed49bb81 -r 265e257388b5 tools/python/xen/lowlevel/xc/xc.c
--- a/tools/python/xen/lowlevel/xc/xc.c Wed Mar 21 17:02:59 2007 -0500
+++ b/tools/python/xen/lowlevel/xc/xc.c Wed Mar 21 17:03:00 2007 -0500
@@ -1042,46 +1042,6 @@ static PyObject *pyxc_alloc_real_mode_ar
Py_INCREF(zero);
return zero;
}
-
-static PyObject *pyxc_prose_build(XcObject *self,
- PyObject *args,
- PyObject *kwds)
-{
- uint32_t dom;
- char *image, *ramdisk = NULL, *cmdline = "", *features = NULL;
- int flags = 0;
- int store_evtchn, console_evtchn;
- unsigned int mem_mb;
- unsigned long store_mfn = 0;
- unsigned long console_mfn = 0;
- int unused;
-
- static char *kwd_list[] = { "dom", "store_evtchn",
- "console_evtchn", "image", "memsize",
- /* optional */
- "ramdisk", "cmdline", "flags",
- "features", NULL };
-
- if ( !PyArg_ParseTupleAndKeywords(args, kwds, "iiiis|ssis#", kwd_list,
- &dom, &store_evtchn, &mem_mb,
- &console_evtchn, &image,
- /* optional */
- &ramdisk, &cmdline, &flags,
- &features, &unused) )
- return NULL;
-
- if ( xc_prose_build(self->xc_handle, dom, mem_mb, image,
- ramdisk, cmdline, features, flags,
- store_evtchn, &store_mfn,
- console_evtchn, &console_mfn) != 0 ) {
- if (!errno)
- errno = EINVAL;
- return pyxc_error_to_exception();
- }
- return Py_BuildValue("{s:i,s:i}",
- "store_mfn", store_mfn,
- "console_mfn", console_mfn);
-}
#endif /* powerpc */
static PyMethodDef pyxc_methods[] = {
@@ -1427,17 +1387,6 @@ static PyMethodDef pyxc_methods[] = {
"Allocate a domain's real mode area.\n"
" dom [int]: Identifier of domain.\n"
" log [int]: Specifies the area's size.\n"
- "Returns: [int] 0 on success; -1 on error.\n" },
-
- { "arch_prose_build",
- (PyCFunction)pyxc_prose_build,
- METH_VARARGS | METH_KEYWORDS, "\n"
- "Build a new Linux guest OS.\n"
- " dom [int]: Identifier of domain to build into.\n"
- " image [str]: Name of kernel image file. May be gzipped.\n"
- " 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" },
#endif /* __powerpc */
diff -r ed84ed49bb81 -r 265e257388b5 tools/python/xen/xend/image.py
--- a/tools/python/xen/xend/image.py Wed Mar 21 17:02:59 2007 -0500
+++ b/tools/python/xen/xend/image.py Wed Mar 21 17:03:00 2007 -0500
@@ -228,35 +228,6 @@ class PPC_LinuxImageHandler(LinuxImageHa
return max(maxmem_kb / 64, shadow_mem_kb)
-
-class PPC_ProseImageHandler(PPC_LinuxImageHandler):
-
- ostype = "prose"
-
- def buildDomain(self):
- store_evtchn = self.vm.getStorePort()
- console_evtchn = self.vm.getConsolePort()
-
- mem_mb = self.getRequiredInitialReservation() / 1024
-
- log.debug("dom = %d", self.vm.getDomid())
- log.debug("memsize = %d", mem_mb)
- log.debug("image = %s", self.kernel)
- log.debug("store_evtchn = %d", store_evtchn)
- log.debug("console_evtchn = %d", console_evtchn)
- log.debug("cmdline = %s", self.cmdline)
- log.debug("ramdisk = %s", self.ramdisk)
- log.debug("vcpus = %d", self.vm.getVCpuCount())
- log.debug("features = %s", self.vm.getFeatures())
-
- return xc.arch_prose_build(dom = self.vm.getDomid(),
- memsize = mem_mb,
- image = self.kernel,
- store_evtchn = store_evtchn,
- console_evtchn = console_evtchn,
- cmdline = self.cmdline,
- ramdisk = self.ramdisk,
- features = self.vm.getFeatures())
class HVMImageHandler(ImageHandler):
@@ -616,7 +587,6 @@ _handlers = {
_handlers = {
"powerpc": {
"linux": PPC_LinuxImageHandler,
- "prose": PPC_ProseImageHandler,
},
"ia64": {
"linux": LinuxImageHandler,
_______________________________________________
Xen-ppc-devel mailing list
Xen-ppc-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-ppc-devel
|
Home