From aa4efdd7ec87b69fa193f66c050b03c3617f5043 Mon Sep 17 00:00:00 2001 From: Sebastien Boeuf Date: Wed, 29 Jan 2020 18:31:02 +0100 Subject: [PATCH] ci: Update kernel related to virtio-iommu Because of the new set of patches related to virtio-iommu allowing only for the topology to be described through virtio configuration, this patch updates the kernel branch and the kernel configuration our CI relies on. Signed-off-by: Sebastien Boeuf --- resources/linux-virtio-fs-virtio-iommu-config | 4 +--- scripts/run_integration_tests.sh | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/resources/linux-virtio-fs-virtio-iommu-config b/resources/linux-virtio-fs-virtio-iommu-config index 89d902521..fa43bbb27 100644 --- a/resources/linux-virtio-fs-virtio-iommu-config +++ b/resources/linux-virtio-fs-virtio-iommu-config @@ -496,8 +496,6 @@ CONFIG_HAVE_ACPI_APEI_NMI=y # CONFIG_DPTF_POWER is not set # CONFIG_PMIC_OPREGION is not set # CONFIG_ACPI_CONFIGFS is not set -CONFIG_ACPI_IORT=y -CONFIG_ACPI_VIOT=y CONFIG_X86_PM_TIMER=y # CONFIG_SFI is not set @@ -1828,7 +1826,7 @@ CONFIG_IOMMU_DMA=y # CONFIG_INTEL_IOMMU is not set # CONFIG_IRQ_REMAP is not set CONFIG_VIRTIO_IOMMU=y -# CONFIG_VIRTIO_IOMMU_TOPOLOGY is not set +CONFIG_VIRTIO_IOMMU_TOPOLOGY=y # # Remoteproc drivers diff --git a/scripts/run_integration_tests.sh b/scripts/run_integration_tests.sh index 5600a0c01..f89178905 100755 --- a/scripts/run_integration_tests.sh +++ b/scripts/run_integration_tests.sh @@ -83,7 +83,7 @@ LINUX_CUSTOM_DIR="linux-custom" if [ ! -f "$VMLINUX_IMAGE" ]; then SRCDIR=$PWD pushd $WORKLOADS_DIR - time git clone --depth 1 "https://github.com/cloud-hypervisor/linux.git" -b "virtio-fs-virtio-iommu-5.5-rc1" $LINUX_CUSTOM_DIR + time git clone --depth 1 "https://github.com/cloud-hypervisor/linux.git" -b "virtio-fs-virtio-iommu-topo-5.5-rc1" $LINUX_CUSTOM_DIR pushd $LINUX_CUSTOM_DIR cp $SRCDIR/resources/linux-virtio-fs-virtio-iommu-config .config time make bzImage -j `nproc`