Re: [Qemu-devel] [PATCHv1] rtl8139: save/load RxMulOk counter (again)

[Stefan Hajnoczi]

On Fri, Jun 17, 2016 at 05:31:30PM +0100, David Vrabel wrote:
> 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 <address@hidden>
> ---
>  hw/net/rtl8139.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

CCed Jason Wang, net maintainer.

David: Please CC maintainers so that your patch gets attention.  You can
use scripts/get_maintainer.pl -f hw/net/rtl8139.c to list maintainers.

> 
> 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
> 
>

signature.asc
Description: PGP signature