# HG changeset patch
# User djm@xxxxxxxxxxxxxxx
# Node ID ba78f3912b294e6a6f210e26d52776d03d57ca73
# Parent 51f32d60536b314333b7e0711cbb4864070c5e38
Remove DOMU_BUILD_STAGING and supporting code entirely, no longer needed
diff -r 51f32d60536b -r ba78f3912b29 xen/arch/ia64/xen/domain.c
--- a/xen/arch/ia64/xen/domain.c Fri Nov 18 00:35:14 2005
+++ b/xen/arch/ia64/xen/domain.c Fri Nov 18 16:01:10 2005
@@ -51,12 +51,6 @@
unsigned long dom0_start = -1L;
unsigned long dom0_size = 512*1024*1024;
unsigned long dom0_align = 64*1024*1024;
-#ifdef DOMU_BUILD_STAGING
-unsigned long domU_staging_size = 32*1024*1024; //FIXME: Should be configurable
-unsigned long domU_staging_start;
-unsigned long domU_staging_align = 64*1024;
-unsigned long *domU_staging_area;
-#endif
// initialized by arch/ia64/setup.c:find_initrd()
unsigned long initrd_start = 0, initrd_end = 0;
@@ -750,46 +744,6 @@
}
-#ifdef DOMU_BUILD_STAGING
-void alloc_domU_staging(void)
-{
- domU_staging_size = 32*1024*1024; //FIXME: Should be configurable
- printf("alloc_domU_staging: starting (initializing %d
MB...)\n",domU_staging_size/(1024*1024));
- domU_staging_start = alloc_boot_pages(
- domU_staging_size >> PAGE_SHIFT, domU_staging_align >> PAGE_SHIFT);
- domU_staging_start <<= PAGE_SHIFT;
- if (!domU_staging_size) {
- printf("alloc_domU_staging: can't allocate, spinning...\n");
- while(1);
- }
- else domU_staging_area = (unsigned long *)__va(domU_staging_start);
- printf("alloc_domU_staging: domU_staging_area=%p\n",domU_staging_area);
-
-}
-
-unsigned long
-domU_staging_read_8(unsigned long at)
-{
- // no way to return errors so just do it
- return domU_staging_area[at>>3];
-
-}
-
-unsigned long
-domU_staging_write_32(unsigned long at, unsigned long a, unsigned long b,
- unsigned long c, unsigned long d)
-{
- if (at + 32 > domU_staging_size) return -1;
- if (at & 0x1f) return -1;
- at >>= 3;
- domU_staging_area[at++] = a;
- domU_staging_area[at++] = b;
- domU_staging_area[at++] = c;
- domU_staging_area[at] = d;
- return 0;
-
-}
-#endif
/*
* Domain 0 has direct access to all devices absolutely. However
@@ -1076,29 +1030,6 @@
}
#endif
-// FIXME: When dom0 can construct domains, this goes away (or is rewritten)
-int launch_domainU(unsigned long size)
-{
-#ifdef CLONE_DOMAIN0
- static int next = CLONE_DOMAIN0+1;
-#else
- static int next = 1;
-#endif
-
- struct domain *d = do_createdomain(next,0);
- if (!d) {
- printf("launch_domainU: couldn't create\n");
- return 1;
- }
- else next++;
- if (construct_domU(d, (unsigned long)domU_staging_area, size,0,0,0)) {
- printf("launch_domainU: couldn't construct(id=%d,%lx,%lx)\n",
- d->domain_id,domU_staging_area,size);
- return 2;
- }
- domain_unpause_by_systemcontroller(d);
-}
-
void machine_restart(char * __unused)
{
if (platform_is_hp_ski()) dummy();
diff -r 51f32d60536b -r ba78f3912b29 xen/arch/ia64/xen/hypercall.c
--- a/xen/arch/ia64/xen/hypercall.c Fri Nov 18 00:35:14 2005
+++ b/xen/arch/ia64/xen/hypercall.c Fri Nov 18 16:01:10 2005
@@ -123,32 +123,16 @@
// FIXME: need fixes in efi.h from 2.6.9
regs->r8 = EFI_UNSUPPORTED;
break;
- case 0xffff: // test dummy hypercall
+ case 0xffff:
regs->r8 = dump_privop_counts_to_user(
vcpu_get_gr(v,32),
vcpu_get_gr(v,33));
break;
- case 0xfffe: // test dummy hypercall
+ case 0xfffe:
regs->r8 = zero_privop_counts_to_user(
vcpu_get_gr(v,32),
vcpu_get_gr(v,33));
break;
- case 0xfffd: // test dummy hypercall
- regs->r8 = launch_domainU(
- vcpu_get_gr(v,32));
- break;
- case 0xfffc: // test dummy hypercall
- regs->r8 = domU_staging_write_32(
- vcpu_get_gr(v,32),
- vcpu_get_gr(v,33),
- vcpu_get_gr(v,34),
- vcpu_get_gr(v,35),
- vcpu_get_gr(v,36));
- break;
- case 0xfffb: // test dummy hypercall
- regs->r8 = domU_staging_read_8(vcpu_get_gr(v,32));
- break;
-
case __HYPERVISOR_dom0_op:
regs->r8 = do_dom0_op(regs->r14);
break;
diff -r 51f32d60536b -r ba78f3912b29 xen/arch/ia64/xen/xensetup.c
--- a/xen/arch/ia64/xen/xensetup.c Fri Nov 18 00:35:14 2005
+++ b/xen/arch/ia64/xen/xensetup.c Fri Nov 18 16:01:10 2005
@@ -268,9 +268,6 @@
__ia64_init_fpu();
alloc_dom0();
-#ifdef DOMU_BUILD_STAGING
- alloc_domU_staging();
-#endif
end_boot_allocator();
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home