[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/2] include/hw/virtio: Break inclusion loop
From: |
Markus Armbruster |
Subject: |
[PATCH 1/2] include/hw/virtio: Break inclusion loop |
Date: |
Wed, 14 Dec 2022 08:46:51 +0100 |
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>
---
include/hw/virtio/virtio.h | 1 -
hw/virtio/virtio.c | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
index a973811cbf..8b68b69e00 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
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index eb6347ab5d..faedf886da 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -26,6 +26,7 @@
#include "qemu/module.h"
#include "qom/object_interfaces.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"
--
2.37.3
- [PULL 27/30] qapi ui: Elide redundant has_FOO in generated C, (continued)
- [PULL 27/30] qapi ui: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14
- [PULL 13/30] qapi dump: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14
- [PULL 29/30] qapi qga: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14
- [PULL 14/30] qapi job: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14
- [PULL 26/30] qapi transaction: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14
- [PULL 21/30] qapi replay: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14
- [PULL 30/30] qapi: Drop temporary logic to support conversion step by step, Markus Armbruster, 2022/12/14
- [PULL 18/30] qapi net: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14
- [PULL 20/30] qapi qdev qom: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14
- [PULL 09/30] nbd/server: Clean up abuse of BlockExportOptionsNbd member @arg, Markus Armbruster, 2022/12/14
- [PATCH 1/2] include/hw/virtio: Break inclusion loop,
Markus Armbruster <=
- [PULL 24/30] qapi stats: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14
- Re: [PULL 00/30] QAPI patches patches for 2022-12-14, Peter Maydell, 2022/12/14