config, core: Improve irqchip configuration

[jailhouse.git] / configs / ioapic-demo.c

diff --git a/configs/ioapic-demo.c b/configs/ioapic-demo.c
index 40e43f2bb5ba0ca39c140cae311fdd66bf228c39..64f3e74fd4db31a864193e25888fa9ff94f0ba3c 100644 (file)
--- a/configs/ioapic-demo.c
+++ b/configs/ioapic-demo.c
@@ -26,6 +26,7 @@ struct {
        __u8 pio_bitmap[0x2000];
 } __attribute__((packed)) config = {
        .cell = {
+               .signature = JAILHOUSE_CELL_DESC_SIGNATURE,
                .name = "ioapic-demo",
                .flags = JAILHOUSE_CELL_PASSIVE_COMMREG,
 
@@ -60,7 +61,9 @@ struct {
                /* IOAPIC */ {
                        .address = 0xfec00000,
                        .id = 0xff01,
-                       .pin_bitmap = 0x000200, /* ACPI IRQ */
+                       .pin_bitmap = {
+                               0x000200 /* ACPI IRQ */
+                       },
                },
        },
 
@@ -69,7 +72,9 @@ struct {
                [ 0x2f8/8 ...  0x2ff/8] = 0, /* serial2 */
                [ 0x300/8 ...  0x5ff/8] = -1,
                [ 0x600/8 ...  0x607/8] = 0xf0, /* acpi-evt */
-               [ 0x608/8 ... 0xdfff/8] = -1,
+               [ 0x608/8 ...  0x7ff/8] = -1,
+               [ 0x800/8 ...  0x807/8] = 0xf0 /* apci-pm1a */,
+               [ 0x808/8 ... 0xdfff/8] = -1,
                [0xe000/8 ... 0xe007/8] = 0, /* OXPCIe952 serial2 */
                [0xe008/8 ... 0xffff/8] = -1,
        },