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
old mode 100644 (file)
new mode 100755 (executable)
index 1d7481e..8a8a38a
--- a/configs/qemu-vm.c
+++ b/configs/qemu-vm.c
@@ -34,11 +34,11 @@
 struct {
        struct jailhouse_system header;
        __u64 cpus[1];
-       struct jailhouse_memory mem_regions[13];
+       struct jailhouse_memory mem_regions[14];
        struct jailhouse_irqchip irqchips[1];
        __u8 pio_bitmap[0x2000];
-       struct jailhouse_pci_device pci_devices[8];
-       struct jailhouse_pci_capability pci_caps[5];
+       struct jailhouse_pci_device pci_devices[11];
+       struct jailhouse_pci_capability pci_caps[4];
 } __attribute__((packed)) config = {
        .header = {
                .signature = JAILHOUSE_SYSTEM_SIGNATURE,
@@ -56,6 +56,7 @@ struct {
                        .iommu_units = {
                                {
                                        .base = 0xfed90000,
+                                       .size = 0x1000,
                                },
                        },
                },
@@ -153,6 +154,14 @@ struct {
                        .size = 0x1000,
                        .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE,
                },
+               /* MemRegion: febf6000-febf6fff : virtio-9p */
+               {
+                       .phys_start = 0xfebf6000,
+                       .virt_start = 0xfebf6000,
+                       .size = 0x1000,
+                       .flags = JAILHOUSE_MEM_READ | JAILHOUSE_MEM_WRITE,
+               },
+
                /* MemRegion: fed00000-fed003ff : PNP0103:00 */
                {
                        .phys_start = 0xfed00000,
@@ -172,8 +181,10 @@ struct {
        .irqchips = {
                /* IOAPIC */ {
                        .address = 0xfec00000,
-                       .id = 0xff01,
-                       .pin_bitmap = 0xffffff,
+                       .id = 0xff00,
+                       .pin_bitmap = {
+                                   0xffffff
+                       },
                },
        },
 
@@ -182,12 +193,16 @@ struct {
                [  0x20/8 ...   0x3f/8] = -1,
                [  0x40/8 ...   0x47/8] = 0xf0, /* PIT */
                [  0x48/8 ...   0x5f/8] = -1,
-               [  0x60/8 ...   0x67/8] = 0xec, /* HACK: NMI status/control */
+               [  0x60/8 ...   0x67/8] = 0xfd, /*0xec HACK: NMI status/control */
                [  0x68/8 ...   0x6f/8] = -1,
                [  0x70/8 ...   0x77/8] = 0xfc, /* rtc */
                [  0x78/8 ...   0x7f/8] = -1,
                [  0x80/8 ...   0x87/8] = 0xfe, /* port 80 (delays) */
-               [  0x88/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,
@@ -196,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,
+               [ 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 */
@@ -225,6 +240,28 @@ struct {
                        .num_msi_vectors = 1,
                        .msi_64bits = 1,
                },
+
+               {/*uhci_hcd 00:1d.0*/
+                       .type = JAILHOUSE_PCI_TYPE_DEVICE,
+                       .domain = 0x0000,
+                       .bdf = 0x00e8,
+               },
+               {/*uhci_hcd 00:1d.1*/
+                       .type = JAILHOUSE_PCI_TYPE_DEVICE,
+                       .domain = 0x0000,
+                       .bdf = 0x00e9,
+               },
+               {/*uhci_hcd 00:1d.2*/
+                       .type = JAILHOUSE_PCI_TYPE_DEVICE,
+                       .domain = 0x0000,
+                       .bdf = 0x00ea,
+               },
+               {/*ehci_pci 00:1d.7*/
+                       .type = JAILHOUSE_PCI_TYPE_DEVICE,
+                       .domain = 0x0000,
+                       .bdf = 0x00ef,
+               },
+
                { /* ISA bridge */
                        .type = JAILHOUSE_PCI_TYPE_DEVICE,
                        .domain = 0x0000,
@@ -244,7 +281,7 @@ struct {
                        .domain = 0x0000,
                        .bdf = 0x00fb,
                },
-               { /* virtio-9p-pci */
+               /*{ // virtio-9p-pci /
                        .type = JAILHOUSE_PCI_TYPE_DEVICE,
                        .domain = 0x0000,
                        .bdf = 0x00ff,
@@ -253,7 +290,7 @@ struct {
                        .num_msix_vectors = 2,
                        .msix_region_size = 0x1000,
                        .msix_address = 0xfebf6000,
-               },
+               },*/
                {
                        .type = JAILHOUSE_PCI_TYPE_IVSHMEM,
                        .domain = 0x0,
@@ -265,6 +302,7 @@ struct {
                        .shmem_region = 12,
                        .num_msix_vectors = 1,
                },
+
        },
 
        .pci_caps = {
@@ -291,11 +329,11 @@ struct {
                        .len = 14,
                        .flags = JAILHOUSE_PCICAPS_WRITE,
                },
-               { /* virtio-9p-pci */
+               /*{ // virtio-9p-pci //
                        .id = 0x11,
                        .start = 0x40,
                        .len = 12,
                        .flags = JAILHOUSE_PCICAPS_WRITE,
-               },
+               },*/
        },
 };