[Qemu-commits] [qemu/qemu] 7ec7ae: e1000e: correctly tear down MSI-X memory regions

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 7ec7ae4b973d1471f6f39fc2b6481f69c2b39593
      
https://github.com/qemu/qemu/commit/7ec7ae4b973d1471f6f39fc2b6481f69c2b39593
  Author: Paolo Bonzini <address@hidden>
  Date:   2017-03-14 (Tue, 14 Mar 2017)

  Changed paths:
    M hw/net/e1000e.c

  Log Message:
  -----------
  e1000e: correctly tear down MSI-X memory regions

MSI-X has been disabled by the time the e1000e device is unrealized, hence
msix_uninit is never called.  This causes the object to be leaked, which
shows up as a RAMBlock with empty name when attempting migration.

Reported-by: Dr. David Alan Gilbert <address@hidden>
Cc: Jason Wang <address@hidden>
Cc: address@hidden
Signed-off-by: Paolo Bonzini <address@hidden>
Tested-by: Laurent Vivier <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: e630b2bf7c8a7900d1e19ca006e6335df24f2928
      
https://github.com/qemu/qemu/commit/e630b2bf7c8a7900d1e19ca006e6335df24f2928
  Author: Zhang Chen <address@hidden>
  Date:   2017-03-14 (Tue, 14 Mar 2017)

  Changed paths:
    M net/colo-compare.c

  Log Message:
  -----------
  COLO-compare: Fix trace_event print bug

Because of inet_ntoa() return a statically allocated buffer,
subsequent calls will overwrite, So we fix this bug.

Signed-off-by: Zhang Chen <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: adb560f7fc92903f52071086a46422be1e3f4640
      
https://github.com/qemu/qemu/commit/adb560f7fc92903f52071086a46422be1e3f4640
  Author: Greg Ungerer <address@hidden>
  Date:   2017-03-14 (Tue, 14 Mar 2017)

  Changed paths:
    M hw/net/mcf_fec.c

  Log Message:
  -----------
  hw/net: implement MIB counters in mcf_fec driver

The FEC ethernet hardware module used on ColdFire SoC parts contains a
block of RAM used to maintain hardware counters. This block is accessible
via the usual FEC register address space. There is currently no support
for this in the QEMU mcf_fec driver.

Add support for storing a MIB RAM block, and provide register level
access to it. Also implement a basic set of stats collection functions
to populate MIB data fields.

This support tested running a Linux target and using the net-tools
"ethtool -S" option. As of linux-4.9 the kernels FEC driver makes
accesses to the MIB counters during its initialization (which it never
did before), and so this version of Linux will now fail with the QEMU
error:

    qemu: hardware error: mcf_fec_read: Bad address 0x200

This MIB counter support fixes this problem.

Signed-off-by: Greg Ungerer <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
Signed-off-by: Jason Wang <address@hidden>


  Commit: 591bce29b10a957a5cad4354cd5959c45570aedb
      
https://github.com/qemu/qemu/commit/591bce29b10a957a5cad4354cd5959c45570aedb
  Author: Peter Maydell <address@hidden>
  Date:   2017-03-14 (Tue, 14 Mar 2017)

  Changed paths:
    M hw/net/e1000e.c
    M hw/net/mcf_fec.c
    M net/colo-compare.c

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

# gpg: Signature made Tue 14 Mar 2017 07:55:01 GMT
# gpg:                using RSA key 0xEF04965B398D6211
# 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:
  hw/net: implement MIB counters in mcf_fec driver
  COLO-compare: Fix trace_event print bug
  e1000e: correctly tear down MSI-X memory regions

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


Compare: https://github.com/qemu/qemu/compare/94b5d57d2f5a...591bce29b10a