ia64/xen-unstable

changeset 9314:58a3ed82eee4

[IA64] Removed warning messages

This patch removed warning messages in vcpu.c, xentime.c and xensetup.c.
I tested compilation, booting dom0, and creation/destruction domU.

Signed-off-by: Masaki Kanno <kanno.masaki@jp.fujitsu.com>
author awilliam@xenbuild.aw
date Mon Mar 20 09:19:36 2006 -0700 (2006-03-20)
parents 815758308556
children d5b1bc047540
files xen/arch/ia64/xen/vcpu.c xen/arch/ia64/xen/xensetup.c xen/arch/ia64/xen/xentime.c
line diff
     1.1 --- a/xen/arch/ia64/xen/vcpu.c	Mon Mar 20 09:04:51 2006 -0700
     1.2 +++ b/xen/arch/ia64/xen/vcpu.c	Mon Mar 20 09:19:36 2006 -0700
     1.3 @@ -74,6 +74,7 @@ vcpu_get_gr(VCPU *vcpu, unsigned long re
     1.4  {
     1.5  	REGS *regs = vcpu_regs(vcpu);
     1.6  	UINT64 val;
     1.7 +
     1.8  	if (!reg) return 0;
     1.9  	getreg(reg,&val,0,regs);	// FIXME: handle NATs later
    1.10  	return val;
    1.11 @@ -82,10 +83,11 @@ IA64FAULT
    1.12  vcpu_get_gr_nat(VCPU *vcpu, unsigned long reg, UINT64 *val)
    1.13  {
    1.14  	REGS *regs = vcpu_regs(vcpu);
    1.15 -    int nat;
    1.16 +	int nat;
    1.17 +
    1.18  	getreg(reg,val,&nat,regs);	// FIXME: handle NATs later
    1.19 -    if(nat)
    1.20 -        return IA64_NAT_CONSUMPTION_VECTOR;
    1.21 +	if (nat)
    1.22 +		return IA64_NAT_CONSUMPTION_VECTOR;
    1.23  	return 0;
    1.24  }
    1.25  
    1.26 @@ -96,8 +98,10 @@ IA64FAULT
    1.27  vcpu_set_gr(VCPU *vcpu, unsigned long reg, UINT64 value, int nat)
    1.28  {
    1.29  	REGS *regs = vcpu_regs(vcpu);
    1.30 +	long sof;
    1.31 +
    1.32  	if (!reg) return IA64_ILLOP_FAULT;
    1.33 -	long sof = (regs->cr_ifs) & 0x7f;
    1.34 +	sof = (regs->cr_ifs) & 0x7f;
    1.35  	if (reg >= sof + 32) return IA64_ILLOP_FAULT;
    1.36  	setreg(reg,value,nat,regs);	// FIXME: handle NATs later
    1.37  	return IA64_NO_FAULT;
    1.38 @@ -1247,7 +1251,7 @@ IA64FAULT vcpu_thash(VCPU *vcpu, UINT64 
    1.39  	UINT64 VHPT_addr2a =
    1.40  		((pta_base >> 15) & 0x3fffffffffff) & compMask_60_15;
    1.41  	UINT64 VHPT_addr2b =
    1.42 -		((VHPT_offset >> 15) & 0x3fffffffffff) & Mask_60_15;;
    1.43 +		((VHPT_offset >> 15) & 0x3fffffffffff) & Mask_60_15;
    1.44  	UINT64 VHPT_addr3 = VHPT_offset & 0x7fff;
    1.45  	UINT64 VHPT_addr = VHPT_addr1 | ((VHPT_addr2a | VHPT_addr2b) << 15) |
    1.46  			VHPT_addr3;
     2.1 --- a/xen/arch/ia64/xen/xensetup.c	Mon Mar 20 09:04:51 2006 -0700
     2.2 +++ b/xen/arch/ia64/xen/xensetup.c	Mon Mar 20 09:19:36 2006 -0700
     2.3 @@ -168,6 +168,9 @@ void start_kernel(void)
     2.4      unsigned long dom0_initrd_start, dom0_initrd_size;
     2.5      unsigned long initial_images_start, initial_images_end;
     2.6      struct domain *idle_domain;
     2.7 +#ifdef CONFIG_SMP
     2.8 +    int i;
     2.9 +#endif
    2.10  
    2.11      running_on_sim = is_platform_hp_ski();
    2.12      /* Kernel may be relocated by EFI loader */
    2.13 @@ -311,8 +314,6 @@ printk("About to call timer_init()\n");
    2.14  #endif
    2.15  
    2.16  #ifdef CONFIG_SMP
    2.17 -    int i;
    2.18 -
    2.19      if ( opt_nosmp )
    2.20      {
    2.21          max_cpus = 0;
     3.1 --- a/xen/arch/ia64/xen/xentime.c	Mon Mar 20 09:04:51 2006 -0700
     3.2 +++ b/xen/arch/ia64/xen/xentime.c	Mon Mar 20 09:19:36 2006 -0700
     3.3 @@ -29,6 +29,7 @@
     3.4  #include <asm/vcpu.h>
     3.5  #include <linux/jiffies.h>	// not included by xen/sched.h
     3.6  #include <xen/softirq.h>
     3.7 +#include <xen/event.h>
     3.8  
     3.9  /* FIXME: where these declarations should be there ? */
    3.10  extern void ia64_init_itm(void);