|
 |
495e37 |
From ef5afcc86dc44d1c9d3030a8ceca2018df86c6ec Mon Sep 17 00:00:00 2001
|
|
|
495e37 |
From: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
495e37 |
Date: Tue, 19 Oct 2021 13:17:06 -0400
|
|
|
495e37 |
Subject: Fix virtio-net-pci* "vectors" compat
|
|
|
495e37 |
|
|
|
495e37 |
RH-Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
495e37 |
RH-MergeRequest: 76: 9.0/6.2.0-rc1 x86 machine type fixes
|
|
|
495e37 |
RH-Commit: [20/22] ebb570f053f96d3558bac49962dc7dc88296c207
|
|
|
495e37 |
RH-Bugzilla: 2025468
|
|
|
495e37 |
RH-Acked-by: quintela1 <quintela@redhat.com>
|
|
|
495e37 |
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
|
|
495e37 |
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
495e37 |
|
|
|
495e37 |
hw_compat_rhel_8_4 has an issue: it affects only "virtio-net-pci"
|
|
|
495e37 |
but not "virtio-net-pci-transitional" and
|
|
|
495e37 |
"virtio-net-pci-non-transitional". The solution is to use the
|
|
|
495e37 |
"virtio-net-pci-base" type in compat_props.
|
|
|
495e37 |
|
|
|
495e37 |
An equivalent fix will be submitted for hw_compat_5_2 upstream.
|
|
|
495e37 |
|
|
|
495e37 |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
495e37 |
(cherry picked from commit d45823ab0d0138b2fbaf2ed1e1896d2052f3ccb3)
|
|
|
495e37 |
---
|
|
|
495e37 |
hw/core/machine.c | 6 +++++-
|
|
|
495e37 |
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
495e37 |
|
|
|
495e37 |
diff --git a/hw/core/machine.c b/hw/core/machine.c
|
|
|
495e37 |
index 53a3caf4fb..448a8dd127 100644
|
|
|
495e37 |
--- a/hw/core/machine.c
|
|
|
495e37 |
+++ b/hw/core/machine.c
|
|
|
495e37 |
@@ -69,7 +69,11 @@ GlobalProperty hw_compat_rhel_8_4[] = {
|
|
|
495e37 |
/* hw_compat_rhel_8_4 from hw_compat_5_2 */
|
|
|
495e37 |
{ "virtio-blk-device", "report-discard-granularity", "off" },
|
|
|
495e37 |
/* hw_compat_rhel_8_4 from hw_compat_5_2 */
|
|
|
495e37 |
- { "virtio-net-pci", "vectors", "3"},
|
|
|
495e37 |
+ /*
|
|
|
495e37 |
+ * Upstream incorrectly had "virtio-net-pci" instead of "virtio-net-pci-base",
|
|
|
495e37 |
+ * (https://bugzilla.redhat.com/show_bug.cgi?id=1999141)
|
|
|
495e37 |
+ */
|
|
|
495e37 |
+ { "virtio-net-pci-base", "vectors", "3"},
|
|
|
495e37 |
};
|
|
|
495e37 |
const size_t hw_compat_rhel_8_4_len = G_N_ELEMENTS(hw_compat_rhel_8_4);
|
|
|
495e37 |
|
|
|
495e37 |
--
|
|
|
495e37 |
2.27.0
|
|
|
495e37 |
|