]> rtime.felk.cvut.cz Git - jailhouse.git/commitdiff
configs: fiasco: Remove irqchip out of configuration. It's enough for fiasco to have...
authorMaxim Baryshnikov <barysmax@fel.cvut.cz>
Sun, 24 Apr 2016 16:19:20 +0000 (18:19 +0200)
committerMaxim Baryshnikov <barysmax@fel.cvut.cz>
Sun, 24 Apr 2016 16:19:20 +0000 (18:19 +0200)
configs/fiasco-demo.c

index 59bc887223af19baf850776c89383dcec8efaebe..141499569938ff9fdc0e1eec44faa8d5c23c72af 100755 (executable)
@@ -21,7 +21,7 @@ struct {
        struct jailhouse_cell_desc cell;
        __u64 cpus[1];
        struct jailhouse_memory mem_regions[2]; 
-       struct jailhouse_irqchip irqchips[1];
+       struct jailhouse_irqchip irqchips[0];
        __u8 pio_bitmap[0x2000];
        struct jailhouse_pci_device pci_devices[0];
 } __attribute__((packed)) config = {
@@ -51,46 +51,16 @@ struct {
                                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,
-               //},
-               // /* high RAM */ {
-               //      .phys_start = 0x3b700000,
-               //      .virt_start = 0x00200000,
-               //      .size = 0x3aff000,
-               //      .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
-               //              JAILHOUSE_MEM_EXECUTE | JAILHOUSE_MEM_DMA |
-               //              JAILHOUSE_MEM_LOADABLE,
-               // },
-               // /* IVSHMEM shared memory region */
-               // {
-               //      .phys_start = 0x3f1ff000,
-               //      .virt_start = 0x3f1ff000,
-               //      .size = 0x1000,
-               //      .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE |
-               //              JAILHOUSE_MEM_ROOTSHARED,
-               // },
-               /* MemRegion: fec00000-feefffff : PNP0103:00 */
+               
+               /* MemRegion: fee00000-feefffff : localAPIC */
                {
-                       .phys_start = 0xfec00000,
-                       .virt_start = 0xfec00000,
-                       .size = 0x300000,
+                       .phys_start = 0xfee00000,
+                       .virt_start = 0xfee00000,
+                       .size = 0x100000,
                        .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE | JAILHOUSE_MEM_DMA,
                },
        },
 
-       .irqchips = {
-               // lAPIC
-               {
-                       .address = 0xfec00000,
-                       .id = 0xff01,
-                       .pin_bitmap = 0xffffffff,
-               },
-       },
-
        .pio_bitmap = {
                
                [     0/8 ...   0x3f/8] = -1,