x86: Rename vcpu_entry_failure back to vmx_entry_failure

This function is only used for VMX, so move it to the proper namespace.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>

diff --git a/hypervisor/arch/x86/include/asm/vcpu.h b/hypervisor/arch/x86/include/asm/vcpu.h
index b5802ee9f5ef9dd94ac31ee3b7385f49d90565fa..a1d4a2532f551781a2ece675757afa754ef88755 100644 (file)
--- a/hypervisor/arch/x86/include/asm/vcpu.h
+++ b/hypervisor/arch/x86/include/asm/vcpu.h
@@ -73,8 +73,6 @@ void vcpu_nmi_handler(struct per_cpu *cpu_data);
 
 void vcpu_tlb_flush(void);
 
-void vcpu_entry_failure(struct per_cpu *cpu_data);
-
 /*
  * vcpu_map_inst() and vcpu_get_inst_bytes() contract:
  *

diff --git a/hypervisor/arch/x86/include/asm/vmx.h b/hypervisor/arch/x86/include/asm/vmx.h
index dcadcfbc3935f6b616646cb5bf80b7a8205a0978..4fcc0415d8b5eb0d823a4cad322175894b7ce802 100644 (file)
--- a/hypervisor/arch/x86/include/asm/vmx.h
+++ b/hypervisor/arch/x86/include/asm/vmx.h
@@ -297,6 +297,8 @@ enum vmx_state { VMXOFF = 0, VMXON, VMCS_READY };
 #define APIC_ACCESS_TYPE_LINEAR_READ           0x00000000
 #define APIC_ACCESS_TYPE_LINEAR_WRITE          0x00001000
 
+void vmx_entry_failure(struct per_cpu *cpu_data);
+
 void vmx_vmexit(void);
 
 #endif /* !_JAILHOUSE_ASM_VMX_H */

diff --git a/hypervisor/arch/x86/vmx-vmexit.S b/hypervisor/arch/x86/vmx-vmexit.S
index 16d38e5df3e1baa1d5f18d3d48ce1573cf10e7ed..f1dbf8b62debe344db1a41e4d04995ba4b850128 100644 (file)
--- a/hypervisor/arch/x86/vmx-vmexit.S
+++ b/hypervisor/arch/x86/vmx-vmexit.S
@@ -56,4 +56,4 @@ vmx_vmexit:
        vmresume
 
        lea -PERCPU_STACK_END(%rsp),%rdi
-       jmp vcpu_entry_failure
+       jmp vmx_entry_failure

diff --git a/hypervisor/arch/x86/vmx.c b/hypervisor/arch/x86/vmx.c
index e146aa251281d42324a26cf7edf361c242664ed0..f33c8e2678677ef9ac779a9a4cc9d80ae8e896dd 100644 (file)
--- a/hypervisor/arch/x86/vmx.c
+++ b/hypervisor/arch/x86/vmx.c
@@ -1069,7 +1069,7 @@ void vcpu_handle_exit(struct registers *guest_regs, struct per_cpu *cpu_data)
        panic_park();
 }
 
-void vcpu_entry_failure(struct per_cpu *cpu_data)
+void vmx_entry_failure(struct per_cpu *cpu_data)
 {
        panic_printk("FATAL: vmresume failed, error %d\n",
                     vmcs_read32(VM_INSTRUCTION_ERROR));