From 7979ab26f6cd6ad7762f42c2cbf703d5550a76b3 Mon Sep 17 00:00:00 2001 From: Jiandi An Date: Thu, 30 Jul 2026 00:33:44 -0500 Subject: [PATCH] NVIDIA: [Packaging] Update microvm-devices.mak for QEMU 11.0 compatibility Remove CONFIG options that are incompatible with QEMU 11.0's Kconfig: - CONFIG_Q35=y: conflicts with CONFIG_PCI_DEVICES=n - CONFIG_VIRTIO_MEM=y: requires VIRTIO_MD_SUPPORTED (not available for microvm) - CONFIG_VIRTIO_PMEM=y: requires VIRTIO_MD_SUPPORTED (not available for microvm) This brings the configuration in line with Ubuntu's QEMU 11.0 packaging and fixes the amd64 PPA build failure where minikconf.py was failing with 'contradiction between clauses' errors. Signed-off-by: Matthew R. Ochs (cherry-picked from commit 7d1f6d123462 https://github.com/NVIDIA/QEMU nvidia_stable-10.1) [jan: Changed the commit message reference of QEMU 10.1 to QEMU 11.0] Signed-off-by: Jiandi An --- debian/microvm-devices.mak | 7 ------- 1 file changed, 7 deletions(-) diff --git a/debian/microvm-devices.mak b/debian/microvm-devices.mak index 1512d34af08..0e115f4dc1d 100644 --- a/debian/microvm-devices.mak +++ b/debian/microvm-devices.mak @@ -3,11 +3,6 @@ # CONFIG_PCI_DEVICES=n -# we can't disable all machine types (boards) as of 6.1 -# since the resulting binary fails to link -#CONFIG_ISAPC=y -#CONFIG_I440FX=y -CONFIG_Q35=y CONFIG_MICROVM=y CONFIG_VIRTIO_BLK=y @@ -20,7 +15,5 @@ CONFIG_VIRTIO_SCSI=y CONFIG_VIRTIO_RNG=y CONFIG_VIRTIO_CRYPTO=y CONFIG_VIRTIO_BALLOON=y -CONFIG_VIRTIO_MEM=y -CONFIG_VIRTIO_PMEM=y CONFIG_VIRTIO_GPU=y CONFIG_VHOST_USER_GPU=y