ia64/xen-unstable

changeset 7740:ba78f3912b29

Remove DOMU_BUILD_STAGING and supporting code entirely, no longer needed
author djm@kirby.fc.hp.com
date Fri Nov 18 10:01:10 2005 -0600 (2005-11-18)
parents 51f32d60536b
children 14393678d999
files xen/arch/ia64/xen/domain.c xen/arch/ia64/xen/hypercall.c xen/arch/ia64/xen/xensetup.c
line diff
     1.1 --- a/xen/arch/ia64/xen/domain.c	Thu Nov 17 18:35:14 2005 -0600
     1.2 +++ b/xen/arch/ia64/xen/domain.c	Fri Nov 18 10:01:10 2005 -0600
     1.3 @@ -51,12 +51,6 @@
     1.4  unsigned long dom0_start = -1L;
     1.5  unsigned long dom0_size = 512*1024*1024;
     1.6  unsigned long dom0_align = 64*1024*1024;
     1.7 -#ifdef DOMU_BUILD_STAGING
     1.8 -unsigned long domU_staging_size = 32*1024*1024; //FIXME: Should be configurable
     1.9 -unsigned long domU_staging_start;
    1.10 -unsigned long domU_staging_align = 64*1024;
    1.11 -unsigned long *domU_staging_area;
    1.12 -#endif
    1.13  
    1.14  // initialized by arch/ia64/setup.c:find_initrd()
    1.15  unsigned long initrd_start = 0, initrd_end = 0;
    1.16 @@ -750,46 +744,6 @@ void alloc_dom0(void)
    1.17  
    1.18  }
    1.19  
    1.20 -#ifdef DOMU_BUILD_STAGING
    1.21 -void alloc_domU_staging(void)
    1.22 -{
    1.23 -	domU_staging_size = 32*1024*1024; //FIXME: Should be configurable
    1.24 -	printf("alloc_domU_staging: starting (initializing %d MB...)\n",domU_staging_size/(1024*1024));
    1.25 -	domU_staging_start = alloc_boot_pages(
    1.26 -            domU_staging_size >> PAGE_SHIFT, domU_staging_align >> PAGE_SHIFT);
    1.27 -        domU_staging_start <<= PAGE_SHIFT;
    1.28 -	if (!domU_staging_size) {
    1.29 -		printf("alloc_domU_staging: can't allocate, spinning...\n");
    1.30 -		while(1);
    1.31 -	}
    1.32 -	else domU_staging_area = (unsigned long *)__va(domU_staging_start);
    1.33 -	printf("alloc_domU_staging: domU_staging_area=%p\n",domU_staging_area);
    1.34 -
    1.35 -}
    1.36 -
    1.37 -unsigned long
    1.38 -domU_staging_read_8(unsigned long at)
    1.39 -{
    1.40 -	// no way to return errors so just do it
    1.41 -	return domU_staging_area[at>>3];
    1.42 -	
    1.43 -}
    1.44 -
    1.45 -unsigned long
    1.46 -domU_staging_write_32(unsigned long at, unsigned long a, unsigned long b,
    1.47 -	unsigned long c, unsigned long d)
    1.48 -{
    1.49 -	if (at + 32 > domU_staging_size) return -1;
    1.50 -	if (at & 0x1f) return -1;
    1.51 -	at >>= 3;
    1.52 -	domU_staging_area[at++] = a;
    1.53 -	domU_staging_area[at++] = b;
    1.54 -	domU_staging_area[at++] = c;
    1.55 -	domU_staging_area[at] = d;
    1.56 -	return 0;
    1.57 -	
    1.58 -}
    1.59 -#endif
    1.60  
    1.61  /*
    1.62   * Domain 0 has direct access to all devices absolutely. However
    1.63 @@ -1076,29 +1030,6 @@ void reconstruct_domU(struct vcpu *v)
    1.64  }
    1.65  #endif
    1.66  
    1.67 -// FIXME: When dom0 can construct domains, this goes away (or is rewritten)
    1.68 -int launch_domainU(unsigned long size)
    1.69 -{
    1.70 -#ifdef CLONE_DOMAIN0
    1.71 -	static int next = CLONE_DOMAIN0+1;
    1.72 -#else
    1.73 -	static int next = 1;
    1.74 -#endif	
    1.75 -
    1.76 -	struct domain *d = do_createdomain(next,0);
    1.77 -	if (!d) {
    1.78 -		printf("launch_domainU: couldn't create\n");
    1.79 -		return 1;
    1.80 -	}
    1.81 -	else next++;
    1.82 -	if (construct_domU(d, (unsigned long)domU_staging_area, size,0,0,0)) {
    1.83 -		printf("launch_domainU: couldn't construct(id=%d,%lx,%lx)\n",
    1.84 -			d->domain_id,domU_staging_area,size);
    1.85 -		return 2;
    1.86 -	}
    1.87 -	domain_unpause_by_systemcontroller(d);
    1.88 -}
    1.89 -
    1.90  void machine_restart(char * __unused)
    1.91  {
    1.92  	if (platform_is_hp_ski()) dummy();
     2.1 --- a/xen/arch/ia64/xen/hypercall.c	Thu Nov 17 18:35:14 2005 -0600
     2.2 +++ b/xen/arch/ia64/xen/hypercall.c	Fri Nov 18 10:01:10 2005 -0600
     2.3 @@ -123,32 +123,16 @@ ia64_hypercall (struct pt_regs *regs)
     2.4  		// FIXME: need fixes in efi.h from 2.6.9
     2.5  		regs->r8 = EFI_UNSUPPORTED;
     2.6  		break;
     2.7 -	    case 0xffff: // test dummy hypercall
     2.8 +	    case 0xffff:
     2.9  		regs->r8 = dump_privop_counts_to_user(
    2.10  			vcpu_get_gr(v,32),
    2.11  			vcpu_get_gr(v,33));
    2.12  		break;
    2.13 -	    case 0xfffe: // test dummy hypercall
    2.14 +	    case 0xfffe:
    2.15  		regs->r8 = zero_privop_counts_to_user(
    2.16  			vcpu_get_gr(v,32),
    2.17  			vcpu_get_gr(v,33));
    2.18  		break;
    2.19 -	    case 0xfffd: // test dummy hypercall
    2.20 -		regs->r8 = launch_domainU(
    2.21 -			vcpu_get_gr(v,32));
    2.22 -		break;
    2.23 -	    case 0xfffc: // test dummy hypercall
    2.24 -		regs->r8 = domU_staging_write_32(
    2.25 -			vcpu_get_gr(v,32),
    2.26 -			vcpu_get_gr(v,33),
    2.27 -			vcpu_get_gr(v,34),
    2.28 -			vcpu_get_gr(v,35),
    2.29 -			vcpu_get_gr(v,36));
    2.30 -		break;
    2.31 -	    case 0xfffb: // test dummy hypercall
    2.32 -		regs->r8 = domU_staging_read_8(vcpu_get_gr(v,32));
    2.33 -		break;
    2.34 -
    2.35  	    case __HYPERVISOR_dom0_op:
    2.36  		regs->r8 = do_dom0_op(regs->r14);
    2.37  		break;
     3.1 --- a/xen/arch/ia64/xen/xensetup.c	Thu Nov 17 18:35:14 2005 -0600
     3.2 +++ b/xen/arch/ia64/xen/xensetup.c	Fri Nov 18 10:01:10 2005 -0600
     3.3 @@ -268,9 +268,6 @@ void start_kernel(void)
     3.4      __ia64_init_fpu();
     3.5  
     3.6      alloc_dom0();
     3.7 -#ifdef DOMU_BUILD_STAGING
     3.8 -    alloc_domU_staging();
     3.9 -#endif
    3.10  
    3.11      end_boot_allocator();
    3.12