Merge remote-tracking branch 'kiszka/master'

[jailhouse.git] / hypervisor / arch / arm / include / asm / cell.h

diff --git a/hypervisor/arch/arm/include/asm/cell.h b/hypervisor/arch/arm/include/asm/cell.h
index 42b58cf78e04cdfcafa3f76001844e215e41ce01..696856a88fc829b57ebe6e593e51b20a1d39c44c 100644 (file)
--- a/hypervisor/arch/arm/include/asm/cell.h
+++ b/hypervisor/arch/arm/include/asm/cell.h
@@ -1,7 +1,7 @@
 /*
  * Jailhouse, a Linux-based partitioning hypervisor
  *
- * Copyright (c) Siemens AG, 2013
+ * Copyright (c) Siemens AG, 2013-2016
  *
  * Authors:
  *  Jan Kiszka <jan.kiszka@siemens.com>
@@ -14,6 +14,7 @@
 #define _JAILHOUSE_ASM_CELL_H
 
 #include <jailhouse/types.h>
+#include <asm/smp.h>
 #include <asm/spinlock.h>
 
 #ifndef __ASSEMBLY__
@@ -22,38 +23,22 @@
 #include <jailhouse/paging.h>
 #include <jailhouse/hypercall.h>
 
+/** ARM-specific cell states. */
 struct arch_cell {
        struct paging_structures mm;
+       struct smp_ops *smp;
 
        spinlock_t caches_lock;
        bool needs_flush;
 
-       u64 spis;
+       u32 irq_bitmap[1024/32];
 
        unsigned int last_virt_id;
 };
 
-struct cell {
-       struct arch_cell arch;
-
-       unsigned int id;
-       unsigned int data_pages;
-       struct jailhouse_cell_desc *config;
-
-       struct cpu_set *cpu_set;
-       struct cpu_set small_cpu_set;
-
-       bool loadable;
-
-       struct cell *next;
-
-       union {
-               struct jailhouse_comm_region comm_region;
-               u8 padding[PAGE_SIZE];
-       } __attribute__((aligned(PAGE_SIZE))) comm_page;
+/** PCI-related cell states. */
+struct pci_cell {
 };
 
-extern struct cell root_cell;
-
 #endif /* !__ASSEMBLY__ */
 #endif /* !_JAILHOUSE_ASM_CELL_H */