incus: 6.5.0 -> 6.6.0 (#346210)

This commit is contained in:
Adam C. Stephens 2024-10-04 10:48:50 -04:00 committed by GitHub
commit 059b6fb1ca
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 42 deletions

View File

@ -1,33 +0,0 @@
From 58eeb4eeee8a9e7f9fa9c62443d00f0ec6797078 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@stgraber.org>
Date: Fri, 6 Sep 2024 17:10:01 -0400
Subject: [PATCH] incusd/instance/qemu: Force threads I/O mode for
unsafe/writeback
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The default "native" aioMode requires direct I/O which is incompatible
with unsafe/writeback.
Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
---
internal/server/instance/drivers/driver_qemu.go | 2 ++
1 file changed, 2 insertions(+)
diff --git a/internal/server/instance/drivers/driver_qemu.go b/internal/server/instance/drivers/driver_qemu.go
index 9609b73c1b..a5a4944d40 100644
--- a/internal/server/instance/drivers/driver_qemu.go
+++ b/internal/server/instance/drivers/driver_qemu.go
@@ -4088,9 +4088,11 @@ func (d *qemu) addDriveConfig(qemuDev map[string]string, bootIndexes map[string]
noFlushCache := false // Don't ignore any flush requests for the device.
if cacheMode == "unsafe" {
+ aioMode = "threads"
directCache = false
noFlushCache = true
} else if cacheMode == "writeback" {
+ aioMode = "threads"
directCache = false
}

View File

@ -1,11 +1,6 @@
import ./generic.nix {
hash = "sha256-FdoJI0SUH8KS3Epyw/HejgyhISWGLePsIjYUS2YTBvc=";
version = "6.5.0";
vendorHash = "sha256-8e2X7HIy1IEx6p41SHJyq5dNUJ3rRC2maXC4uNaSlnk=";
patches = [
# qemu 9.1 compat, remove in 6.6
./572afb06f66f83ca95efa1b9386fceeaa1c9e11b.patch
./58eeb4eeee8a9e7f9fa9c62443d00f0ec6797078.patch
./0c37b7e3ec65b4d0e166e2127d9f1835320165b8.patch
];
hash = "sha256-hjBJGtIBYwgPpnWb1337RP1jU9rQNLQ3yp1AnwBH13o=";
version = "6.6.0";
vendorHash = "sha256-Cpbgn2WHMVKtPrAzuNnXkS1rYvzLwde6oTcKTKW3XHs=";
patches = [ ];
}