|
 |
4a2fec |
From c4753f76a30a3e96c573d8e863587ba3e686348e Mon Sep 17 00:00:00 2001
|
|
|
4a2fec |
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
|
|
4a2fec |
Date: Wed, 29 Mar 2017 10:57:23 +0200
|
|
|
4a2fec |
Subject: migcompat/rtl8139: Work around version bump
|
|
|
4a2fec |
|
|
|
4a2fec |
RH-Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
4a2fec |
Message-id: <20170329105723.7789-2-dgilbert@redhat.com>
|
|
|
4a2fec |
Patchwork-id: 74581
|
|
|
4a2fec |
O-Subject: [RHEL-7.4 qemu-kvm-rhev PATCH v2 1/1] migcompat/rtl8139: Work around version bump
|
|
|
4a2fec |
Bugzilla: 1420195
|
|
|
4a2fec |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: Juan Quintela <quintela@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
4a2fec |
|
|
|
4a2fec |
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
|
|
4a2fec |
|
|
|
4a2fec |
commit 46fe8bef in 2.7 bumped the version number of the rtl8139
|
|
|
4a2fec |
vmstate, and added back a field that had been lost ~7 years ago
|
|
|
4a2fec |
by 9d29cde in v0.11.
|
|
|
4a2fec |
|
|
|
4a2fec |
To keep backwards compatibility we can't bump the version, so push
|
|
|
4a2fec |
the version number back down and remove the field that was added.
|
|
|
4a2fec |
The field doesn't seem to be that significant, especially since we've
|
|
|
4a2fec |
survived for 7 years with out it.
|
|
|
4a2fec |
|
|
|
4a2fec |
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
4a2fec |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
4a2fec |
|
|
|
4a2fec |
Rebase notes (2.9.0):
|
|
|
4a2fec |
- Patch rewritten
|
|
|
4a2fec |
|
|
|
4a2fec |
(cherry picked from commit 45ca263288bcbc98f36fae68c55e1a1b55e09221)
|
|
|
4a2fec |
---
|
|
|
4a2fec |
hw/net/rtl8139.c | 4 +++-
|
|
|
4a2fec |
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
4a2fec |
|
|
|
4a2fec |
diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c
|
|
|
4a2fec |
index 450658c..80c62dc 100644
|
|
|
4a2fec |
--- a/hw/net/rtl8139.c
|
|
|
4a2fec |
+++ b/hw/net/rtl8139.c
|
|
|
4a2fec |
@@ -3206,7 +3206,7 @@ static void rtl8139_pre_save(void *opaque)
|
|
|
4a2fec |
|
|
|
4a2fec |
static const VMStateDescription vmstate_rtl8139 = {
|
|
|
4a2fec |
.name = "rtl8139",
|
|
|
4a2fec |
- .version_id = 5,
|
|
|
4a2fec |
+ .version_id = 4,
|
|
|
4a2fec |
.minimum_version_id = 3,
|
|
|
4a2fec |
.post_load = rtl8139_post_load,
|
|
|
4a2fec |
.pre_save = rtl8139_pre_save,
|
|
|
4a2fec |
@@ -3287,7 +3287,9 @@ static const VMStateDescription vmstate_rtl8139 = {
|
|
|
4a2fec |
VMSTATE_UINT32(tally_counters.TxMCol, RTL8139State),
|
|
|
4a2fec |
VMSTATE_UINT64(tally_counters.RxOkPhy, RTL8139State),
|
|
|
4a2fec |
VMSTATE_UINT64(tally_counters.RxOkBrd, RTL8139State),
|
|
|
4a2fec |
+#if 0 /* Disabled for Red Hat Enterprise Linux bz 1420195 */
|
|
|
4a2fec |
VMSTATE_UINT32_V(tally_counters.RxOkMul, RTL8139State, 5),
|
|
|
4a2fec |
+#endif
|
|
|
4a2fec |
VMSTATE_UINT16(tally_counters.TxAbt, RTL8139State),
|
|
|
4a2fec |
VMSTATE_UINT16(tally_counters.TxUndrn, RTL8139State),
|
|
|
4a2fec |
|
|
|
4a2fec |
--
|
|
|
4a2fec |
1.8.3.1
|
|
|
4a2fec |
|