direct-io.hg

changeset 12428:0361efd32d4d

[IA64] build fixes

Add defines to fix hvm_vioapic and trivial warning fix.

Signed-off-by: Alex Williamson <alex.williamson@hp.com>
author awilliam@xenbuild.aw
date Fri Nov 10 11:14:47 2006 -0700 (2006-11-10)
parents 3713ea43e636
children 6f3b4d6b04f5
files xen/arch/ia64/vmx/vmx_init.c xen/include/asm-ia64/config.h
line diff
     1.1 --- a/xen/arch/ia64/vmx/vmx_init.c	Fri Nov 10 11:14:42 2006 -0700
     1.2 +++ b/xen/arch/ia64/vmx/vmx_init.c	Fri Nov 10 11:14:47 2006 -0700
     1.3 @@ -276,7 +276,7 @@ static void vmx_create_event_channels(st
     1.4  			p = get_vio(v->domain, o->vcpu_id);
     1.5  			o->arch.arch_vmx.xen_port = p->vp_eport =
     1.6  					alloc_unbound_xen_event_channel(o, 0);
     1.7 -			gdprintk(XENLOG_INFO, "Allocated port %d for hvm.\n",
     1.8 +			gdprintk(XENLOG_INFO, "Allocated port %ld for hvm.\n",
     1.9  			         o->arch.arch_vmx.xen_port);
    1.10  		}
    1.11  	}
     2.1 --- a/xen/include/asm-ia64/config.h	Fri Nov 10 11:14:42 2006 -0700
     2.2 +++ b/xen/include/asm-ia64/config.h	Fri Nov 10 11:14:47 2006 -0700
     2.3 @@ -280,4 +280,9 @@ struct screen_info { };
     2.4  /* Define CONFIG_PRIVIFY to support privified OS (deprecated).  */
     2.5  #undef CONFIG_PRIVIFY
     2.6  
     2.7 +/* Necessary for hvm_vioapic.c */
     2.8 +#define vcpu_vlapic(vcpu)   (&(vcpu)->arch.arch_vmx.vlapic)
     2.9 +#define vlapic_vcpu(vpic)   (container_of((vpic), struct vcpu, \
    2.10 +                                          arch.arch_vmx.vlapic))
    2.11 +
    2.12  #endif	/* _IA64_CONFIG_H_ */