o Fixed the sleep in dts which is used for secondary storage
settle down period
o Updated defconfig to disable password based login by default
Signed-off-by: Himanshu Chauhan <
hcha...@xvisor-x86.org>
---
.../board/x86_64_generic/dts/defconfig.dts | 2 +-
arch/x86/configs/x86_64_generic-defconfig | 40 ++++++++++++++-----
2 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/arch/x86/board/x86_64_generic/dts/defconfig.dts b/arch/x86/board/x86_64_generic/dts/defconfig.dts
index 0092cfa4..0ba89b3e 100644
--- a/arch/x86/board/x86_64_generic/dts/defconfig.dts
+++ b/arch/x86/board/x86_64_generic/dts/defconfig.dts
@@ -72,7 +72,7 @@
chosen {
console = &SERIAL0;
bootcmd = "echo Waiting for 3 seconds to let block devices settle down...",
- "sleep 3", /* Let block devices settle down */
+ "sleep secs 3", /* Let block devices settle down */
"vfs mount hda0p0 /",
/* Kick off the startup script */
diff --git a/arch/x86/configs/x86_64_generic-defconfig b/arch/x86/configs/x86_64_generic-defconfig
index bbeb3bec..7c068852 100644
--- a/arch/x86/configs/x86_64_generic-defconfig
+++ b/arch/x86/configs/x86_64_generic-defconfig
@@ -1,10 +1,11 @@
#
# Automatically generated make config: don't edit
# Project: Xvisor (eXtensible Versatile hypervISOR)
-# Version: 0.2.10
-# Sat Feb 3 12:05:25 2018
+# Version: 0.3.0
+# Fri Feb 26 15:24:54 2021
#
# CONFIG_ARCH_ARM is not set
+# CONFIG_ARCH_RISCV is not set
CONFIG_ARCH_x86=y
CONFIG_ARCH="x86"
# CONFIG_SMP is not set
@@ -65,6 +66,15 @@ CONFIG_LAPIC_TIMER=y
CONFIG_PCI_DIRECT=y
CONFIG_X86_LEGACY_HOST=y
+#
+# Architecture Common Options
+#
+# CONFIG_ARCH_GENERIC_BOARD is not set
+# CONFIG_ARCH_GENERIC_DEFTERM is not set
+# CONFIG_ARCH_GENERIC_DEFTERM_EARLY is not set
+# CONFIG_ARCH_GENERIC_DEVTREE is not set
+# CONFIG_ARCH_GENERIC_MMU is not set
+
#
# Hypervisor Options
#
@@ -81,7 +91,7 @@ CONFIG_THREAD_STACK_SIZE=8192
CONFIG_MAX_RAM_BANK_COUNT=16
CONFIG_MAX_VCPU_COUNT=64
CONFIG_MAX_GUEST_COUNT=16
-CONFIG_MEMMAP_HASH_SIZE=256
+CONFIG_MEMMAP_HASH_SIZE_FACTOR=2
CONFIG_VGPA2REG_CACHE_SIZE=8
CONFIG_WFI_TIMEOUT_SECS=10
# CONFIG_DEVEMU_DEBUG is not set
@@ -90,8 +100,8 @@ CONFIG_WFI_TIMEOUT_SECS=10
#
# Heap Configuration
#
-CONFIG_HEAP_SIZE_MB=4
-CONFIG_DMA_HEAP_SIZE_KB=512
+CONFIG_HEAP_SIZE_FACTOR=3
+CONFIG_DMA_HEAP_SIZE_FACTOR=24
#
# Scheduler Configuration
@@ -178,6 +188,7 @@ CONFIG_CMD_ECHO=y
CONFIG_CMD_RESET=y
CONFIG_CMD_SHUTDOWN=y
CONFIG_CMD_HOST=y
+CONFIG_CMD_IOMMU=y
CONFIG_CMD_DEVTREE=y
CONFIG_CMD_VCPU=y
CONFIG_CMD_GUEST=y
@@ -268,13 +279,9 @@ CONFIG_CRYPTO=y
CONFIG_CRYPTO_HASHES=y
CONFIG_CRYPTO_HASH_MD5=y
CONFIG_CRYPTO_HASH_SHA256=y
-CONFIG_LIBAUTH=y
-CONFIG_LIBAUTH_FILE="/system/passwd"
-CONFIG_LIBAUTH_USE_MD5_PASSWD=y
+# CONFIG_LIBAUTH is not set
+# CONFIG_LIBAUTH_USE_MD5_PASSWD is not set
# CONFIG_LIBAUTH_USE_SHA256_PASSWD is not set
-CONFIG_LIBAUTH_DEFAULT_USER=y
-CONFIG_LIBAUTH_DEFAULT_USERNAME="admin"
-CONFIG_LIBAUTH_DEFAULT_PASSWD="EQuiN0X"
# CONFIG_GENALLOC is not set
# CONFIG_IMAGE_LOADER is not set
# CONFIG_SCSI is not set
@@ -290,6 +297,8 @@ CONFIG_LIBAUTH_DEFAULT_PASSWD="EQuiN0X"
CONFIG_OF=y
CONFIG_GENERIC_IO=y
CONFIG_HAS_IOPORT_MAP=y
+# CONFIG_REGMAP is not set
+# CONFIG_REGMAP_MMIO is not set
#
# Interrupt Controller Drivers
@@ -423,6 +432,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
# CONFIG_FB_MODE_HELPERS is not set
# CONFIG_FB_TILEBLITTING is not set
CONFIG_FB_VESA=y
+# CONFIG_FB_SIMPLE is not set
# CONFIG_FB_BACKLIGHT is not set
#
@@ -432,6 +442,8 @@ CONFIG_FB_VESA=y
#
# Clock Drivers
#
+# CONFIG_HAVE_CLK is not set
+# CONFIG_HAVE_CLK_PREPARE is not set
# CONFIG_CLKDEV_LOOKUP is not set
# CONFIG_COMMON_CLK is not set
@@ -454,6 +466,7 @@ CONFIG_FB_VESA=y
#
# CONFIG_REALVIEW_CONFIG is not set
# CONFIG_VEXPRESS_CONFIG is not set
+# CONFIG_MFD_SYSCON is not set
#
# IDE Driver
@@ -476,6 +489,8 @@ CONFIG_PIIX3_IDE=y
# Pin Controller
#
# CONFIG_PINCTRL is not set
+# CONFIG_PINCTRL_ARMADA_AP806 is not set
+# CONFIG_PINCTRL_ARMADA_CP110 is not set
#
# SPI drivers
@@ -534,6 +549,7 @@ CONFIG_EMU_PIC=y
# CONFIG_EMU_PIC_PL190 is not set
CONFIG_EMU_PIC_I8259=y
CONFIG_EMU_PIC_LAPIC=y
+# CONFIG_EMU_PIC_PLIC is not set
#
# Timer Emulators
@@ -587,6 +603,7 @@ CONFIG_EMU_INPUT=y
CONFIG_EMU_INPUT_PS2=y
# CONFIG_EMU_INPUT_PL050 is not set
CONFIG_EMU_INPUT_I8042=y
+# CONFIG_EMU_INPUT_VIRTIO is not set
#
# Serial Port Emulators
@@ -612,6 +629,7 @@ CONFIG_EMU_SERIAL_NS16550=y
CONFIG_EMU_RTC=y
# CONFIG_EMU_RTC_PL031 is not set
CONFIG_EMU_RTC_MC146818=y
+# CONFIG_EMU_RTC_GOLDFISH is not set
#
# GPIO Emulators
--
2.27.0