configs: hpet config improved.

diff --git a/configs/hpet-inmate-config.c b/configs/hpet-inmate-config.c
index 96ec18c80d19437cd77dfebd7efa6e7670317d8e..d1ce8bdea11e473d437a62af101cb967434699ac 100755 (executable)
--- a/configs/hpet-inmate-config.c
+++ b/configs/hpet-inmate-config.c
@@ -20,8 +20,8 @@
 struct {
        struct jailhouse_cell_desc cell;
        __u64 cpus[1];
-       struct jailhouse_memory mem_regions[3];
-       struct jailhouse_irqchip irqchips[1];
+       struct jailhouse_memory mem_regions[4];
+       struct jailhouse_irqchip irqchips[0];
        __u8 pio_bitmap[0x2000];
 } __attribute__((packed)) config = {
        .cell = {
@@ -75,17 +75,23 @@ struct {
                        .size = 0x1000,
                        .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE,
                },
-       },
-
-       .irqchips = {
-               /* IOAPIC */ {
-                       .address = 0xfec00000,
-                       .id = 0xff01,
-               /* Timer0 has IRQ2, Timer1 has IRQ8, IRQ16-IRQ32 could be used for timers too.*/
-                       .pin_bitmap = 0x00ff0104, 
+               {
+                       .phys_start = 0xfec00000,
+                       .virt_start = 0xfec00000,
+                       .size = 0x1000,
+                       .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE,
                },
        },
 
+       // .irqchips = {
+       //      /* IOAPIC */ {
+       //              .address = 0xfec00000,
+       //              .id = 0xff01,
+       //      /* Timer0 has IRQ2, Timer1 has IRQ8, IRQ16-IRQ32 could be used for timers too.*/
+       //              .pin_bitmap = 0x00ff0104, 
+       //      },
+       // },
+
        .pio_bitmap = {
                [     0/8 ...  0x3f7/8] = -1,
                [ 0x3f8/8 ...  0x3ff/8] = 0, /* serial1 */