From e82b54498f6f455636dcf91fde1afb652a75af42 Mon Sep 17 00:00:00 2001 From: Maxim Baryshnikov Date: Fri, 8 Apr 2016 04:05:14 +0200 Subject: [PATCH] configs: fiasco: fix some mistakes - keep only one memreg, no comm region, 2 cpus. --- configs/fiasco-demo.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/configs/fiasco-demo.c b/configs/fiasco-demo.c index cff71a7..7453734 100755 --- a/configs/fiasco-demo.c +++ b/configs/fiasco-demo.c @@ -20,14 +20,14 @@ struct { struct jailhouse_cell_desc cell; __u64 cpus[1]; - struct jailhouse_memory mem_regions[2]; + struct jailhouse_memory mem_regions[1]; __u8 pio_bitmap[0x2000]; struct jailhouse_pci_device pci_devices[0]; } __attribute__((packed)) config = { .cell = { .signature = JAILHOUSE_CELL_DESC_SIGNATURE, .name = "fiasco-demo", - .flags = JAILHOUSE_CELL_PASSIVE_COMMREG, + .flags = 0/*JAILHOUSE_CELL_PASSIVE_COMMREG*/, .cpu_set_size = sizeof(config.cpus), .num_memory_regions = ARRAY_SIZE(config.mem_regions), @@ -38,24 +38,24 @@ struct { }, .cpus = { - 0xe, + 0xc, }, .mem_regions = { /* low RAM */ { .phys_start = 0x3b600000, .virt_start = 0, - .size = 0x3aff000, + .size = 0x44ff000, .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE | JAILHOUSE_MEM_EXECUTE | JAILHOUSE_MEM_DMA | JAILHOUSE_MEM_LOADABLE, }, - /* communication region */ { - .virt_start = 0x00100000, - .size = 0x00001000, - .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE | - JAILHOUSE_MEM_COMM_REGION, - }, + ///* communication region */ { + // .virt_start = 0x00100000, + // .size = 0x00001000, + // .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE | + // JAILHOUSE_MEM_COMM_REGION, + //}, // /* high RAM */ { // .phys_start = 0x3b700000, // .virt_start = 0x00200000, -- 2.39.2