vmevent: reduce include dependencies
PATCH 1/1 vmevent: reduce include dependencies
There's no need for virtually everything to include public/vm_event.h. Move its inclusion out of sched.h. This requires using the non-typedef name in p2m_mem_paging_resume()'s prototype; by not changing the function definition at the same time it'll remain certain that the build would fail if the typedef itself was changed.
xen/arch/x86/livepatch.c +1 -0
@@ -11,6 +11,7 @@#include <xen/livepatch_elf.h> #include <xen/livepatch.h> #include <xen/sched.h> +#include <xen/vm_event.h> #include <asm/fixmap.h> #include <asm/nmi.h>
xen/include/asm-x86/p2m.h +2 -1
@@ -743,7 +743,8 @@ void p2m_mem_paging_populate(struct doma/* Prepare the p2m for paging a frame in */ int p2m_mem_paging_prep (struct domain *d,unsigned long gfn,uint64_t buffer);/* Resume normal operation (in case a domain was paused) */ -void p2m_mem_paging_resume (struct domain *d,vm_event_response_t *rsp); +struct vm_event_st ; +void p2m_mem_paging_resume (struct domain *d,struct vm_event_st *rsp);/* * Internal functions, only called by other p2m code
xen/include/asm-x86/vm_event.h +1 -0
@@ -20,6 +20,7 @@#define __ASM_X86_VM_EVENT_H__#include <xen/sched.h> +#include <public/vm_event.h> /* * Should we emulate the next matching instruction on VCPU resume
xen/include/xen/sched.h +0 -25
@@ -27,7 +27,6 @@#include <public/domctl.h> #include <public/sysctl.h> #include <public/vcpu.h> -#include <public/vm_event.h> #include <public/event_channel.h> #ifdef CONFIG_COMPAT
@@ -313,30 +312,6 @@ struct sched_unit {#define domain_lock (d) spin_lock_recursive(&(d)->domain_lock)#define domain_unlock (d) spin_unlock_recursive(&(d)->domain_lock) -/* VM event */ -struct vm_event_domain -{ -spinlock_t lock; -/* The ring has 64 entries */ -unsigned char foreign_producers; -unsigned char target_producers; -/* shared ring page */ -void *ring_page; -struct page_info *ring_pg_struct; -/* front-end ring */ -vm_event_front_ring_t front_ring; -/* event channel port (vcpu0 only) */ -int xen_port; -/* vm_event bit for vcpu->pause_flags */ -int pause_flag; -/* list of vcpus waiting for room in the ring */ -struct waitqueue_head wq; -/* the number of vCPUs blocked */ -unsigned int blocked; -/* The last vcpu woken up */ -unsigned int last_vcpu_wake_up; -}; -struct evtchn_port_ops ;struct domain
xen/include/xen/vm_event.h +23 -0
@@ -26,6 +26,29 @@#include <xen/sched.h> #include <public/vm_event.h> +struct vm_event_domain +{ +spinlock_t lock; +/* The ring has 64 entries */ +unsigned char foreign_producers; +unsigned char target_producers; +/* shared ring page */ +void *ring_page; +struct page_info *ring_pg_struct; +/* front-end ring */ +vm_event_front_ring_t front_ring; +/* event channel port (vcpu0 only) */ +int xen_port; +/* vm_event bit for vcpu->pause_flags */ +int pause_flag; +/* list of vcpus waiting for room in the ring */ +struct waitqueue_head wq; +/* the number of vCPUs blocked */ +unsigned int blocked; +/* The last vcpu woken up */ +unsigned int last_vcpu_wake_up; +}; +/* Clean up on domain destruction */ void vm_event_cleanup (struct domain *d);
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 8 lines · Jan Beulich
There's no need for virtually everything to include
public/vm_event.h. Move its inclusion out ofsched.h. This requires using the non-typedef name in p2m_mem_paging_resume()'s prototype; by not changing the function definition at the same time it'll remain certain that the build would fail if the typedef itself was changed.Signed-off-by Jan Beulich <[email protected]>
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 7 lines · Jan Beulich
There's no need for virtually everything to include
public/vm_event.h. Move its inclusion out ofsched.h. This requires using the non-typedef name in p2m_mem_paging_resume()'s prototype; by not changing the function definition at the same time it'll remain certain that the build would fail if the typedef itself was changed.Signed-off-by Jan Beulich <[email protected]>
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 8 lines · Jan Beulich
There's no need for virtually everything to include
public/vm_event.h. Move its inclusion out ofsched.h. This requires using the non-typedef name in p2m_mem_paging_resume()'s prototype; by not changing the function definition at the same time it'll remain certain that the build would fail if the typedef itself was changed.Signed-off-by Jan Beulich <[email protected]>
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel