x86/64: add cdrom and iso9660 drivers

The iso image need cdrom and iso9660 drivers to boot, otherwise it will
hang when mounting the root file system

Signed-off-by: 李国 <uxgood.org@gmail.com>

diff --git a/target/linux/x86/64/config-4.19 b/target/linux/x86/64/config-4.19
index f5c82dcb91c2e4e59de0ab67b8f8088b6db60d26..00ed09a4a62f2974f963733678eaf970e87f5d4f 100644 (file)
--- a/target/linux/x86/64/config-4.19
+++ b/target/linux/x86/64/config-4.19
@@ -69,12 +69,15 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_GENERIC=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_BALLOON_COMPACTION=y
+CONFIG_BLK_DEV_SR=y
+# CONFIG_BLK_DEV_SR_VENDOR is not set
 CONFIG_BLK_DEV_INTEGRITY=y
 CONFIG_BLK_DEV_NVME=y
 CONFIG_NVME_MULTIPATH=y
 CONFIG_BLK_MQ_VIRTIO=y
 # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
 CONFIG_BTT=y
+CONFIG_CDROM=y
 # CONFIG_CALGARY_IOMMU is not set
 # CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT is not set
 CONFIG_CONNECTOR=y
@@ -294,6 +297,7 @@ CONFIG_IOSF_MBI=y
 # CONFIG_IOSF_MBI_DEBUG is not set
 # CONFIG_ISCSI_IBFT is not set
 # CONFIG_ISCSI_IBFT_FIND is not set
+CONFIG_ISO9660_FS=y
 CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y
 # CONFIG_KVM_DEBUG_FS is not set
 CONFIG_KVM_GUEST=y

diff --git a/target/linux/x86/64/config-5.4 b/target/linux/x86/64/config-5.4
index ceee923b0f50473252d5072fa73fefd69f40bb5f..899668f77ee07a9a452e10ffa5ccf8da510d60dc 100644 (file)
--- a/target/linux/x86/64/config-5.4
+++ b/target/linux/x86/64/config-5.4
@@ -64,12 +64,15 @@ CONFIG_AUDIT_ARCH=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_GENERIC=y
 CONFIG_BALLOON_COMPACTION=y
+CONFIG_BLK_DEV_SR=y
+# CONFIG_BLK_DEV_SR_VENDOR is not set
 CONFIG_BLK_DEV_INTEGRITY=y
 CONFIG_BLK_DEV_NVME=y
 CONFIG_BLK_MQ_VIRTIO=y
 CONFIG_BLK_PM=y
 # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
 CONFIG_BTT=y
+CONFIG_CDROM=y
 # CONFIG_CALGARY_IOMMU is not set
 # CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT is not set
 CONFIG_CONNECTOR=y
@@ -280,6 +283,7 @@ CONFIG_IOMMU_HELPER=y
 CONFIG_IOSF_MBI=y
 # CONFIG_IOSF_MBI_DEBUG is not set
 # CONFIG_ISCSI_IBFT is not set
+CONFIG_ISO9660_FS=y
 CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y
 # CONFIG_KVM_DEBUG_FS is not set
 CONFIG_KVM_GUEST=y