[Qemu-commits] [qemu/qemu] fcd23a: sun4m: set default display type to TCX

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: fcd23a67875d6f7f8256b90960ec05312cab2f5b
      
https://github.com/qemu/qemu/commit/fcd23a67875d6f7f8256b90960ec05312cab2f5b
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2019-07-02 (Tue, 02 Jul 2019)

  Changed paths:
    M hw/sparc/sun4m.c

  Log Message:
  -----------
  sun4m: set default display type to TCX

Commit 6807874d55 "sun4m: obey -vga none" changed the sun4m machines so that
they could be started without a framebuffer installed, but as no default
display type was configured the machines would start in headless mode without
an explict -vga option.

Set the default display type for all sun4m machines to TCX so that they will
start with a framebuffer if one is not specifically requested.

Signed-off-by: Mark Cave-Ayland <address@hidden>


  Commit: 6bdc3707d993f9e90a5f592ecf261c4f647dbb46
      
https://github.com/qemu/qemu/commit/6bdc3707d993f9e90a5f592ecf261c4f647dbb46
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2019-07-02 (Tue, 02 Jul 2019)

  Changed paths:
    M hw/net/sunhme.c
    M hw/net/trace-events

  Log Message:
  -----------
  sunhme: add trace event for logging PCI IRQ

Signed-off-by: Mark Cave-Ayland <address@hidden>


  Commit: 076489c043a22fe9be8f3458fbc9012b1fc0606f
      
https://github.com/qemu/qemu/commit/076489c043a22fe9be8f3458fbc9012b1fc0606f
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2019-07-02 (Tue, 02 Jul 2019)

  Changed paths:
    M hw/net/sunhme.c

  Log Message:
  -----------
  sunhme: fix incorrect constant in sunhme_can_receive()

Due to a copy/paste error the wrong register was being checked in order to
determine if the NIC is able to receive data.

Signed-off-by: Mark Cave-Ayland <address@hidden>


  Commit: 1058e1a377680e17bc8b56d5e9cab9559d47a3c1
      
https://github.com/qemu/qemu/commit/1058e1a377680e17bc8b56d5e9cab9559d47a3c1
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2019-07-02 (Tue, 02 Jul 2019)

  Changed paths:
    M hw/net/sunhme.c

  Log Message:
  -----------
  sunhme: flush any queued packets when HME_MAC_RXCFG_ENABLE bit is raised

Some client drivers use this bit to pause and resume the driver so make sure
that queued packets are flushed when the MAC is disabled and then reactivated.

Signed-off-by: Mark Cave-Ayland <address@hidden>


  Commit: 29df47a5cc4133a31259c24ffdf26bf25080558a
      
https://github.com/qemu/qemu/commit/29df47a5cc4133a31259c24ffdf26bf25080558a
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2019-07-02 (Tue, 02 Jul 2019)

  Changed paths:
    M hw/net/sunhme.c

  Log Message:
  -----------
  sunhme: fix return values from sunhme_receive() during receive packet 
processing

The current return values in sunhme_receive() when processing incoming packets
are inverted from what they should be. Make sure that we return 0 to indicate
the packet was discarded (and polling is to be disabled) and -1 to indicate
that the packet was discarded but polling for incoming data is to be continued.

Signed-off-by: Mark Cave-Ayland <address@hidden>


  Commit: 09340f497e96a62d076b2f223e7b16a7358cfecb
      
https://github.com/qemu/qemu/commit/09340f497e96a62d076b2f223e7b16a7358cfecb
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2019-07-02 (Tue, 02 Jul 2019)

  Changed paths:
    M hw/net/sunhme.c
    M hw/net/trace-events

  Log Message:
  -----------
  sunhme: ensure that RX descriptor ring overflow is indicated to client driver

On very busy networks connected via a tap interface, it is possible to overflow
the RX descriptor ring in the time between the client driver enabling the RX
MAC and finishing writing the final configuration to the NIC registers.

Ensure that we detect this condition and update the status register accordingly
to indicate an overflow has occurred (and the incoming packet dropped) in order
to prevent the client driver becoming confused.

Signed-off-by: Mark Cave-Ayland <address@hidden>


  Commit: b2e1bc59f0f1ce0fd3962757ec4a334363b37f47
      
https://github.com/qemu/qemu/commit/b2e1bc59f0f1ce0fd3962757ec4a334363b37f47
  Author: Peter Maydell <address@hidden>
  Date:   2019-07-04 (Thu, 04 Jul 2019)

  Changed paths:
    M hw/net/sunhme.c
    M hw/net/trace-events
    M hw/sparc/sun4m.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc-20190702' into 
staging

qemu-sparc queue

# gpg: Signature made Tue 02 Jul 2019 23:14:13 BST
# gpg:                using RSA key CC621AB98E82200D915CC9C45BC2C56FAE0F321F
# gpg:                issuer "address@hidden"
# gpg: Good signature from "Mark Cave-Ayland <address@hidden>" [full]
# Primary key fingerprint: CC62 1AB9 8E82 200D 915C  C9C4 5BC2 C56F AE0F 321F

* remotes/mcayland/tags/qemu-sparc-20190702:
  sunhme: ensure that RX descriptor ring overflow is indicated to client driver
  sunhme: fix return values from sunhme_receive() during receive packet 
processing
  sunhme: flush any queued packets when HME_MAC_RXCFG_ENABLE bit is raised
  sunhme: fix incorrect constant in sunhme_can_receive()
  sunhme: add trace event for logging PCI IRQ
  sun4m: set default display type to TCX

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


Compare: https://github.com/qemu/qemu/compare/f0577c616cde...b2e1bc59f0f1