qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 4ae4bf: e1000: Convert v3 fields to subsectio


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 4ae4bf: e1000: Convert v3 fields to subsection
Date: Tue, 10 Apr 2018 06:04:04 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 4ae4bf5bb16bd8e5b94433db9fe8265d30c53ba3
      
https://github.com/qemu/qemu/commit/4ae4bf5bb16bd8e5b94433db9fe8265d30c53ba3
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M hw/net/e1000.c

  Log Message:
  -----------
  e1000: Convert v3 fields to subsection

A bunch of new TSO fields were introduced by d62644b4 and this bumped
the VMState version; however it's easier for those trying to keep
backwards migration compatibility if these fields are added in a
subsection instead.

Move the new fields to a subsection.

Since this was added after 2.11, this change will only affect
compatbility with 2.12-rc0.

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 3c4053c52cf6294848d8219a14b491784c8bebc8
      
https://github.com/qemu/qemu/commit/3c4053c52cf6294848d8219a14b491784c8bebc8
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M hw/net/e1000.c

  Log Message:
  -----------
  e1000: Dupe offload data on reading old stream

Old QEMUs only had one set of offload data;  when we only receive
one lot, dupe the received data - that should give us about the
same bug level as the old version.

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 46f2a9ec5470094dbc25a6c5263cc21751705ce3
      
https://github.com/qemu/qemu/commit/46f2a9ec5470094dbc25a6c5263cc21751705ce3
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M hw/net/e1000.c

  Log Message:
  -----------
  e1000: wire new subsection to property

Wire the new subsection from the previous commit to a property
so we can turn it off easily.

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 59354484787f8463406704a948809e0f478501d5
      
https://github.com/qemu/qemu/commit/59354484787f8463406704a948809e0f478501d5
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M hw/net/e1000.c

  Log Message:
  -----------
  e1000: Migrate props via a temporary structure

Swing the tx.props out via a temporary structure, so in future patches
we can select what we're going to send.

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: ff214d427ec64d22b3d40b802efb96955c4b6b89
      
https://github.com/qemu/qemu/commit/ff214d427ec64d22b3d40b802efb96955c4b6b89
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M hw/net/e1000.c

  Log Message:
  -----------
  e1000: Choose which set of props to migrate

When we're using the subsection we migrate both
the 'props' and 'tso_props' data; when we're not using
the subsection (to migrate to 2.11 or old machine types) we've
got to choose what to migrate in the main structure.

If we're using the subsection migrate 'props' in the main structure.
If we're not using the subsection then migrate the last one
that changed, which gives behaviour similar to the old behaviour.

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 5f523530915e57a14ffb8c00e22252bfa557441c
      
https://github.com/qemu/qemu/commit/5f523530915e57a14ffb8c00e22252bfa557441c
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M include/hw/compat.h

  Log Message:
  -----------
  e1000: Old machine types, turn new subsection off

Turn the newly added subsection off for old machine types

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: daf6b59be8c703264765a533bc63421caef95225
      
https://github.com/qemu/qemu/commit/daf6b59be8c703264765a533bc63421caef95225
  Author: Peter Maydell <address@hidden>
  Date:   2018-04-10 (Tue, 10 Apr 2018)

  Changed paths:
    M hw/net/e1000.c
    M include/hw/compat.h

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into 
staging

# gpg: Signature made Tue 10 Apr 2018 04:36:01 BST
# gpg:                using RSA key EF04965B398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <address@hidden>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 215D 46F4 8246 689E C77F  3562 EF04 965B 398D 6211

* remotes/jasowang/tags/net-pull-request:
  e1000: Old machine types, turn new subsection off
  e1000: Choose which set of props to migrate
  e1000: Migrate props via a temporary structure
  e1000: wire new subsection to property
  e1000: Dupe offload data on reading old stream
  e1000: Convert v3 fields to subsection

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/fb4fe32d5b62...daf6b59be8c7

reply via email to

[Prev in Thread] Current Thread [Next in Thread]