diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-07-10 19:29:07 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-07-10 19:29:07 +0100 |
| commit | 0fb7ea45157d63507675a4011bc4b24588217f6e (patch) | |
| tree | 82cb326b19da6105b5e8f54ab372d27c8d012fe7 | |
| parent | 45db94cc90c286a9965a285ba19450f448760a09 (diff) | |
| parent | 4dc5acc07e88b2776513db75944f2e240116ebda (diff) | |
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>
| -rw-r--r-- | hw/virtio/vhost-vdpa.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c index a3d17fe0f9..65d5aaf08a 100644 --- a/hw/virtio/vhost-vdpa.c +++ b/hw/virtio/vhost-vdpa.c @@ -19,8 +19,7 @@ #include "hw/virtio/virtio-net.h" #include "hw/virtio/vhost-vdpa.h" #include "qemu/main-loop.h" -#include <linux/kvm.h> -#include "sysemu/kvm.h" +#include "cpu.h" static bool vhost_vdpa_listener_skipped_section(MemoryRegionSection *section) { |