xen/arch/arm/include/asm/event.h | 1 - xen/arch/ppc/include/asm/event.h | 1 - xen/arch/x86/include/asm/event.h | 1 - xen/include/xen/sched.h | 1 + 4 files changed, 1 insertion(+), 3 deletions(-)
The vcpu_kick() declaration is duplicated across multiple
architecture-specific event.h headers (ARM, x86, PPC).
Remove the redundant declarations and move vcpu_kick() into
the common xen/include/xen/sched.h header.
Drop the definition of vcpu_kick() from ppc/include/asm/event.h,
as it is already provided in ppc/stubs.c.
Signed-off-by: Oleksii Kurochko <oleksii.kurochko@gmail.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
---
CI tests:
https://gitlab.com/xen-project/people/olkur/xen/-/pipelines/2188785661
---
Changes in v3:
- Drop inclusion of <xen/sched.h> from "x86/.../vmce.c" as it is already
included in "mce.h" which is included in ".../vmce.c".
- Drop inclusion of <xen/sched.h> from "x86/pv/traps.c" as it is already
included in xen/event.h, which is included in ".../traps.c".
- Add Acked-by: Jan Beulich <jbeulich@suse.com>.
---
Changes in v2:
- Move vcpu_kick() declaration to xen/sched.h instead of xen/event.h
- Revert changes connected to switching asm/event.h to xen/event.h as vcpu_kick()
is now living in xen/sched.h.
- Add inclusion of xen/sched.h because of moved vcpu_kick() declaration to
xen/sched.h.
- Update the commit message.
---
xen/arch/arm/include/asm/event.h | 1 -
xen/arch/ppc/include/asm/event.h | 1 -
xen/arch/x86/include/asm/event.h | 1 -
xen/include/xen/sched.h | 1 +
4 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/xen/arch/arm/include/asm/event.h b/xen/arch/arm/include/asm/event.h
index 509157b2b3..e036ab7fb8 100644
--- a/xen/arch/arm/include/asm/event.h
+++ b/xen/arch/arm/include/asm/event.h
@@ -3,7 +3,6 @@
#include <asm/domain.h>
-void vcpu_kick(struct vcpu *v);
void vcpu_mark_events_pending(struct vcpu *v);
void vcpu_update_evtchn_irq(struct vcpu *v);
void vcpu_block_unless_event_pending(struct vcpu *v);
diff --git a/xen/arch/ppc/include/asm/event.h b/xen/arch/ppc/include/asm/event.h
index 0f475c4b89..565eee1439 100644
--- a/xen/arch/ppc/include/asm/event.h
+++ b/xen/arch/ppc/include/asm/event.h
@@ -5,7 +5,6 @@
#include <xen/lib.h>
/* TODO: implement */
-static inline void vcpu_kick(struct vcpu *v) { BUG_ON("unimplemented"); }
static inline void vcpu_mark_events_pending(struct vcpu *v) { BUG_ON("unimplemented"); }
static inline void vcpu_update_evtchn_irq(struct vcpu *v) { BUG_ON("unimplemented"); }
static inline void vcpu_block_unless_event_pending(struct vcpu *v) { BUG_ON("unimplemented"); }
diff --git a/xen/arch/x86/include/asm/event.h b/xen/arch/x86/include/asm/event.h
index 434f65007e..d13ce28167 100644
--- a/xen/arch/x86/include/asm/event.h
+++ b/xen/arch/x86/include/asm/event.h
@@ -11,7 +11,6 @@
#include <xen/shared.h>
-void vcpu_kick(struct vcpu *v);
void vcpu_mark_events_pending(struct vcpu *v);
static inline int vcpu_event_delivery_is_enabled(struct vcpu *v)
diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h
index 52090b4f70..1f77e0869b 100644
--- a/xen/include/xen/sched.h
+++ b/xen/include/xen/sched.h
@@ -877,6 +877,7 @@ void vcpu_wake(struct vcpu *v);
long vcpu_yield(void);
void vcpu_sleep_nosync(struct vcpu *v);
void vcpu_sleep_sync(struct vcpu *v);
+void vcpu_kick(struct vcpu *v);
/*
* Force synchronisation of given VCPU's state. If it is currently descheduled,
--
2.52.0
On 02/12/2025 10:27, Oleksii Kurochko wrote: > The vcpu_kick() declaration is duplicated across multiple > architecture-specific event.h headers (ARM, x86, PPC). > > Remove the redundant declarations and move vcpu_kick() into > the common xen/include/xen/sched.h header. > > Drop the definition of vcpu_kick() from ppc/include/asm/event.h, > as it is already provided in ppc/stubs.c. > > Signed-off-by: Oleksii Kurochko <oleksii.kurochko@gmail.com> > Acked-by: Jan Beulich <jbeulich@suse.com> Acked-by: Michal Orzel <michal.orzel@amd.com> ~Michal
© 2016 - 2025 Red Hat, Inc.