Merge branch 'master' of rtime.felk.cvut.cz:jailhouse

Conflicts:
	configs/novabox.c

diff --git a/ci/kernel-config-x86-custom b/ci/kernel-config-x86-custom
index 519f6ec9b617df417bff6d545f29e3e7039c1e3e..d64dd34b1292f80b3a0c3784446ebd993934be0e 100644 (file)
--- a/ci/kernel-config-x86-custom
+++ b/ci/kernel-config-x86-custom
@@ -172,7 +172,8 @@ CONFIG_IPC_NS=y
 CONFIG_PID_NS=y
 CONFIG_NET_NS=y
 # CONFIG_SCHED_AUTOGROUP is not set
-# CONFIG_SYSFS_DEPRECATED is not set
+CONFIG_SYSFS_DEPRECATED=y
+# CONFIG_SYSFS_DEPRECATED_V2 is not set
 CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
@@ -243,6 +244,7 @@ CONFIG_OPTPROBES=y
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y
 CONFIG_KRETPROBES=y
+CONFIG_USER_RETURN_NOTIFIER=y
 CONFIG_HAVE_IOREMAP_PROT=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
@@ -301,7 +303,7 @@ CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
-# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_FORCE_LOAD=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_MODVERSIONS is not set
@@ -350,6 +352,7 @@ CONFIG_IOSCHED_CFQ=y
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_PREEMPT_NOTIFIERS=y
 CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
 CONFIG_INLINE_READ_UNLOCK=y
 CONFIG_INLINE_READ_UNLOCK_IRQ=y
@@ -483,6 +486,7 @@ CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_ZONE_DMA_FLAG=1
 CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
+CONFIG_MMU_NOTIFIER=y
 # CONFIG_KSM is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
@@ -2448,6 +2452,7 @@ CONFIG_DMA_ACPI=y
 # CONFIG_AUXDISPLAY is not set
 # CONFIG_UIO is not set
 # CONFIG_VFIO is not set
+CONFIG_IRQ_BYPASS_MANAGER=y
 # CONFIG_VIRT_DRIVERS is not set
 
 #
@@ -3218,8 +3223,25 @@ CONFIG_CRYPTO_HW=y
 #
 # CONFIG_SYSTEM_TRUSTED_KEYRING is not set
 CONFIG_HAVE_KVM=y
+CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_IRQFD=y
+CONFIG_HAVE_KVM_IRQ_ROUTING=y
+CONFIG_HAVE_KVM_EVENTFD=y
+CONFIG_KVM_APIC_ARCHITECTURE=y
+CONFIG_KVM_MMIO=y
+CONFIG_KVM_ASYNC_PF=y
+CONFIG_HAVE_KVM_MSI=y
+CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
+CONFIG_KVM_VFIO=y
+CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
+CONFIG_KVM_COMPAT=y
+CONFIG_HAVE_KVM_IRQ_BYPASS=y
 CONFIG_VIRTUALIZATION=y
-# CONFIG_KVM is not set
+CONFIG_KVM=y
+CONFIG_KVM_INTEL=y
+CONFIG_KVM_AMD=y
+# CONFIG_KVM_MMU_AUDIT is not set
+# CONFIG_KVM_DEVICE_ASSIGNMENT is not set
 CONFIG_BINARY_PRINTF=y
 
 #

diff --git a/configs/novabox.c b/configs/novabox.c
index 18656ff7f69ae057c674a8031991807ad86f54dc..f9522b0f56d9404cc0daf5beae1214537884eded 100644 (file)
--- a/configs/novabox.c
+++ b/configs/novabox.c
@@ -63,10 +63,17 @@ struct {
                        .mmconfig_base = 0xf8000000,
                        .mmconfig_end_bus = 0x3f,
                        .pm_timer_address = 0x408,
+<<<<<<< HEAD
                         .iommu_base = {
                                0xfed90000,
                                0xfed91000,
                         },
+=======
+                       .iommu_base = {
+                               0xfed90000,
+                               0xfed91000,
+                       },
+>>>>>>> 11dff97feece0823144bbe800b9e56c6995cd2fb
                },
                .device_limit = 128,
                .interrupt_limit = 256,

diff --git a/configs/qemu-vm.c b/configs/qemu-vm.c
index 61eb209e4ed33659d73a35d528c51a978f1b6b9c..c7ebd4d4679e4b8a0c0961d83b92d72965bf69b9 100755 (executable)
--- a/configs/qemu-vm.c
+++ b/configs/qemu-vm.c
@@ -203,7 +203,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 */

diff --git a/hypervisor/arch/x86/dbg-write.c b/hypervisor/arch/x86/dbg-write.c
index 72f1be51e7a75fa08455b33e482fa1e99b28b645..f359c1af3df349f0d535ed3254b46bff40468c20 100644 (file)
--- a/hypervisor/arch/x86/dbg-write.c
+++ b/hypervisor/arch/x86/dbg-write.c
@@ -18,7 +18,7 @@
 #define UART_BASE              0xe010
 #else
 //it was changed for fiasco use-case (default 0x3f8)
-#define UART_BASE              0x2f8
+#define UART_BASE              0x3f8
 #endif
 #define  UART_TX               0x0
 #define  UART_DLL              0x0