From: Jan Kiszka <[email protected]> No one does more than returning 0 by now.
Signed-off-by: Jan Kiszka <[email protected]> --- hypervisor/arch/arm-common/include/asm/setup.h | 1 - hypervisor/arch/arm-common/setup.c | 5 ----- hypervisor/arch/arm/setup.c | 5 ----- hypervisor/arch/arm64/setup.c | 5 ----- hypervisor/arch/x86/setup.c | 5 ----- hypervisor/include/jailhouse/entry.h | 10 ---------- hypervisor/setup.c | 4 ---- 7 files changed, 35 deletions(-) diff --git a/hypervisor/arch/arm-common/include/asm/setup.h b/hypervisor/arch/arm-common/include/asm/setup.h index 933fdf679..b1c668bea 100644 --- a/hypervisor/arch/arm-common/include/asm/setup.h +++ b/hypervisor/arch/arm-common/include/asm/setup.h @@ -14,4 +14,3 @@ int arm_init_early(void); int arm_cpu_init(struct per_cpu *cpu_data); -int arm_init_late(void); diff --git a/hypervisor/arch/arm-common/setup.c b/hypervisor/arch/arm-common/setup.c index 4d5fc2120..9d4f6eab6 100644 --- a/hypervisor/arch/arm-common/setup.c +++ b/hypervisor/arch/arm-common/setup.c @@ -50,8 +50,3 @@ int arm_cpu_init(struct per_cpu *cpu_data) return irqchip_cpu_init(cpu_data); } - -int arm_init_late(void) -{ - return 0; -} diff --git a/hypervisor/arch/arm/setup.c b/hypervisor/arch/arm/setup.c index eb8aa2a64..8dd6e6de5 100644 --- a/hypervisor/arch/arm/setup.c +++ b/hypervisor/arch/arm/setup.c @@ -78,11 +78,6 @@ int arch_cpu_init(struct per_cpu *cpu_data) return arm_cpu_init(cpu_data); } -int arch_init_late(void) -{ - return arm_init_late(); -} - static inline void __attribute__((always_inline)) cpu_prepare_return_el1(struct per_cpu *cpu_data, int return_code) { diff --git a/hypervisor/arch/arm64/setup.c b/hypervisor/arch/arm64/setup.c index 832c8b7f3..00ee820c7 100644 --- a/hypervisor/arch/arm64/setup.c +++ b/hypervisor/arch/arm64/setup.c @@ -56,11 +56,6 @@ int arch_cpu_init(struct per_cpu *cpu_data) return arm_cpu_init(cpu_data); } -int arch_init_late(void) -{ - return arm_init_late(); -} - void __attribute__((noreturn)) arch_cpu_activate_vmm(struct per_cpu *cpu_data) { struct registers *regs = guest_regs(cpu_data); diff --git a/hypervisor/arch/x86/setup.c b/hypervisor/arch/x86/setup.c index 39328c405..470f1d195 100644 --- a/hypervisor/arch/x86/setup.c +++ b/hypervisor/arch/x86/setup.c @@ -214,11 +214,6 @@ error_out: return err; } -int arch_init_late(void) -{ - return 0; -} - void __attribute__((noreturn)) arch_cpu_activate_vmm(struct per_cpu *cpu_data) { vcpu_activate_vmm(cpu_data); diff --git a/hypervisor/include/jailhouse/entry.h b/hypervisor/include/jailhouse/entry.h index c3abbe7e2..27e9eb6a7 100644 --- a/hypervisor/include/jailhouse/entry.h +++ b/hypervisor/include/jailhouse/entry.h @@ -95,16 +95,6 @@ int arch_init_early(void); int arch_cpu_init(struct per_cpu *cpu_data); /** - * Perform architecture-specific late setup steps. - * - * @return 0 on success, negative error code otherwise. - * - * @note This is called over the master CPU that performs CPU-unrelated setup - * steps. - */ -int arch_init_late(void); - -/** * Perform architecture-specific activation of the hypervisor mode. * @param cpu_data Data structure of the calling CPU. * diff --git a/hypervisor/setup.c b/hypervisor/setup.c index 31277a598..2da8bb153 100644 --- a/hypervisor/setup.c +++ b/hypervisor/setup.c @@ -143,10 +143,6 @@ static void init_late(void) return; } - error = arch_init_late(); - if (error) - return; - for_each_unit(unit) { printk("Initializing unit: %s\n", unit->name); error = unit->init(); -- 2.13.6 -- You received this message because you are subscribed to the Google Groups "Jailhouse" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
