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 c7ebd4d4679e4b8a0c0961d83b92d72965bf69b9..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
+                       },
                },
        },