Merge remote-tracking branch 'kiszka/master'

[jailhouse.git] / configs / linux-x86-demo.c

diff --git a/configs/linux-x86-demo.c b/configs/linux-x86-demo.c
index 539104f9d4f96efe9042fb21812a4e092cb4514a..e874aebf9acbc652e777039c69ba084cc937ba65 100644 (file)
--- a/configs/linux-x86-demo.c
+++ b/configs/linux-x86-demo.c
@@ -21,6 +21,7 @@ struct {
        struct jailhouse_cell_desc cell;
        __u64 cpus[1];
        struct jailhouse_memory mem_regions[4];
+       struct jailhouse_cache cache_regions[1];
        __u8 pio_bitmap[0x2000];
        struct jailhouse_pci_device pci_devices[1];
 } __attribute__((packed)) config = {
@@ -31,6 +32,7 @@ struct {
 
                .cpu_set_size = sizeof(config.cpus),
                .num_memory_regions = ARRAY_SIZE(config.mem_regions),
+               .num_cache_regions = ARRAY_SIZE(config.cache_regions),
                .num_irqchips = 0,
                .pio_bitmap_size = ARRAY_SIZE(config.pio_bitmap),
                .num_pci_devices = ARRAY_SIZE(config.pci_devices),
@@ -74,6 +76,14 @@ struct {
                },
        },
 
+       .cache_regions = {
+               {
+                       .start = 0,
+                       .size = 2,
+                       .type = JAILHOUSE_CACHE_L3,
+               },
+       },
+
        .pio_bitmap = {
                [     0/8 ...  0x3f7/8] = -1,
                [ 0x3f8/8 ...  0x3ff/8] = 0, /* serial1 */