aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2022-12-22 13:08:10 +0100
committerMichael S. Tsirkin <mst@redhat.com>2023-01-08 01:54:22 -0500
commitf139b83717092b4080b85d6edde699d89e41a04c (patch)
tree101731db5165b9d762788db9040044c03e5481f7
parent881e0197709deef9e011f947c12879e3a7f63ce1 (diff)
include/hw/virtio: Break inclusion loop
hw/virtio/virtio.h and hw/virtio/vhost.h include each other. The former doesn't actually need the latter, so drop that inclusion to break the loop. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Reviewed-by: Stefano Garzarella <sgarzare@redhat.com> Message-Id: <20221222120813.727830-2-armbru@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Acked-by: Jason Wang <jasowang@redhat.com> Reviewed-by: Edgar E. Iglesias <edgar@zeroasic.com>
-rw-r--r--hw/virtio/virtio-qmp.h1
-rw-r--r--hw/virtio/virtio.c1
-rw-r--r--include/hw/virtio/virtio.h1
3 files changed, 2 insertions, 1 deletions
diff --git a/hw/virtio/virtio-qmp.h b/hw/virtio/virtio-qmp.h
index 59681082e5..8af5f5e65a 100644
--- a/hw/virtio/virtio-qmp.h
+++ b/hw/virtio/virtio-qmp.h
@@ -13,6 +13,7 @@
#include "qapi/qapi-types-virtio.h"
#include "hw/virtio/virtio.h"
+#include "hw/virtio/vhost.h"
#include "qemu/queue.h"
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index 02a49d9fa1..f35178f5fc 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -22,6 +22,7 @@
#include "qom/object_interfaces.h"
#include "hw/core/cpu.h"
#include "hw/virtio/virtio.h"
+#include "hw/virtio/vhost.h"
#include "migration/qemu-file-types.h"
#include "qemu/atomic.h"
#include "hw/virtio/virtio-bus.h"
diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
index 4219968fd8..77c6c55929 100644
--- a/include/hw/virtio/virtio.h
+++ b/include/hw/virtio/virtio.h
@@ -22,7 +22,6 @@
#include "standard-headers/linux/virtio_config.h"
#include "standard-headers/linux/virtio_ring.h"
#include "qom/object.h"
-#include "hw/virtio/vhost.h"
/*
* A guest should never accept this. It implies negotiation is broken