Message ID | 20210210190506.1923684-1-anders.roxell@linaro.org (mailing list archive) |
---|---|
State | Not Applicable |
Headers | show |
Series | arm64: defconfig: enable modern virtio pci device | expand |
On Wed, Feb 10, 2021 at 8:05 PM Anders Roxell <anders.roxell@linaro.org> wrote: > > Since patch ("virtio-pci: introduce modern device module") got added it > is not possible to boot a defconfig kernel in qemu with a virtio pci > device. Add CONFIG_VIRTIO_PCI_MODERN=y fragment makes the kernel able > to boot. > > Signed-off-by: Anders Roxell <anders.roxell@linaro.org> > --- > arch/arm/configs/multi_v7_defconfig | 1 + > arch/arm64/configs/defconfig | 1 + Acked-by: Arnd Bergmann <arnd@arndb.de> Michael, can you pick this up in the vhost tree that introduces the regression? Arnd
On 2021/2/11 下午7:52, Arnd Bergmann wrote: > On Wed, Feb 10, 2021 at 8:05 PM Anders Roxell <anders.roxell@linaro.org> wrote: >> Since patch ("virtio-pci: introduce modern device module") got added it >> is not possible to boot a defconfig kernel in qemu with a virtio pci >> device. Add CONFIG_VIRTIO_PCI_MODERN=y fragment makes the kernel able >> to boot. >> >> Signed-off-by: Anders Roxell <anders.roxell@linaro.org> >> --- >> arch/arm/configs/multi_v7_defconfig | 1 + >> arch/arm64/configs/defconfig | 1 + > Acked-by: Arnd Bergmann <arnd@arndb.de> > > Michael, can you pick this up in the vhost tree that introduces the regression? > > Arnd > Hi: Based on the discussion previously, the plan is to select VIRTIO_PCI_MODERN, and document the module that select it must depend on PCI. I will post a patch soon. Thanks
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 3823da605430..02297ed49b20 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -972,6 +972,7 @@ CONFIG_DW_DMAC=y CONFIG_RCAR_DMAC=y CONFIG_RENESAS_USB_DMAC=m CONFIG_VIRTIO_PCI=y +CONFIG_VIRTIO_PCI_MODERN=y CONFIG_VIRTIO_MMIO=y CONFIG_STAGING=y CONFIG_MFD_NVEC=y diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 83c28da85834..8334e9cb4608 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -910,6 +910,7 @@ CONFIG_TI_K3_UDMA_GLUE_LAYER=y CONFIG_VFIO=y CONFIG_VFIO_PCI=y CONFIG_VIRTIO_PCI=y +CONFIG_VIRTIO_PCI_MODERN=y CONFIG_VIRTIO_BALLOON=y CONFIG_VIRTIO_MMIO=y CONFIG_XEN_GNTDEV=y diff --git a/arch/mips/configs/loongson3_defconfig b/arch/mips/configs/loongson3_defconfig index 0e79f81217bc..ac5f2dcbffb1 100644 --- a/arch/mips/configs/loongson3_defconfig +++ b/arch/mips/configs/loongson3_defconfig @@ -324,6 +324,7 @@ CONFIG_RTC_DRV_CMOS=y CONFIG_RTC_DRV_GOLDFISH=y CONFIG_DMADEVICES=y CONFIG_VIRTIO_PCI=y +CONFIG_VIRTIO_PCI_MODERN=y CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_INPUT=y CONFIG_VIRTIO_MMIO=y diff --git a/arch/mips/configs/malta_kvm_guest_defconfig b/arch/mips/configs/malta_kvm_guest_defconfig index 9185e0a0aa45..043633cdb406 100644 --- a/arch/mips/configs/malta_kvm_guest_defconfig +++ b/arch/mips/configs/malta_kvm_guest_defconfig @@ -332,6 +332,7 @@ CONFIG_RTC_DRV_CMOS=y CONFIG_UIO=m CONFIG_UIO_CIF=m CONFIG_VIRTIO_PCI=y +CONFIG_VIRTIO_PCI_MODERN=y CONFIG_VIRTIO_BALLOON=y CONFIG_VIRTIO_MMIO=y CONFIG_EXT2_FS=y diff --git a/arch/powerpc/configs/guest.config b/arch/powerpc/configs/guest.config index 209f58515d88..fbff632c8633 100644 --- a/arch/powerpc/configs/guest.config +++ b/arch/powerpc/configs/guest.config @@ -5,6 +5,7 @@ CONFIG_NET_FAILOVER=y CONFIG_VIRTIO_CONSOLE=y CONFIG_VIRTIO=y CONFIG_VIRTIO_PCI=y +CONFIG_VIRTIO_PCI_MODERN=y CONFIG_KVM_GUEST=y CONFIG_EPAPR_PARAVIRT=y CONFIG_VIRTIO_BALLOON=y diff --git a/arch/riscv/configs/defconfig b/arch/riscv/configs/defconfig index 8c3d1e451703..b7fa7a1a0c6d 100644 --- a/arch/riscv/configs/defconfig +++ b/arch/riscv/configs/defconfig @@ -85,6 +85,7 @@ CONFIG_MMC=y CONFIG_MMC_SPI=y CONFIG_RTC_CLASS=y CONFIG_VIRTIO_PCI=y +CONFIG_VIRTIO_PCI_MODERN=y CONFIG_VIRTIO_BALLOON=y CONFIG_VIRTIO_INPUT=y CONFIG_VIRTIO_MMIO=y diff --git a/arch/riscv/configs/rv32_defconfig b/arch/riscv/configs/rv32_defconfig index 2c2cda6cc1c5..68296101fa06 100644 --- a/arch/riscv/configs/rv32_defconfig +++ b/arch/riscv/configs/rv32_defconfig @@ -84,6 +84,7 @@ CONFIG_MMC=y CONFIG_MMC_SPI=y CONFIG_RTC_CLASS=y CONFIG_VIRTIO_PCI=y +CONFIG_VIRTIO_PCI_MODERN=y CONFIG_VIRTIO_BALLOON=y CONFIG_VIRTIO_INPUT=y CONFIG_VIRTIO_MMIO=y diff --git a/arch/xtensa/configs/virt_defconfig b/arch/xtensa/configs/virt_defconfig index 6d1387dfa96f..7fad1c2454fd 100644 --- a/arch/xtensa/configs/virt_defconfig +++ b/arch/xtensa/configs/virt_defconfig @@ -74,6 +74,7 @@ CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_LOGO=y # CONFIG_USB_SUPPORT is not set CONFIG_VIRTIO_PCI=y +CONFIG_VIRTIO_PCI_MODERN=y CONFIG_VIRTIO_INPUT=y # CONFIG_IOMMU_SUPPORT is not set CONFIG_EXT3_FS=y diff --git a/kernel/configs/kvm_guest.config b/kernel/configs/kvm_guest.config index 208481d91090..8dea6df20006 100644 --- a/kernel/configs/kvm_guest.config +++ b/kernel/configs/kvm_guest.config @@ -22,6 +22,7 @@ CONFIG_S390_GUEST=y CONFIG_VIRTIO=y CONFIG_VIRTIO_MENU=y CONFIG_VIRTIO_PCI=y +CONFIG_VIRTIO_PCI_MODERN=y CONFIG_VIRTIO_BLK=y CONFIG_VIRTIO_CONSOLE=y CONFIG_VIRTIO_NET=y
Since patch ("virtio-pci: introduce modern device module") got added it is not possible to boot a defconfig kernel in qemu with a virtio pci device. Add CONFIG_VIRTIO_PCI_MODERN=y fragment makes the kernel able to boot. Signed-off-by: Anders Roxell <anders.roxell@linaro.org> --- arch/arm/configs/multi_v7_defconfig | 1 + arch/arm64/configs/defconfig | 1 + arch/mips/configs/loongson3_defconfig | 1 + arch/mips/configs/malta_kvm_guest_defconfig | 1 + arch/powerpc/configs/guest.config | 1 + arch/riscv/configs/defconfig | 1 + arch/riscv/configs/rv32_defconfig | 1 + arch/xtensa/configs/virt_defconfig | 1 + kernel/configs/kvm_guest.config | 1 + 9 files changed, 9 insertions(+)