From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35762) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDwgM-0003Wx-WD for qemu-devel@nongnu.org; Fri, 17 Jun 2016 12:31:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bDwgJ-0002Q7-MB for qemu-devel@nongnu.org; Fri, 17 Jun 2016 12:31:46 -0400 Received: from smtp.citrix.com ([66.165.176.89]:26370) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDwgJ-0002PQ-Ew for qemu-devel@nongnu.org; Fri, 17 Jun 2016 12:31:43 -0400 From: David Vrabel Date: Fri, 17 Jun 2016 17:31:30 +0100 Message-ID: <1466181090-30169-1-git-send-email-david.vrabel@citrix.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCHv1] rtl8139: save/load RxMulOk counter (again) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: David Vrabel Commit 9d29cdeaaca3a0383af764000b71492c4fc67c6e (rtl8139: port TallyCounters to vmstate) introduced in incompatibility in the v4 format as it omitted the RxOkMul counter. There are presumably no users that were impacted by the v4 to v4' breakage, so increase the save version to 5 and re-add the field, keeping backward compatibility with v4'. Signed-off-by: David Vrabel --- hw/net/rtl8139.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c index 562c1fd..243dcd4 100644 --- a/hw/net/rtl8139.c +++ b/hw/net/rtl8139.c @@ -1369,6 +1369,7 @@ static const VMStateDescription vmstate_tally_counters = { VMSTATE_UINT32(TxMCol, RTL8139TallyCounters), VMSTATE_UINT64(RxOkPhy, RTL8139TallyCounters), VMSTATE_UINT64(RxOkBrd, RTL8139TallyCounters), + VMSTATE_UINT32_V(RxOkMul, RTL8139TallyCounters, 5), VMSTATE_UINT16(TxAbt, RTL8139TallyCounters), VMSTATE_UINT16(TxUndrn, RTL8139TallyCounters), VMSTATE_END_OF_LIST() @@ -3222,7 +3223,7 @@ static void rtl8139_pre_save(void *opaque) static const VMStateDescription vmstate_rtl8139 = { .name = "rtl8139", - .version_id = 4, + .version_id = 5, .minimum_version_id = 3, .post_load = rtl8139_post_load, .pre_save = rtl8139_pre_save, -- 2.1.4