From 12c8e41c756139f044df5439a1f8c6c5b525bc42 Mon Sep 17 00:00:00 2001 From: Greg Kurz Date: Thu, 16 Dec 2021 11:09:27 +0100 Subject: [PATCH] qemu: Disable libudev for QEMU 5.2 and newer Commit 112ea25859d6 disabled libudev for static builds because it was breaking snap. It turns out that the only users of libudev in QEMU are qemu-pr-helper and USB. Kata already disables USB and doesn't use qemu-pr-helper. Disable libudev for all builds if QEMU supports it, i.e. version 5.2 or newer. Fixes #3078 Signed-off-by: Greg Kurz --- tools/packaging/scripts/configure-hypervisor.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/packaging/scripts/configure-hypervisor.sh b/tools/packaging/scripts/configure-hypervisor.sh index b038c0a5d8..27d22c53fc 100755 --- a/tools/packaging/scripts/configure-hypervisor.sh +++ b/tools/packaging/scripts/configure-hypervisor.sh @@ -310,9 +310,10 @@ generate_qemu_options() { qemu_options+=(size:--disable-qom-cast-debug) qemu_options+=(size:--disable-tcmalloc) - # Disable libudev for static build + # Disable libudev since it is only needed for qemu-pr-helper and USB, + # none of which are used with Kata if gt_eq "${qemu_version}" "5.2.0" ; then - [ "${static}" == "true" ] && qemu_options+=(size:--disable-libudev) + qemu_options+=(size:--disable-libudev) fi # Disallow network downloads