3c4f941ac7
The patches were selected from the recent "Patch Round-up for stable 7.2.1" [0]. Those that should be relevant for our supported use-cases (and the upcoming nvme use-case) were picked. Most of the patches added now have not been submitted to qemu-stable before. The follow-up for the virtio-rng-pci migration fix will break migration between versions with the fix and without the fix when a virtio-pci-rng(-non)-transitional device is used. Luckily Proxmox VE only uses the virtio-pci-rng device, and this was fixed by 0006-virtio-rng-pci-fix-migration-compat-for-vectors.patch which was applied before any public version of Proxmox VE's QEMU 7.2 package was released. [0]: https://lists.nongnu.org/archive/html/qemu-stable/2023-03/msg00010.html [1]: https://bugzilla.redhat.com/show_bug.cgi?id=2162569 Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
36 lines
1.4 KiB
Diff
36 lines
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
|
Date: Tue, 7 Feb 2023 17:49:44 +0000
|
|
Subject: [PATCH] virtio-rng-pci: fix transitional migration compat for vectors
|
|
|
|
In bad9c5a516 ("virtio-rng-pci: fix migration compat for vectors") I
|
|
fixed the virtio-rng-pci migration compatibility, but it was discovered
|
|
that we also need to fix the other aliases of the device for the
|
|
transitional cases.
|
|
|
|
Fixes: 9ea02e8f1 ('virtio-rng-pci: Allow setting nvectors, so we can use MSI-X')
|
|
bz: https://bugzilla.redhat.com/show_bug.cgi?id=2162569
|
|
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
Message-Id: <20230207174944.138255-1-dgilbert@redhat.com>
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
(cherry-picked from commit 62bdb8871512076841f4464f7e26efdc7783f78d)
|
|
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
|
---
|
|
hw/core/machine.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/hw/core/machine.c b/hw/core/machine.c
|
|
index cd84579591..4297315984 100644
|
|
--- a/hw/core/machine.c
|
|
+++ b/hw/core/machine.c
|
|
@@ -43,6 +43,8 @@
|
|
GlobalProperty hw_compat_7_1[] = {
|
|
{ "virtio-device", "queue_reset", "false" },
|
|
{ "virtio-rng-pci", "vectors", "0" },
|
|
+ { "virtio-rng-pci-transitional", "vectors", "0" },
|
|
+ { "virtio-rng-pci-non-transitional", "vectors", "0" },
|
|
};
|
|
const size_t hw_compat_7_1_len = G_N_ELEMENTS(hw_compat_7_1);
|
|
|