From 831c2feead24b439063f2832bfa63529a3c81c59 Mon Sep 17 00:00:00 2001 From: David Gibson Date: Tue, 3 Aug 2021 17:32:56 +1000 Subject: [PATCH] packaging: Remove reference to sheepdog driver The QEMU sheepdog driver was deprecated in 5.2.0 and removed entirely in 6.1. Explicitly disabling, therefore is unnecessary from 5.2.0 and will give an error from 6.1. fixes #2337 Signed-off-by: David Gibson --- tools/packaging/scripts/configure-hypervisor.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/packaging/scripts/configure-hypervisor.sh b/tools/packaging/scripts/configure-hypervisor.sh index d2467c3f4..486b53d8d 100755 --- a/tools/packaging/scripts/configure-hypervisor.sh +++ b/tools/packaging/scripts/configure-hypervisor.sh @@ -222,8 +222,10 @@ generate_qemu_options() { # Disabled options - # Disable sheepdog block driver support - qemu_options+=(size:--disable-sheepdog) + # Disable sheepdog block driver support (deprecated in 5.2.0) + if ! gt_eq ${qemu_version} 5.2.0 ; then + qemu_options+=(size:--disable-sheepdog) + fi # Disable block migration in the main migration stream qemu_options+=(size:--disable-live-block-migration)