From: Zhang Wei Date: Fri, 25 Jan 2008 07:12:55 +0000 Subject: [kvm-ppc-devel] [PATCH 1/5] Remove KVM_HANDLER macro. Message-Id: <12012451794158-git-send-email-wei.zhang@freescale.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: kvm-ppc@vger.kernel.org Replace KVM_HANDLER macro by kvm_trampoline_handler() function. Codes define by KVM_HANDLER marco will be extracted by kvm_trampoline_handler install loop. Signed-off-by: Zhang Wei --- arch/powerpc/kvm/booke_interrupts.S | 32 ++++++-------------------------- arch/powerpc/kvm/powerpc.c | 6 +++++- include/asm-powerpc/kvm_host.h | 1 + 3 files changed, 12 insertions(+), 27 deletions(-) diff --git a/arch/powerpc/kvm/booke_interrupts.S b/arch/powerpc/kvm/booke_interrupts.S index 45131cc..ec5f071 100644 --- a/arch/powerpc/kvm/booke_interrupts.S +++ b/arch/powerpc/kvm/booke_interrupts.S @@ -39,36 +39,19 @@ #define HOST_STACK_SIZE (((HOST_MIN_STACK_SIZE + 15) / 16) * 16) /* Align. */ #define HOST_STACK_LR (HOST_STACK_SIZE + 4) /* In caller stack frame. */ -.macro KVM_HANDLER ivor_nr -_GLOBAL(kvm_trampoline_handler_\ivor_nr) +_GLOBAL(kvm_trampoline_handler) /* Get pointer to vcpu and record exit number. */ mtspr SPRN_SPRG0, r4 mfspr r4, SPRN_SPRG1 stw r5, VCPU_GPR(r5)(r4) - li r5, \ivor_nr + li r5, 0 /* The SIMM field of this instruction will be replaced + * at install time by ivor_nr. + */ /* This branch is fixed up at install time to jump to * kvm_trampoline_resume_host(). */ b . -.endm - -_GLOBAL(kvm_trampoline_start) - -KVM_HANDLER PPC44x_INTERRUPT_CRITICAL -KVM_HANDLER PPC44x_INTERRUPT_MACHINE_CHECK -KVM_HANDLER PPC44x_INTERRUPT_DATA_STORAGE -KVM_HANDLER PPC44x_INTERRUPT_INST_STORAGE -KVM_HANDLER PPC44x_INTERRUPT_EXTERNAL -KVM_HANDLER PPC44x_INTERRUPT_ALIGNMENT -KVM_HANDLER PPC44x_INTERRUPT_PROGRAM -KVM_HANDLER PPC44x_INTERRUPT_FP_UNAVAIL -KVM_HANDLER PPC44x_INTERRUPT_SYSCALL -KVM_HANDLER PPC44x_INTERRUPT_AP_UNAVAIL -KVM_HANDLER PPC44x_INTERRUPT_DECREMENTER -KVM_HANDLER PPC44x_INTERRUPT_FIT -KVM_HANDLER PPC44x_INTERRUPT_WATCHDOG -KVM_HANDLER PPC44x_INTERRUPT_DTLB_MISS -KVM_HANDLER PPC44x_INTERRUPT_ITLB_MISS -KVM_HANDLER PPC44x_INTERRUPT_DEBUG +_GLOBAL(kvm_trampoline_handler_len) + .long . - kvm_trampoline_handler #define NEED_INST_MASK ((1<