From 546a6d05129d82fe1de463fa761ebfd6b55bc28c Mon Sep 17 00:00:00 2001
From: Anders Roxell <anders.roxell@linaro.org>
Date: Mon, 15 Jan 2018 22:43:37 +0100
Subject: [PATCH] arm64: defconfig: re-enable VIRTIO configs

Since patch - "4f2fe01 virtio: make VIRTIO a menuconfig to ease disabling it all", there have not been posible to run a defconfig kernel build as a kvm guest with a virtio device.

[...]
[    4.216059] input: gpio-keys as /devices/platform/gpio-keys/input/input0
[    4.225680] rtc-pl031 9010000.pl031: setting system clock to 2018-01-15 15:53:03 UTC (1516031583)
[    4.230721] ALSA device list:
[    4.230867]   No soundcards found.
[    4.239775] uart-pl011 9000000.pl011: no DMA platform data
[    4.245088] VFS: Cannot open root device "vda" or unknown-block(0,0): error -6
[    4.245327] Please append a correct "root=" boot option; here are the available partitions:
[    4.245862] Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(0,0)
[    4.246306] CPU: 0 PID: 1 Comm: swapper/0 Not tainted 4.15.0-rc7-next-20180115-00001-g1facd923 #1
[    4.246596] Hardware name: linux,dummy-virt (DT)
[    4.246882] Call trace:
[    4.247104]  dump_backtrace+0x0/0x1b0
[    4.247286]  show_stack+0x24/0x30
[    4.247449]  dump_stack+0xb8/0xf0
[    4.247610]  panic+0x140/0x2b4
[    4.247768]  mount_block_root+0x194/0x284
[    4.247932]  mount_root+0x13c/0x170
[    4.248094]  prepare_namespace+0x140/0x188
[    4.248269]  kernel_init_freeable+0x25c/0x280
[    4.248451]  kernel_init+0x18/0x110
[    4.248616]  ret_from_fork+0x10/0x18
[    4.249165] Kernel Offset: disabled
[    4.249424] CPU features: 0x1802082
[    4.249601] Memory Limit: none
[    4.250075] ---[ end Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(0,0)

This adds VIRTIO back so we can easily run a defconfig kernel buld as
both a host and as a kvm guest.

Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
---
 arch/arm64/configs/defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 79d72ab..707d984 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -500,6 +500,7 @@ CONFIG_QCOM_HIDMA=y
 CONFIG_RCAR_DMAC=y
 CONFIG_VFIO=y
 CONFIG_VFIO_PCI=y
+CONFIG_VIRTIO_MENU=y
 CONFIG_VIRTIO_PCI=y
 CONFIG_VIRTIO_BALLOON=y
 CONFIG_VIRTIO_MMIO=y
-- 
2.7.4

