[Qemu-commits] [qemu/qemu] d1b425: virtio-bus: Plug devices after features are negoti...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: d1b4259f1ab18af24e6a297edb6a8f71691f3256
      
https://github.com/qemu/qemu/commit/d1b4259f1ab18af24e6a297edb6a8f71691f3256
  Author: Maxime Coquelin <address@hidden>
  Date:   2016-09-15 (Thu, 15 Sep 2016)

  Changed paths:
    M hw/s390x/virtio-ccw.c
    M hw/virtio/virtio-bus.c
    M hw/virtio/virtio-pci.c
    M hw/virtio/virtio-pci.h
    M include/hw/virtio/virtio-bus.h

  Log Message:
  -----------
  virtio-bus: Plug devices after features are negotiated

Currently, devices are plugged before features are negotiated.
If the backend doesn't support VIRTIO_F_VERSION_1, the transport
needs to rewind some settings.

This is the case for CCW, for which a post_plugged callback had
been introduced, where max_rev field is just updated if
VIRTIO_F_VERSION_1 is not supported by the backend.
For PCI, implementing post_plugged would be much more
complicated, so it needs to know whether the backend supports
VIRTIO_F_VERSION_1 at plug time.

Currently, nothing is done for PCI. Modern capabilities get
exposed to the guest even if VIRTIO_F_VERSION_1 is not supported
by the backend, which confuses the guest.

This patch replaces existing post_plugged solution with an
approach that fits with both transports.
Features negotiation is performed before ->device_plugged() call.
A pre_plugged callback is introduced so that the transports can
set their supported features.

Cc: Michael S. Tsirkin <address@hidden>
Cc: address@hidden
Tested-by: Cornelia Huck <address@hidden> [ccw]
Reviewed-by: Cornelia Huck <address@hidden>
Reviewed-by: Marcel Apfelbaum <address@hidden>
Signed-off-by: Maxime Coquelin <address@hidden>


  Commit: 6bd7776cd0a9581cdb5e9dd40df8821a96e355d6
      
https://github.com/qemu/qemu/commit/6bd7776cd0a9581cdb5e9dd40df8821a96e355d6
  Author: Greg Kurz <address@hidden>
  Date:   2016-09-16 (Fri, 16 Sep 2016)

  Changed paths:
    M MAINTAINERS

  Log Message:
  -----------
  MAINTAINERS: add virtio-* tests

Except virtio-9p, all virtio-* tests are orphan. This patch tries to fix
it, according to the following logic:

- when the related subsystem has its own section in MAINTAINERS, the test
  is added there
- otherwise it is added to the "parent" section (aka. SCSI, Network devices,
  virtio)

Signed-off-by: Greg Kurz <address@hidden>
Reviewed-by: Amit Shah <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 0f2fa73ba0ca19ebdaccf0d1785583d6601411b6
      
https://github.com/qemu/qemu/commit/0f2fa73ba0ca19ebdaccf0d1785583d6601411b6
  Author: Peter Maydell <address@hidden>
  Date:   2016-09-19 (Mon, 19 Sep 2016)

  Changed paths:
    M MAINTAINERS
    M hw/s390x/virtio-ccw.c
    M hw/virtio/virtio-bus.c
    M hw/virtio/virtio-pci.c
    M hw/virtio/virtio-pci.h
    M include/hw/virtio/virtio-bus.h

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

virtio: fixes

virtio feature negotiation rework

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

# gpg: Signature made Fri 16 Sep 2016 19:54:54 BST
# gpg:                using RSA key 0x281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <address@hidden>"
# gpg:                 aka "Michael S. Tsirkin <address@hidden>"
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
#      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469

* remotes/mst/tags/for_upstream:
  MAINTAINERS: add virtio-* tests
  virtio-bus: Plug devices after features are negotiated

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

# Conflicts:
#       MAINTAINERS


Compare: https://github.com/qemu/qemu/compare/e3571ae30cd2...0f2fa73ba0ca