From 287503fb40db8184c5f1a438543e72e8bbdef436 Mon Sep 17 00:00:00 2001
From: Maxim Baryshnikov <barysmax@fel.cvut.cz>
Date: Sun, 24 Apr 2016 18:19:20 +0200
Subject: [PATCH] configs: fiasco: Remove irqchip out of configuration. It's
 enough for fiasco to have only memreg allowed to use lAPIC.

---
 configs/fiasco-demo.c | 42 ++++++------------------------------------
 1 file changed, 6 insertions(+), 36 deletions(-)

diff --git a/configs/fiasco-demo.c b/configs/fiasco-demo.c
index 59bc887..1414995 100755
--- a/configs/fiasco-demo.c
+++ b/configs/fiasco-demo.c
@@ -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,
-- 
2.39.2