cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
26ba25
From 8198c8d2a4f05691c2fd41ddf0b66392e6a28d65 Mon Sep 17 00:00:00 2001
26ba25
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
26ba25
Date: Thu, 26 Jul 2018 16:40:11 +0200
26ba25
Subject: [PATCH 265/268] e1000: Fix tso_props compat for 82540em
26ba25
26ba25
RH-Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
26ba25
Message-id: <20180726164011.21660-2-dgilbert@redhat.com>
26ba25
Patchwork-id: 81522
26ba25
O-Subject: [RHEL-7.6 qemu-kvm-rhev PATCH v2 1/1] e1000: Fix tso_props compat for 82540em
26ba25
Bugzilla: 1608778
26ba25
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
26ba25
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
26ba25
RH-Acked-by: Juan Quintela <quintela@redhat.com>
26ba25
RH-Acked-by: Xiao Wang <jasowang@redhat.com>
26ba25
26ba25
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
26ba25
26ba25
In RHEL when you ask for an e1000-82540em that's the device you get,
26ba25
however in upstream it's aliased to an e1000.
26ba25
Because of the difference, we need to change the compat entry
26ba25
for migrate_tso_props to the base type that changes e1000 as well.
26ba25
26ba25
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
26ba25
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
26ba25
---
26ba25
 include/hw/compat.h | 5 +++--
26ba25
 1 file changed, 3 insertions(+), 2 deletions(-)
26ba25
26ba25
diff --git a/include/hw/compat.h b/include/hw/compat.h
26ba25
index f4cc6e0..c343e8f 100644
26ba25
--- a/include/hw/compat.h
26ba25
+++ b/include/hw/compat.h
26ba25
@@ -460,8 +460,9 @@
26ba25
         .driver   = "vhost-user-blk-pci",\
26ba25
         .property = "vectors",\
26ba25
         .value    = "2",\
26ba25
-    },{ /* HW_COMPAT_RHEL7_5 from HW_COMPAT_2_11 */ \
26ba25
-        .driver   = "e1000",\
26ba25
+    },{ /* HW_COMPAT_RHEL7_5 from HW_COMPAT_2_11 but \
26ba25
+           bz 1608778 modified for our naming */ \
26ba25
+        .driver   = "e1000-82540em",\
26ba25
         .property = "migrate_tso_props",\
26ba25
         .value    = "off",\
26ba25
     },{ /* HW_COMPAT_RHEL7_5 from HW_COMPAT_2_10 */ \
26ba25
-- 
26ba25
1.8.3.1
26ba25