ia64/xen-unstable

changeset 5817:8fc64b82dd35

More syntactic changes for preparation of vcpu_info merge

Signed-off-by Kevin Tian <Kevin.Tian@intel.com>
author fred@localhost.localdomain
date Thu Jul 28 01:48:15 2005 -0800 (2005-07-28)
parents a64dae7a0344
children 04f35d2b143d
files xen/arch/ia64/domain.c
line diff
     1.1 --- a/xen/arch/ia64/domain.c	Thu Jul 28 01:26:30 2005 -0800
     1.2 +++ b/xen/arch/ia64/domain.c	Thu Jul 28 01:48:15 2005 -0800
     1.3 @@ -312,9 +312,9 @@ int arch_set_info_guest(struct vcpu *v, 
     1.4  
     1.5  	// this should be in userspace
     1.6  	regs->r28 = dom_fw_setup(v->domain,"nomca nosmp xencons=tty0 console=tty0 root=/dev/hda1",256L);  //FIXME
     1.7 -	v->vcpu_info->arch.banknum = 1;
     1.8 -	v->vcpu_info->arch.metaphysical_mode = 1;
     1.9  	v->arch.domain_itm_last = -1L;
    1.10 + 	VCPU(v, banknum) = 1;
    1.11 + 	VCPU(v, metaphysical_mode) = 1;
    1.12  
    1.13  	v->domain->shared_info->arch = c->shared;
    1.14  	return 0;
    1.15 @@ -450,8 +450,8 @@ void new_thread(struct vcpu *v,
    1.16  		VPD_CR(v, dcr) = 0;
    1.17  	} else {
    1.18  		regs->r28 = dom_fw_setup(d,saved_command_line,256L);
    1.19 -		v->vcpu_info->arch.banknum = 1;
    1.20 -		v->vcpu_info->arch.metaphysical_mode = 1;
    1.21 +		VCPU(v, banknum) = 1;
    1.22 +		VCPU(v, metaphysical_mode) = 1;
    1.23  		d->shared_info->arch.flags = (d == dom0) ? (SIF_INITDOMAIN|SIF_PRIVILEGED|SIF_BLK_BE_DOMAIN|SIF_NET_BE_DOMAIN|SIF_USB_BE_DOMAIN) : 0;
    1.24  	}
    1.25  }
    1.26 @@ -483,8 +483,8 @@ void new_thread(struct vcpu *v,
    1.27  	regs->ar_fpsr = FPSR_DEFAULT;
    1.28  	init_all_rr(v);
    1.29  	regs->r28 = dom_fw_setup(d,saved_command_line,256L);  //FIXME
    1.30 -	v->vcpu_info->arch.banknum = 1;
    1.31 -	v->vcpu_info->arch.metaphysical_mode = 1;
    1.32 +	VCPU(v, banknum) = 1;
    1.33 +	VCPU(v, metaphysical_mode) = 1;
    1.34  	d->shared_info->arch.flags = (d == dom0) ? (SIF_INITDOMAIN|SIF_PRIVILEGED|SIF_BLK_BE_DOMAIN|SIF_NET_BE_DOMAIN|SIF_USB_BE_DOMAIN) : 0;
    1.35  }
    1.36  #endif // CONFIG_VTI
    1.37 @@ -1073,12 +1073,12 @@ if (d == dom0)
    1.38  #endif
    1.39      serial_input_init();
    1.40      if (d == dom0) {
    1.41 -    	v->vcpu_info->arch.delivery_mask[0] = -1L;
    1.42 -    	v->vcpu_info->arch.delivery_mask[1] = -1L;
    1.43 -    	v->vcpu_info->arch.delivery_mask[2] = -1L;
    1.44 -    	v->vcpu_info->arch.delivery_mask[3] = -1L;
    1.45 +    	VCPU(v, delivery_mask[0]) = -1L;
    1.46 +    	VCPU(v, delivery_mask[1]) = -1L;
    1.47 +    	VCPU(v, delivery_mask[2]) = -1L;
    1.48 +    	VCPU(v, delivery_mask[3]) = -1L;
    1.49      }
    1.50 -    else __set_bit(0x30,v->vcpu_info->arch.delivery_mask);
    1.51 +    else __set_bit(0x30,VCPU(v, delivery_mask));
    1.52  
    1.53      return 0;
    1.54  }
    1.55 @@ -1234,12 +1234,12 @@ if (d == dom0)
    1.56  #endif
    1.57  	serial_input_init();
    1.58  	if (d == dom0) {
    1.59 -		v->vcpu_info->arch.delivery_mask[0] = -1L;
    1.60 -		v->vcpu_info->arch.delivery_mask[1] = -1L;
    1.61 -		v->vcpu_info->arch.delivery_mask[2] = -1L;
    1.62 -		v->vcpu_info->arch.delivery_mask[3] = -1L;
    1.63 +		VCPU(v, delivery_mask[0]) = -1L;
    1.64 +		VCPU(v, delivery_mask[1]) = -1L;
    1.65 +		VCPU(v, delivery_mask[2]) = -1L;
    1.66 +		VCPU(v, delivery_mask[3]) = -1L;
    1.67  	}
    1.68 -	else __set_bit(0x30,v->vcpu_info->arch.delivery_mask);
    1.69 +	else __set_bit(0x30, VCPU(v, delivery_mask));
    1.70  
    1.71  	return 0;
    1.72  }
    1.73 @@ -1286,7 +1286,7 @@ int construct_domU(struct domain *d,
    1.74  #endif
    1.75  	new_thread(v, pkern_entry, 0, 0);
    1.76  	printk("new_thread returns\n");
    1.77 -	__set_bit(0x30,v->vcpu_info->arch.delivery_mask);
    1.78 +	__set_bit(0x30, VCPU(v, delivery_mask));
    1.79  
    1.80  	return 0;
    1.81  }