From: "Michael S. Tsirkin" <mst@redhat.com>
To: Markus Armbruster <armbru@redhat.com>
Cc: qemu-devel@nongnu.org, imammedo@redhat.com, ani@anisinha.ca,
peter.maydell@linaro.org, laurent@vivier.eu,
edgar.iglesias@gmail.com, Alistair.Francis@wdc.com,
bin.meng@windriver.com, palmer@dabbelt.com,
marcel.apfelbaum@gmail.com, yangxiaojuan@loongson.cn,
gaosong@loongson.cn, richard.henderson@linaro.org, deller@gmx.de,
jasowang@redhat.com, vikram.garhwal@amd.com,
francisco.iglesias@amd.com, clg@kaod.org, kraxel@redhat.com,
marcandre.lureau@redhat.com, riku.voipio@iki.fi,
qemu-arm@nongnu.org, qemu-riscv@nongnu.org, qemu-ppc@nongnu.org,
crwulff@gmail.com, marex@denx.de
Subject: Re: [PATCH 1/2] include/hw/virtio: Break inclusion loop
Date: Tue, 20 Dec 2022 10:05:28 -0500 [thread overview]
Message-ID: <20221220100515-mutt-send-email-mst@kernel.org> (raw)
In-Reply-To: <20221210133915.4104305-2-armbru@redhat.com>
On Sat, Dec 10, 2022 at 02:39:14PM +0100, Markus Armbruster wrote:
> 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: Michael S. Tsirkin <mst@redhat.com>
feel free to merge
> ---
> 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-20 15:06 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2022-12-10 13:39 ` [PATCH 2/2] include: Include headers where needed Markus Armbruster
2022-12-12 5:49 ` Alistair Francis
2022-12-20 15:04 ` Michael S. Tsirkin
-- strict thread matches above, loose matches on Subject: below --
2022-12-14 7:46 [PULL 00/30] QAPI patches patches for 2022-12-14 Markus Armbruster
2022-12-14 7:46 ` [PATCH 1/2] include/hw/virtio: Break inclusion loop Markus Armbruster
2022-12-14 7:49 ` Markus Armbruster
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=20221220100515-mutt-send-email-mst@kernel.org \
--to=mst@redhat.com \
--cc=Alistair.Francis@wdc.com \
--cc=ani@anisinha.ca \
--cc=armbru@redhat.com \
--cc=bin.meng@windriver.com \
--cc=clg@kaod.org \
--cc=crwulff@gmail.com \
--cc=deller@gmx.de \
--cc=edgar.iglesias@gmail.com \
--cc=francisco.iglesias@amd.com \
--cc=gaosong@loongson.cn \
--cc=imammedo@redhat.com \
--cc=jasowang@redhat.com \
--cc=kraxel@redhat.com \
--cc=laurent@vivier.eu \
--cc=marcandre.lureau@redhat.com \
--cc=marcel.apfelbaum@gmail.com \
--cc=marex@denx.de \
--cc=palmer@dabbelt.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=qemu-riscv@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=riku.voipio@iki.fi \
--cc=vikram.garhwal@amd.com \
--cc=yangxiaojuan@loongson.cn \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.