Bug#1105969: unblock: qemu/1:10.0.0+ds-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: qemu@packages.debian.org, pkg-qemu-devel@lists.alioth.debian.org
Control: affects -1 + src:qemu
Please unblock package qemu
[ Reason ]
There's a one-liner fix in qemu for #1104889 which comes from
upstream and makes, e.g., incus to work again. There's no other
changes in this qemu release.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
unblock qemu/1:10.0.0+ds-2
diff -Nru qemu-10.0.0+ds/debian/changelog qemu-10.0.0+ds/debian/changelog
--- qemu-10.0.0+ds/debian/changelog 2025-04-24 10:22:04.000000000 +0300
+++ qemu-10.0.0+ds/debian/changelog 2025-05-12 21:01:08.000000000 +0300
@@ -1,3 +1,10 @@
+qemu (1:10.0.0+ds-2) unstable; urgency=medium
+
+ * pick hw-nvme-fix-nvme-hotplugging.patch from qemu mailinglist
+ Closes: #1104889
+
+ -- Michael Tokarev <mjt@tls.msk.ru> Mon, 12 May 2025 21:01:08 +0300
+
qemu (1:10.0.0+ds-1) unstable; urgency=medium
* new upstream release (final)
diff -Nru qemu-10.0.0+ds/debian/patches/hw-nvme-fix-nvme-hotplugging.patch qemu-10.0.0+ds/debian/patches/hw-nvme-fix-nvme-hotplugging.patch
--- qemu-10.0.0+ds/debian/patches/hw-nvme-fix-nvme-hotplugging.patch 1970-01-01 03:00:00.000000000 +0300
+++ qemu-10.0.0+ds/debian/patches/hw-nvme-fix-nvme-hotplugging.patch 2025-05-12 21:01:08.000000000 +0300
@@ -0,0 +1,38 @@
+From: Klaus Jensen <k.jensen@samsung.com>
+Date: Wed, 7 May 2025 09:30:55 +0200
+Subject: hw/nvme: fix nvme hotplugging
+Bug-Debian: https://bugs.debian.org/1104889
+Bug: https://gitlab.com/qemu-project/qemu/-/issues/2950
+Forwarded: yes, https://lore.kernel.org/qemu-devel/20250507-fix-non-hotpluggable-subsys-v1-1-667f224ebc0f@samsung.com/
+
+Commit cd59f50ab017 caused a regression on nvme hotplugging for devices
+with an implicit nvm subsystem.
+
+The nvme-subsys device was incorrectly left with being marked as
+non-hotpluggable. Fix this.
+
+Cc: qemu-stable@nongnu.org
+Reported-by: Stéphane Graber <stgraber@stgraber.org>
+Tested-by: Stéphane Graber <stgraber@stgraber.org>
+Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2950
+Fixes: cd59f50ab017 ("hw/nvme: always initialize a subsystem")
+Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
+---
+ hw/nvme/subsys.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/hw/nvme/subsys.c b/hw/nvme/subsys.c
+index b617ac3892..64138cbd6d 100644
+--- a/hw/nvme/subsys.c
++++ b/hw/nvme/subsys.c
+@@ -226,7 +226,6 @@ static void nvme_subsys_class_init(ObjectClass *oc, void *data)
+
+ dc->realize = nvme_subsys_realize;
+ dc->desc = "Virtual NVMe subsystem";
+- dc->hotpluggable = false;
+
+ device_class_set_props(dc, nvme_subsystem_props);
+ }
+--
+2.39.5
+
diff -Nru qemu-10.0.0+ds/debian/patches/series qemu-10.0.0+ds/debian/patches/series
--- qemu-10.0.0+ds/debian/patches/series 2025-04-18 14:33:36.000000000 +0300
+++ qemu-10.0.0+ds/debian/patches/series 2025-05-12 21:01:08.000000000 +0300
@@ -16,3 +16,4 @@
qemu-img-options.patch
disable-pycotap.patch
hw-display-qxl-render.c-fix-qxl_unpack_chunks-chunk-.patch
+hw-nvme-fix-nvme-hotplugging.patch
Reply to: