diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2008-04-15 15:47:53 +0100 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2008-04-15 15:47:53 +0100 |
| commit | bcba667e12e35a1bb46d2284d00af1c3693997e6 (patch) | |
| tree | 5a85e2b1a51501559a185d4d376be988c5cfe81f /xen/include/asm-x86/hvm | |
| parent | b631149c20d11453d35cc77aa6abe33c7c07189e (diff) | |
| download | xen-bcba667e12e35a1bb46d2284d00af1c3693997e6.tar.gz xen-bcba667e12e35a1bb46d2284d00af1c3693997e6.tar.bz2 xen-bcba667e12e35a1bb46d2284d00af1c3693997e6.zip | |
x86, hvm: Clean up handling of APIC INIT and SIPI messages.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
Diffstat (limited to 'xen/include/asm-x86/hvm')
| -rw-r--r-- | xen/include/asm-x86/hvm/hvm.h | 3 | ||||
| -rw-r--r-- | xen/include/asm-x86/hvm/vcpu.h | 6 | ||||
| -rw-r--r-- | xen/include/asm-x86/hvm/vlapic.h | 2 |
3 files changed, 2 insertions, 9 deletions
diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index fe58567263..24080c6cde 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -138,7 +138,6 @@ void hvm_domain_destroy(struct domain *d); int hvm_vcpu_initialise(struct vcpu *v); void hvm_vcpu_destroy(struct vcpu *v); -void hvm_vcpu_reset(struct vcpu *vcpu); void hvm_send_assist_req(struct vcpu *v); @@ -224,8 +223,6 @@ hvm_inject_exception(unsigned int trapnr, int errcode, unsigned long cr2) hvm_funcs.inject_exception(trapnr, errcode, cr2); } -int hvm_bringup_ap(int vcpuid, int trampoline_vector); - static inline int hvm_event_pending(struct vcpu *v) { return hvm_funcs.event_pending(v); diff --git a/xen/include/asm-x86/hvm/vcpu.h b/xen/include/asm-x86/hvm/vcpu.h index d3281d20dc..c4592d9c1e 100644 --- a/xen/include/asm-x86/hvm/vcpu.h +++ b/xen/include/asm-x86/hvm/vcpu.h @@ -26,9 +26,6 @@ #include <asm/hvm/svm/vmcb.h> #include <asm/mtrr.h> -#define HVM_VCPU_INIT_SIPI_SIPI_STATE_NORM 0 -#define HVM_VCPU_INIT_SIPI_SIPI_STATE_WAIT_SIPI 1 - enum hvm_io_state { HVMIO_none = 0, HVMIO_dispatched, @@ -58,9 +55,6 @@ struct hvm_vcpu { spinlock_t tm_lock; struct list_head tm_list; - /* For AP startup */ - unsigned long init_sipi_sipi_state; - int xen_port; bool_t flag_dr_dirty; diff --git a/xen/include/asm-x86/hvm/vlapic.h b/xen/include/asm-x86/hvm/vlapic.h index 163dcdfcc6..cc8a70608d 100644 --- a/xen/include/asm-x86/hvm/vlapic.h +++ b/xen/include/asm-x86/hvm/vlapic.h @@ -21,6 +21,7 @@ #ifndef __ASM_X86_HVM_VLAPIC_H__ #define __ASM_X86_HVM_VLAPIC_H__ +#include <xen/softirq.h> #include <asm/msr.h> #include <public/hvm/ioreq.h> #include <asm/hvm/vpt.h> @@ -58,6 +59,7 @@ struct vlapic { struct periodic_time pt; s_time_t timer_last_update; struct page_info *regs_page; + struct tasklet init_tasklet; }; static inline uint32_t vlapic_get_reg(struct vlapic *vlapic, uint32_t reg) |