From 316509566966e4c9b3fd9ba3521554b384fdbf88 Mon Sep 17 00:00:00 2001 From: David Gibson Date: Wed, 28 Jul 2021 13:44:02 +1000 Subject: [PATCH] runtime/qemu: Use explicit "on" for kernel_irqchip parameter Kata uses the 'kernel_irqchip' machine option to qemu. By default it uses it in what qemu calls the "short-form boolean" with no parameter. That style was deprecated by qemu between 5.2 and 6.0 (commit ccd3b3b8112b) and effectively removed entirely between 6.0 and 6.1 (commit d8fb7d0969d5). Update ourselves for newer qemus by using an explicit "kernel_irqchip=on". Signed-off-by: David Gibson --- src/runtime/virtcontainers/qemu_amd64.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/runtime/virtcontainers/qemu_amd64.go b/src/runtime/virtcontainers/qemu_amd64.go index d19bab5c5f..1129d4d340 100644 --- a/src/runtime/virtcontainers/qemu_amd64.go +++ b/src/runtime/virtcontainers/qemu_amd64.go @@ -31,7 +31,7 @@ const ( defaultQemuMachineType = QemuQ35 - defaultQemuMachineOptions = "accel=kvm,kernel_irqchip" + defaultQemuMachineOptions = "accel=kvm,kernel_irqchip=on" qmpMigrationWaitTimeout = 5 * time.Second