core/configs/driver: Rename jailhouse_system::system to root_cell

Now that we have a terminology for the first cell, use it. No functional
change, but local configs will require adjustments.

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

diff --git a/configs/celsius-w420.c b/configs/celsius-w420.c
index 0c5b39cc462494e5c546cbf4eaf4852175d3115a..4612a4eefe61419cfb286a24a0cac71a57d124cb 100644 (file)
--- a/configs/celsius-w420.c
+++ b/configs/celsius-w420.c
@@ -36,7 +36,7 @@ struct {
                        .phys_start = 0xd8a1a000,
                        .size = 0x10000,
                },
-               .system = {
+               .root_cell = {
                        .name = "Celsius-W420",
 
                        .cpu_set_size = sizeof(config.cpus),

diff --git a/configs/chromebook.c b/configs/chromebook.c
index 65194ab2b7f26dd6fb3aa988209bfbf3f444d276..ccacac5985dbf68bd717fd9c5f2c342672cae7db 100644 (file)
--- a/configs/chromebook.c
+++ b/configs/chromebook.c
@@ -27,7 +27,7 @@ struct {
                        .phys_start = 0xbc000000,
                        .size = 0x4000000,
                },
-               .system = {
+               .root_cell = {
                        .name = "Samsung Chromebook",
 
                        .cpu_set_size = sizeof(config.cpus),

diff --git a/configs/h700-8G.c b/configs/h700-8G.c
index 1f966e20f5fbfcb878bf4c15dee34ce3f15b31d9..fc4cb015f349e5e7e2f2735d4f24ec78f3d48527 100644 (file)
--- a/configs/h700-8G.c
+++ b/configs/h700-8G.c
@@ -34,7 +34,7 @@ struct {
                        .phys_start = 0xbf7de000,
                        .size = 0x21000,
                },
-               .system = {
+               .root_cell = {
                        .name = "Celsius H700",
 
                        .cpu_set_size = sizeof(config.cpus),

diff --git a/configs/h87i.c b/configs/h87i.c
index b7a4ef81f4740540372b5fc18cb3a709b39184fb..972dd03906191854dff947f8d65b877c7da610b7 100644 (file)
--- a/configs/h87i.c
+++ b/configs/h87i.c
@@ -34,7 +34,7 @@ struct {
                        .phys_start = 0xcca64000,
                        .size = 0x15000,
                },
-               .system = {
+               .root_cell = {
                        .name = "H87I-PLUS",
 
                        .cpu_set_size = sizeof(config.cpus),

diff --git a/configs/qemu-vm.c b/configs/qemu-vm.c
index 8051131c38a03de6ce5429890bf8059c5e962047..10820e08d46baf4aa6ac8aae9e19040b4fd30bd3 100644 (file)
--- a/configs/qemu-vm.c
+++ b/configs/qemu-vm.c
@@ -38,7 +38,7 @@ struct {
                        .phys_start = 0x3fffe000,
                        .size = 0x2000,
                },
-               .system = {
+               .root_cell = {
                        .name = "QEMU Linux VM",
 
                        .cpu_set_size = sizeof(config.cpus),

diff --git a/driver.c b/driver.c
index e5b0ae538f6e58f1bde4edbec5eaa4c3b8d3893e..d71d09fab755f8447028573cc2a739876bcd4d44 100644 (file)
--- a/driver.c
+++ b/driver.c
@@ -300,7 +300,7 @@ static int jailhouse_enable(struct jailhouse_system __user *arg)
 
        if (copy_from_user(&config_header, arg, sizeof(config_header)))
                return -EFAULT;
-       config_header.system.name[JAILHOUSE_CELL_NAME_MAXLEN] = 0;
+       config_header.root_cell.name[JAILHOUSE_CELL_NAME_MAXLEN] = 0;
 
        if (mutex_lock_interruptible(&lock) != 0)
                return -EINTR;
@@ -351,7 +351,7 @@ static int jailhouse_enable(struct jailhouse_system __user *arg)
                goto error_unmap;
        }
 
-       root_cell = create_cell(&config->system);
+       root_cell = create_cell(&config->root_cell);
        if (IS_ERR(root_cell)) {
                err = PTR_ERR(root_cell);
                goto error_unmap;

diff --git a/hypervisor/control.c b/hypervisor/control.c
index fb8513c95bbcb910a1a4659c1416296540affbce..34bb8343c6d0a63877c63de05d34f4465e08657e 100644 (file)
--- a/hypervisor/control.c
+++ b/hypervisor/control.c
@@ -44,9 +44,9 @@ unsigned int next_cpu(unsigned int cpu, struct cpu_set *cpu_set, int exception)
 bool cpu_id_valid(unsigned long cpu_id)
 {
        const unsigned long *system_cpu_set =
-               jailhouse_cell_cpu_set(&system_config->system);
+               jailhouse_cell_cpu_set(&system_config->root_cell);
 
-       return (cpu_id < system_config->system.cpu_set_size * 8 &&
+       return (cpu_id < system_config->root_cell.cpu_set_size * 8 &&
                test_bit(cpu_id, system_cpu_set));
 }
 

diff --git a/hypervisor/include/jailhouse/cell-config.h b/hypervisor/include/jailhouse/cell-config.h
index b6bc6f00bcbbe841d30313c1977e867e293ac086..adaeb23b868184c5b0558cecf0ceffdcc880694c 100644 (file)
--- a/hypervisor/include/jailhouse/cell-config.h
+++ b/hypervisor/include/jailhouse/cell-config.h
@@ -68,7 +68,7 @@ struct jailhouse_pci_device {
 struct jailhouse_system {
        struct jailhouse_memory hypervisor_memory;
        struct jailhouse_memory config_memory;
-       struct jailhouse_cell_desc system;
+       struct jailhouse_cell_desc root_cell;
 } __attribute__((packed));
 
 static inline __u32
@@ -85,8 +85,8 @@ jailhouse_cell_config_size(struct jailhouse_cell_desc *cell)
 static inline __u32
 jailhouse_system_config_size(struct jailhouse_system *system)
 {
-       return sizeof(*system) - sizeof(system->system) +
-               jailhouse_cell_config_size(&system->system);
+       return sizeof(*system) - sizeof(system->root_cell) +
+               jailhouse_cell_config_size(&system->root_cell);
 }
 
 static inline const unsigned long *

diff --git a/hypervisor/setup.c b/hypervisor/setup.c
index b7643a0f2d23bf8affc2e8f7c99ef42949bff2f9..692f78a23f3411476eca228ad44f53a549de9677 100644 (file)
--- a/hypervisor/setup.c
+++ b/hypervisor/setup.c
@@ -56,7 +56,7 @@ static void init_early(unsigned int cpu_id)
        if (error)
                return;
 
-       root_cell.config = &system_config->system;
+       root_cell.config = &system_config->root_cell;
 
        if (system_config->config_memory.size > 0) {
                size = PAGE_ALIGN(system_config->config_memory.size);
@@ -75,7 +75,7 @@ static void init_early(unsigned int cpu_id)
                        return;
        }
 
-       error = check_mem_regions(&system_config->system);
+       error = check_mem_regions(&system_config->root_cell);
        if (error)
                return;