[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v2 1/4] include/hw/virtio: Break inclusion loop
From: |
Edgar E. Iglesias |
Subject: |
Re: [PATCH v2 1/4] include/hw/virtio: Break inclusion loop |
Date: |
Fri, 23 Dec 2022 04:31:24 +0100 |
On Fri, Dec 23, 2022 at 10:58:06AM +0800, Jason Wang wrote:
> On Thu, Dec 22, 2022 at 8:08 PM Markus Armbruster <armbru@redhat.com> 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: Philippe Mathieu-Daudé <philmd@linaro.org>
> > Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
> > Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Edgar E. Iglesias <edgar@zeroasic.com>
>
> Acked-by: Jason Wang <jasowang@redhat.com>
>
> Thanks
>
> > ---
> > include/hw/virtio/virtio.h | 1 -
> > hw/virtio/virtio-qmp.c | 1 +
> > hw/virtio/virtio.c | 1 +
> > 3 files changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
> > index 24561e933a..48ab2117b5 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-qmp.c b/hw/virtio/virtio-qmp.c
> > index 8e7282658f..3d4497da99 100644
> > --- a/hw/virtio/virtio-qmp.c
> > +++ b/hw/virtio/virtio-qmp.c
> > @@ -11,6 +11,7 @@
> >
> > #include "qemu/osdep.h"
> > #include "hw/virtio/virtio.h"
> > +#include "hw/virtio/vhost.h"
> > #include "virtio-qmp.h"
> >
> > #include "standard-headers/linux/virtio_ids.h"
> > diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
> > index 289eb71045..0ec6ff9ae4 100644
> > --- a/hw/virtio/virtio.c
> > +++ b/hw/virtio/virtio.c
> > @@ -25,6 +25,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"
> > --
> > 2.38.1
> >
>
- [PATCH v2 0/4] Clean up includes, Markus Armbruster, 2022/12/22
- [PATCH v2 3/4] include: Don't include qemu/osdep.h, Markus Armbruster, 2022/12/22
- [PATCH v2 4/4] docs/devel: Rules on #include in headers, Markus Armbruster, 2022/12/22
- [PATCH v2 1/4] include/hw/virtio: Break inclusion loop, Markus Armbruster, 2022/12/22
- [PATCH v2 2/4] include: Include headers where needed, Markus Armbruster, 2022/12/22
- Re: [PATCH v2 0/4] Clean up includes, Markus Armbruster, 2022/12/22