Merge remote-tracking branch 'kiszka/master'

[jailhouse.git] / configs / qemu-vm.c

diff --git a/configs/qemu-vm.c b/configs/qemu-vm.c
index 61eb209e4ed33659d73a35d528c51a978f1b6b9c..7077fbd4a7ea219b567d0ceaf4dfe9b707a0b653 100755 (executable)
--- a/configs/qemu-vm.c
+++ b/configs/qemu-vm.c
@@ -46,12 +46,18 @@ struct {
                        .phys_start = 0x3b000000,
                        .size = 0x600000,
                },
+               .debug_console = {
+                       .phys_start = 0x3f8,
+               },
                .platform_info.x86 = {
                        .mmconfig_base = 0xb0000000,
                        .mmconfig_end_bus = 0xff,
                        .pm_timer_address = 0x608,
-                       .iommu_base = {
-                               0xfed90000,
+                       .iommu_units = {
+                               {
+                                       .base = 0xfed90000,
+                                       .size = 0x1000,
+                               },
                        },
                },
                .interrupt_limit = 256,
@@ -175,8 +181,10 @@ struct {
        .irqchips = {
                /* IOAPIC */ {
                        .address = 0xfec00000,
-                       .id = 0xff01,
-                       .pin_bitmap = 0xffffff,
+                       .id = 0xff00,
+                       .pin_bitmap = {
+                                   0xffffff
+                       },
                },
        },
 
@@ -203,7 +211,7 @@ struct {
                [ 0x3b0/8 ...  0x3df/8] = 0, /* VGA */
                [ 0x3e0/8 ...  0x3ef/8] = -1,
                [ 0x3f0/8 ...  0x3f7/8] = 0, /* floppy */
-               [ 0x3f8/8 ...  0x3ff/8] = -1/*0*/,
+               [ 0x3f8/8 ...  0x3ff/8] = 0,
                [ 0x400/8 ...  0x407/8] = 0xfb, /* invalid but accessed by X */
                [ 0x408/8 ... 0x5657/8] = -1,
                [0x5658/8 ... 0x565f/8] = 0xf0, /* vmport */