[Qemu-commits] [qemu/qemu] 4dc5ac: vhost-vdpa: fix the compile issue without kvm

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 4dc5acc07e88b2776513db75944f2e240116ebda
      
https://github.com/qemu/qemu/commit/4dc5acc07e88b2776513db75944f2e240116ebda
  Author: Cindy Lu <lulu@redhat.com>
  Date:   2020-07-08 (Wed, 08 Jul 2020)

  Changed paths:
    M hw/virtio/vhost-vdpa.c

  Log Message:
  -----------
  vhost-vdpa: fix the compile issue without kvm

Fix the compile issue in the system without the kvm support

Signed-off-by: Cindy Lu <lulu@redhat.com>
Message-Id: <20200708084922.21904-1-lulu@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>


  Commit: 0fb7ea45157d63507675a4011bc4b24588217f6e
      
https://github.com/qemu/qemu/commit/0fb7ea45157d63507675a4011bc4b24588217f6e
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-07-10 (Fri, 10 Jul 2020)

  Changed paths:
    M hw/virtio/vhost-vdpa.c

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

virtio: bugfix

fixes vdpa on non-kvm platforms

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

# gpg: Signature made Wed 08 Jul 2020 11:17:48 BST
# gpg:                using RSA key 5D09FD0871C8F85B94CA8A0D281F0DB8D28D5469
# gpg:                issuer "mst@redhat.com"
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" [full]
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>" [full]
# 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:
  vhost-vdpa: fix the compile issue without kvm

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/45db94cc90c2...0fb7ea45157d