From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Subject: [PATCH 1/2] include/hw/virtio: Break inclusion loop
Date: Wed, 14 Dec 2022 08:46:51 +0100 [thread overview]
Message-ID: <20221214074721.731441-3-armbru@redhat.com> (raw)
In-Reply-To: <20221214074721.731441-1-armbru@redhat.com>
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
next prev parent reply other threads:[~2022-12-14 8:33 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-14 7:46 [PULL 00/30] QAPI patches patches for 2022-12-14 Markus Armbruster
2022-12-14 7:46 ` [PULL 01/30] docs/devel/qapi-code-gen: Update example to match current code Markus Armbruster
2022-12-14 7:46 ` Markus Armbruster [this message]
2022-12-14 7:49 ` [PATCH 1/2] include/hw/virtio: Break inclusion loop Markus Armbruster
2022-12-14 7:46 ` [PATCH 2/2] include: Include headers where needed Markus Armbruster
2022-12-14 7:49 ` Markus Armbruster
2022-12-14 7:46 ` [PULL 02/30] qapi: Tidy up whitespace in generated code Markus Armbruster
2022-12-14 7:46 ` [PULL 03/30] docs/devel/qapi-code-gen: Extend example for next commit's change Markus Armbruster
2022-12-14 7:46 ` [PULL 04/30] qapi: Start to elide redundant has_FOO in generated C Markus Armbruster
2022-12-14 7:46 ` [PULL 05/30] qapi tests: Elide " Markus Armbruster
2022-12-14 7:46 ` [PULL 06/30] qapi acpi: " Markus Armbruster
2022-12-14 7:46 ` [PULL 07/30] qapi audio: " Markus Armbruster
2022-12-14 7:46 ` [PULL 08/30] blockdev: Clean up abuse of DriveBackup member format Markus Armbruster
2022-12-14 7:47 ` [PULL 09/30] nbd/server: Clean up abuse of BlockExportOptionsNbd member @arg Markus Armbruster
2022-12-14 7:47 ` [PULL 10/30] qapi block: Elide redundant has_FOO in generated C Markus Armbruster
2022-12-14 7:47 ` [PULL 11/30] qapi chardev: " Markus Armbruster
2022-12-14 7:47 ` [PULL 12/30] qapi crypto: " Markus Armbruster
2022-12-14 7:47 ` [PULL 13/30] qapi dump: " Markus Armbruster
2022-12-14 7:47 ` [PULL 14/30] qapi job: " Markus Armbruster
2022-12-14 7:47 ` [PULL 15/30] qapi machine: " Markus Armbruster
2022-12-14 7:47 ` [PULL 16/30] qapi migration: " Markus Armbruster
2022-12-14 7:47 ` [PULL 17/30] qapi misc: " Markus Armbruster
2022-12-14 7:47 ` [PULL 18/30] qapi net: " Markus Armbruster
2022-12-14 7:47 ` [PULL 19/30] qapi pci: " Markus Armbruster
2022-12-14 7:47 ` [PULL 20/30] qapi qdev qom: " Markus Armbruster
2022-12-14 7:47 ` [PULL 21/30] qapi replay: " Markus Armbruster
2022-12-14 7:47 ` [PULL 22/30] qapi rocker: " Markus Armbruster
2022-12-14 7:47 ` [PULL 23/30] qapi run-state: " Markus Armbruster
2022-12-14 7:47 ` [PULL 24/30] qapi stats: " Markus Armbruster
2022-12-14 7:47 ` [PULL 25/30] qapi tpm: " Markus Armbruster
2022-12-14 7:47 ` [PULL 26/30] qapi transaction: " Markus Armbruster
2022-12-14 7:47 ` [PULL 27/30] qapi ui: " Markus Armbruster
2022-12-14 7:47 ` [PULL 28/30] qapi virtio: " Markus Armbruster
2022-12-14 7:47 ` [PULL 29/30] qapi qga: " Markus Armbruster
2022-12-14 7:47 ` [PULL 30/30] qapi: Drop temporary logic to support conversion step by step Markus Armbruster
2022-12-14 17:03 ` [PULL 00/30] QAPI patches patches for 2022-12-14 Peter Maydell
-- strict thread matches above, loose matches on Subject: below --
2022-12-10 13:39 [PATCH 0/2] Clean up includes Markus Armbruster
2022-12-10 13:39 ` [PATCH 1/2] include/hw/virtio: Break inclusion loop Markus Armbruster
2022-12-10 15:57 ` Philippe Mathieu-Daudé
2022-12-12 5:45 ` Alistair Francis
2022-12-12 11:33 ` Stefano Garzarella
2022-12-20 15:05 ` Michael S. Tsirkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221214074721.731441-3-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).