[Xen-changelog] [xen-unstable] [IA64] build fixes

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User awilliam@xxxxxxxxxxx
# Node ID 0361efd32d4dadc346f8a40accfbeb3e609ef376
# Parent  3713ea43e6364bf2989a1cf0dc252a6a1393ce02
[IA64] build fixes

Add defines to fix hvm_vioapic and trivial warning fix.

Signed-off-by: Alex Williamson <alex.williamson@xxxxxx>
---
 xen/arch/ia64/vmx/vmx_init.c  |    2 +-
 xen/include/asm-ia64/config.h |    5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff -r 3713ea43e636 -r 0361efd32d4d xen/arch/ia64/vmx/vmx_init.c
--- a/xen/arch/ia64/vmx/vmx_init.c      Fri Nov 10 11:14:42 2006 -0700
+++ b/xen/arch/ia64/vmx/vmx_init.c      Fri Nov 10 11:14:47 2006 -0700
@@ -276,7 +276,7 @@ static void vmx_create_event_channels(st
                        p = get_vio(v->domain, o->vcpu_id);
                        o->arch.arch_vmx.xen_port = p->vp_eport =
                                        alloc_unbound_xen_event_channel(o, 0);
-                       gdprintk(XENLOG_INFO, "Allocated port %d for hvm.\n",
+                       gdprintk(XENLOG_INFO, "Allocated port %ld for hvm.\n",
                                 o->arch.arch_vmx.xen_port);
                }
        }
diff -r 3713ea43e636 -r 0361efd32d4d xen/include/asm-ia64/config.h
--- a/xen/include/asm-ia64/config.h     Fri Nov 10 11:14:42 2006 -0700
+++ b/xen/include/asm-ia64/config.h     Fri Nov 10 11:14:47 2006 -0700
@@ -280,4 +280,9 @@ struct screen_info { };
 /* Define CONFIG_PRIVIFY to support privified OS (deprecated).  */
 #undef CONFIG_PRIVIFY
 
+/* Necessary for hvm_vioapic.c */
+#define vcpu_vlapic(vcpu)   (&(vcpu)->arch.arch_vmx.vlapic)
+#define vlapic_vcpu(vpic)   (container_of((vpic), struct vcpu, \
+                                          arch.arch_vmx.vlapic))
+
 #endif /* _IA64_CONFIG_H_ */

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog