core: Drop root_cell argument from arch_init_early/late

root_cell is already globally available, no need to pass it around.

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

diff --git a/hypervisor/arch/arm/setup.c b/hypervisor/arch/arm/setup.c
index 846fb8a0920f23673bf5043acded7fd67a857bfa..b474a7006491376a68921c76a4f416ea90ae6fa3 100644 (file)
--- a/hypervisor/arch/arm/setup.c
+++ b/hypervisor/arch/arm/setup.c
@@ -12,7 +12,7 @@
 
 #include <jailhouse/entry.h>
 
-int arch_init_early(struct cell *root_cell)
+int arch_init_early(void)
 {
        return -ENOSYS;
 }
@@ -22,7 +22,7 @@ int arch_cpu_init(struct per_cpu *cpu_data)
        return -ENOSYS;
 }
 
-int arch_init_late(struct cell *root_cell)
+int arch_init_late(void)
 {
        return -ENOSYS;
 }

diff --git a/hypervisor/arch/x86/setup.c b/hypervisor/arch/x86/setup.c
index df58cb9ef15400194c059c64bc9e8691cc19320c..dffefb4e631e270fdcba18c46226a3e71fa79fed 100644 (file)
--- a/hypervisor/arch/x86/setup.c
+++ b/hypervisor/arch/x86/setup.c
@@ -51,7 +51,7 @@ static void set_idt_int_gate(unsigned int vector, unsigned long entry)
        idt[vector * 4 + 2] = entry >> 32;
 }
 
-int arch_init_early(struct cell *root_cell)
+int arch_init_early(void)
 {
        unsigned long entry;
        unsigned int vector;
@@ -80,7 +80,7 @@ int arch_init_early(struct cell *root_cell)
        if (err)
                return err;
 
-       err = vmx_cell_init(root_cell);
+       err = vmx_cell_init(&root_cell);
        if (err)
                return err;
 
@@ -212,7 +212,7 @@ error_out:
        return err;
 }
 
-int arch_init_late(struct cell *root_cell)
+int arch_init_late()
 {
        int err;
 
@@ -224,7 +224,7 @@ int arch_init_late(struct cell *root_cell)
        if (err)
                return err;
 
-       err = vtd_cell_init(root_cell);
+       err = vtd_cell_init(&root_cell);
        if (err)
                return err;
 

diff --git a/hypervisor/include/jailhouse/entry.h b/hypervisor/include/jailhouse/entry.h
index eff209d9706f37b0717eb67a9860f62a6fbe00c5..fb9df8265094fa56e31c6574f2948951e28da42f 100644 (file)
--- a/hypervisor/include/jailhouse/entry.h
+++ b/hypervisor/include/jailhouse/entry.h
@@ -41,9 +41,9 @@ void vm_exit(void);
 
 int entry(unsigned int cpu_id, struct per_cpu *cpu_data);
 
-int arch_init_early(struct cell *root_cell);
+int arch_init_early(void);
 int arch_cpu_init(struct per_cpu *cpu_data);
-int arch_init_late(struct cell *root_cell);
+int arch_init_late(void);
 void __attribute__((noreturn)) arch_cpu_activate_vmm(struct per_cpu *cpu_data);
 void arch_cpu_restore(struct per_cpu *cpu_data);
 

diff --git a/hypervisor/setup.c b/hypervisor/setup.c
index 297c09da8b2c6b8b2db817418f0ad03386534678..5647885d3f12bfb47b447ec1b390168e09e4fe35 100644 (file)
--- a/hypervisor/setup.c
+++ b/hypervisor/setup.c
@@ -79,7 +79,7 @@ static void init_early(unsigned int cpu_id)
        if (error)
                return;
 
-       error = arch_init_early(&root_cell);
+       error = arch_init_early();
        if (error)
                return;
 
@@ -142,7 +142,7 @@ failed:
 
 static void init_late(void)
 {
-       error = arch_init_late(&root_cell);
+       error = arch_init_late();
        if (error)
                return;