jailhouse: inmates: bench: Add -R option -- repeats count.

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

diff --git a/configs/qemu-vm.c b/configs/qemu-vm.c
index c7ebd4d4679e4b8a0c0961d83b92d72965bf69b9..8a8a38ad8cd38998f704834e76093bb450f5dffe 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,
@@ -155,7 +161,7 @@ struct {
                        .size = 0x1000,
                        .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE,
                },
-               
+
                /* MemRegion: fed00000-fed003ff : PNP0103:00 */
                {
                        .phys_start = 0xfed00000,
@@ -175,8 +181,10 @@ struct {
        .irqchips = {
                /* IOAPIC */ {
                        .address = 0xfec00000,
-                       .id = 0xff01,
-                       .pin_bitmap = 0xffffff,
+                       .id = 0xff00,
+                       .pin_bitmap = {
+                                   0xffffff
+                       },
                },
        },
 
@@ -191,10 +199,10 @@ struct {
                [  0x78/8 ...   0x7f/8] = -1,
                [  0x80/8 ...   0x87/8] = 0xfe, /* port 80 (delays) */
 
-               [  0x88/8 ...   0xec/8] = -1,
-               [  0xed/8 ...   0xf5/8] = 0xfe, /*port 0xed delay experimental*/        
-               [  0xf6/8 ...  0x1c7/8] = -1,
-               
+               [  0x88/8 ...   0xe7/8] = -1,
+               [  0xe8/8 ...   0xef/8] = 0xdf, /*port 0xed delay experimental*/
+               [  0xf0/8 ...  0x1c7/8] = -1,
+
                [ 0x1c8/8 ...  0x1cf/8] = 0x3f, /* vbe */
                [ 0x1d0/8 ...  0x1d7/8] = 0xfe, /* vbe */
                [ 0x1d8/8 ...  0x2f7/8] = -1,
@@ -247,7 +255,7 @@ struct {
                        .type = JAILHOUSE_PCI_TYPE_DEVICE,
                        .domain = 0x0000,
                        .bdf = 0x00ea,
-               },              
+               },
                {/*ehci_pci 00:1d.7*/
                        .type = JAILHOUSE_PCI_TYPE_DEVICE,
                        .domain = 0x0000,
@@ -294,7 +302,7 @@ struct {
                        .shmem_region = 12,
                        .num_msix_vectors = 1,
                },
-               
+
        },
 
        .pci_caps = {