[Qemu-commits] [qemu/qemu] 75d663: ich9: fix skipped vmstate_memhp_state subsection

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 75d663611e81c748522d9cdcb5230bd02db86d05
      
https://github.com/qemu/qemu/commit/75d663611e81c748522d9cdcb5230bd02db86d05
  Author: Paulo Alcantara <address@hidden>
  Date:   2015-07-20 (Mon, 20 Jul 2015)

  Changed paths:
    M hw/acpi/ich9.c

  Log Message:
  -----------
  ich9: fix skipped vmstate_memhp_state subsection

By declaring another .subsections array for vmstate_tco_io_state made
vmstate_memhp_state not registered anymore. There must be only one
.subsections array for all subsections.

Cc: Michael S. Tsirkin <address@hidden>
Cc: Amit Shah <address@hidden>
Reported-by: Amit Shah <address@hidden>
Signed-off-by: Paulo Alcantara <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Amit Shah <address@hidden>


  Commit: d345ed2da3279b015605823397235b8c5ca5251f
      
https://github.com/qemu/qemu/commit/d345ed2da3279b015605823397235b8c5ca5251f
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2015-07-20 (Mon, 20 Jul 2015)

  Changed paths:
    M docs/specs/vhost-user.txt
    M hw/net/vhost_net.c
    M hw/virtio/vhost-user.c
    M net/vhost-user.c
    M qapi-schema.json
    M qemu-options.hx

  Log Message:
  -----------
  Revert "vhost-user: add multi queue support"

This reverts commit 830d70db692e374b55555f4407f96a1ceefdcc97.

The interface isn't fully backwards-compatible, which is bad.
Let's redo this properly after 2.4.

Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: feb93f361739071778ca2d23df3876db399548f7
      
https://github.com/qemu/qemu/commit/feb93f361739071778ca2d23df3876db399548f7
  Author: Jason Wang <address@hidden>
  Date:   2015-07-20 (Mon, 20 Jul 2015)

  Changed paths:
    M hw/net/virtio-net.c
    M include/hw/virtio/virtio-access.h

  Log Message:
  -----------
  virtio-net: unbreak any layout

Commit 032a74a1c0fcdd5fd1c69e56126b4c857ee36611
("virtio-net: byteswap virtio-net header") breaks any layout by
requiring out_sg[0].iov_len >= n->guest_hdr_len. Fixing this by
copying header to temporary buffer if swap is needed, and then use
this buffer as part of out_sg.

Fixes 032a74a1c0fcdd5fd1c69e56126b4c857ee36611
("virtio-net: byteswap virtio-net header")
Cc: address@hidden
Cc: address@hidden
Signed-off-by: Jason Wang <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: 9a2a66238e3bf2b681d6321c4667a2d589c8ebed
      
https://github.com/qemu/qemu/commit/9a2a66238e3bf2b681d6321c4667a2d589c8ebed
  Author: Chen Hanxiao <address@hidden>
  Date:   2015-07-20 (Mon, 20 Jul 2015)

  Changed paths:
    M hw/pci/pci.c

  Log Message:
  -----------
  pci_add_capability: remove duplicate comments

Signed-off-by: Chen Hanxiao <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 38705bb57bf1cd9e3f837cf11bcdee3876786c07
      
https://github.com/qemu/qemu/commit/38705bb57bf1cd9e3f837cf11bcdee3876786c07
  Author: Fam Zheng <address@hidden>
  Date:   2015-07-20 (Mon, 20 Jul 2015)

  Changed paths:
    M hw/net/virtio-net.c

  Log Message:
  -----------
  virtio-net: Flush incoming queues when DRIVER_OK is being set

This patch fixes network hang after "stop" then "cont", while network
packets keep arriving.

Tested both manually (tap, host pinging guest) and with Jason's qtest
series (plus his "[PATCH 2.4] socket: pass correct size in
net_socket_send()" fix).

As virtio_net_set_status is called when guest driver is setting status
byte and when vm state is changing, it is a good opportunity to flush
queued packets.

This is necessary because during vm stop the backend (e.g. tap) would
stop rx processing after .can_receive returns false, until the queue is
explicitly flushed or purged.

The other interesting condition in .can_receive, virtio_queue_ready(),
is handled by virtio_net_handle_rx() when guest kicks; the 3rd condition
is invalid queue index which doesn't need flushing.

Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: f9d6dbf0bf6e91b8ed896369ab1b7e91e5a1a4df
      
https://github.com/qemu/qemu/commit/f9d6dbf0bf6e91b8ed896369ab1b7e91e5a1a4df
  Author: Wen Congyang <address@hidden>
  Date:   2015-07-20 (Mon, 20 Jul 2015)

  Changed paths:
    M hw/net/virtio-net.c

  Log Message:
  -----------
  virtio-net: remove virtio queues if the guest doesn't support multiqueue

commit da51a335 adds all queues in .realize(). But if the
guest doesn't support multiqueue, we forget to remove them. And
we cannot handle the ctrl vq corretly. The guest will hang.

Signed-off-by: Wen Congyang <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Acked-by: Jason Wang <address@hidden>


  Commit: f73ca7363440240b7ee5ee7f7ddb1c64751efb54
      
https://github.com/qemu/qemu/commit/f73ca7363440240b7ee5ee7f7ddb1c64751efb54
  Author: Peter Maydell <address@hidden>
  Date:   2015-07-20 (Mon, 20 Jul 2015)

  Changed paths:
    M docs/specs/vhost-user.txt
    M hw/acpi/ich9.c
    M hw/net/vhost_net.c
    M hw/net/virtio-net.c
    M hw/pci/pci.c
    M hw/virtio/vhost-user.c
    M include/hw/virtio/virtio-access.h
    M net/vhost-user.c
    M qapi-schema.json
    M qemu-options.hx

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

virtio, vhost, pc fixes for 2.4

The only notable thing here is vhost-user multiqueue
revert. We'll work on making it stable in 2.5,
reverting now means we won't have to maintain
bug for bug compability forever.

Signed-off-by: Michael S. Tsirkin <address@hidden>

# gpg: Signature made Mon Jul 20 12:24:00 2015 BST using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <address@hidden>"
# gpg:                 aka "Michael S. Tsirkin <address@hidden>"

* remotes/mst/tags/for_upstream:
  virtio-net: remove virtio queues if the guest doesn't support multiqueue
  virtio-net: Flush incoming queues when DRIVER_OK is being set
  pci_add_capability: remove duplicate comments
  virtio-net: unbreak any layout
  Revert "vhost-user: add multi queue support"
  ich9: fix skipped vmstate_memhp_state subsection

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


Compare: https://github.com/qemu/qemu/compare/71358470eec6...f73ca7363440