[Xen-changelog] [xen-unstable] arm: fix build after c/s 25477:e12e0b038219

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Jan Beulich <jbeulich@xxxxxxxx>
# Date 1340892252 -7200
# Node ID efd12cc7dd99fa855d98025d97d5cbcbf1445e73
# Parent  52f1b8a4f9a4cb454b6fea1220cc6a09cf401a42
arm: fix build after c/s 25477:e12e0b038219

Only x86 currently has a struct vcpu field arch.gdbsx_vcpu_event. But
as the whole function domain_pause_for_debugger() is pointless to be
compiled when there's no arch support, simply introduce another HAS_*
macro, enabled only on x86.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Acked-by: Keir Fraser <keir@xxxxxxx>
---


diff -r 52f1b8a4f9a4 -r efd12cc7dd99 xen/Rules.mk
--- a/xen/Rules.mk      Wed Jun 27 17:50:10 2012 +0100
+++ b/xen/Rules.mk      Thu Jun 28 16:04:12 2012 +0200
@@ -51,6 +51,7 @@ CFLAGS-$(perfc)         += -DPERF_COUNTE
 CFLAGS-$(perfc_arrays)  += -DPERF_ARRAYS
 CFLAGS-$(lock_profile)  += -DLOCK_PROFILE
 CFLAGS-$(HAS_ACPI)      += -DHAS_ACPI
+CFLAGS-$(HAS_GDBSX)     += -DHAS_GDBSX
 CFLAGS-$(HAS_PASSTHROUGH) += -DHAS_PASSTHROUGH
 CFLAGS-$(frame_pointer) += -fno-omit-frame-pointer -DCONFIG_FRAME_POINTER
 
diff -r 52f1b8a4f9a4 -r efd12cc7dd99 xen/arch/x86/Rules.mk
--- a/xen/arch/x86/Rules.mk     Wed Jun 27 17:50:10 2012 +0100
+++ b/xen/arch/x86/Rules.mk     Thu Jun 28 16:04:12 2012 +0200
@@ -8,6 +8,7 @@ HAS_PCI := y
 HAS_PASSTHROUGH := y
 HAS_NS16550 := y
 HAS_KEXEC := y
+HAS_GDBSX := y
 xenoprof := y
 
 #
diff -r 52f1b8a4f9a4 -r efd12cc7dd99 xen/common/domain.c
--- a/xen/common/domain.c       Wed Jun 27 17:50:10 2012 +0100
+++ b/xen/common/domain.c       Thu Jun 28 16:04:12 2012 +0200
@@ -612,6 +612,7 @@ void vcpu_end_shutdown_deferral(struct v
         vcpu_check_shutdown(v);
 }
 
+#ifdef HAS_GDBSX
 void domain_pause_for_debugger(void)
 {
     struct domain *d = current->domain;
@@ -628,6 +629,7 @@ void domain_pause_for_debugger(void)
     if (current->arch.gdbsx_vcpu_event == 0)
         send_global_virq(VIRQ_DEBUGGER);
 }
+#endif
 
 /* Complete domain destroy after RCU readers are not holding old references. */
 static void complete_domain_destroy(struct rcu_head *head)

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