From: "Daniel P. Berrange" <berrange@redhat.com>
To: Markus Armbruster <armbru@redhat.com>
Cc: peter.maydell@linaro.org, qemu-devel@nongnu.org, pbonzini@redhat.com
Subject: Re: [Qemu-devel] [PATCH 14/15] Don't include qemu-common.h in headers
Date: Tue, 15 Mar 2016 15:54:33 +0000 [thread overview]
Message-ID: <20160315155433.GG3168@redhat.com> (raw)
In-Reply-To: <1458054221-16923-15-git-send-email-armbru@redhat.com>
On Tue, Mar 15, 2016 at 04:03:40PM +0100, Markus Armbruster wrote:
> qemu-common.h should only be included by .c files. Its file comment
> explains why: "No header file should depend on qemu-common.h, as this
> would easily lead to circular header dependencies."
>
> We include it in many headers anyway. Fix that.
>
> Dropping these ill-advised includes requires including
> qemu/fprintf-fn.h, cpu.h or exec/hwaddr.h instead in a few headers
> that actually need those, and of course including qemu-common.h in .c
> files that need it, except some of them need only qemu/module.h.
>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
> crypto/secret.c | 1 +
> crypto/tlscreds.c | 1 +
> crypto/tlscredsanon.c | 1 +
> crypto/tlscredsx509.c | 1 +
> diff --git a/crypto/secret.c b/crypto/secret.c
> index 285ab7a..65929ac 100644
> --- a/crypto/secret.c
> +++ b/crypto/secret.c
> @@ -19,6 +19,7 @@
> */
>
> #include "qemu/osdep.h"
> +#include "qemu/module.h"
> #include "crypto/secret.h"
> #include "crypto/cipher.h"
> #include "qapi/error.h"
> diff --git a/crypto/tlscreds.c b/crypto/tlscreds.c
> index 1620e12..edc7f88 100644
> --- a/crypto/tlscreds.c
> +++ b/crypto/tlscreds.c
> @@ -20,6 +20,7 @@
>
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> +#include "qemu/module.h"
> #include "crypto/tlscredspriv.h"
> #include "trace.h"
>
> diff --git a/crypto/tlscredsanon.c b/crypto/tlscredsanon.c
> index 1464220..50df4f0 100644
> --- a/crypto/tlscredsanon.c
> +++ b/crypto/tlscredsanon.c
> @@ -19,6 +19,7 @@
> */
>
> #include "qemu/osdep.h"
> +#include "qemu/module.h"
> #include "crypto/tlscredsanon.h"
> #include "crypto/tlscredspriv.h"
> #include "qapi/error.h"
> diff --git a/crypto/tlscredsx509.c b/crypto/tlscredsx509.c
> index 6a0179c..2709b2b 100644
> --- a/crypto/tlscredsx509.c
> +++ b/crypto/tlscredsx509.c
> @@ -19,6 +19,7 @@
> */
>
> #include "qemu/osdep.h"
> +#include "qemu/module.h"
> #include "crypto/tlscredsx509.h"
> #include "crypto/tlscredspriv.h"
> #include "crypto/secret.h"
It feels like these should be in the previous patch that removes
qemu-common.h from the include/crypto files ?
Regards,
Daniel
--
|: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org -o- http://virt-manager.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
next prev parent reply other threads:[~2016-03-15 15:54 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-15 15:03 [Qemu-devel] [PATCH 00/15] Clean up around osdep.h and qemu-common.h Markus Armbruster
2016-03-15 15:03 ` [Qemu-devel] [PATCH 01/15] include/qemu/osdep.h: Don't include qapi/error.h Markus Armbruster
2016-03-15 16:04 ` Paolo Bonzini
2016-03-15 16:26 ` Markus Armbruster
2016-03-15 15:03 ` [Qemu-devel] [PATCH 02/15] Use scripts/clean-includes to drop redundant qemu/typedefs.h Markus Armbruster
2016-03-15 15:03 ` [Qemu-devel] [PATCH 03/15] include/config.h: Unused, remove Markus Armbruster
2016-03-15 15:03 ` [Qemu-devel] [PATCH 04/15] Clean up includes some more Markus Armbruster
2016-03-15 15:03 ` [Qemu-devel] [PATCH 05/15] fw_cfg: Split fw_cfg_keys.h off fw_cfg.h Markus Armbruster
2016-03-15 15:03 ` [Qemu-devel] [PATCH 06/15] include/qemu/iov.h: Don't include qemu-common.h Markus Armbruster
2016-03-15 15:03 ` [Qemu-devel] [PATCH 07/15] include/hw/hw.h: " Markus Armbruster
2016-03-15 15:03 ` [Qemu-devel] [PATCH 08/15] hw/pci/pci.h: " Markus Armbruster
2016-03-15 15:03 ` [Qemu-devel] [PATCH 09/15] Move HOST_LONG_BITS from qemu-common.h to qemu/osdep.h Markus Armbruster
2016-03-15 15:03 ` [Qemu-devel] [PATCH 10/15] Move QEMU_ALIGN_*() " Markus Armbruster
2016-03-15 15:03 ` [Qemu-devel] [PATCH 11/15] Move ParallelIOArg from qemu-common.h to sysemu/char.h Markus Armbruster
2016-03-15 15:03 ` [Qemu-devel] [PATCH 12/15] isa: Move DMA_transfer_handler from qemu-common.h to hw/isa/isa.h Markus Armbruster
2016-03-15 15:03 ` [Qemu-devel] [PATCH 13/15] include/crypto: Include qapi-types.h instead of qemu-common.h Markus Armbruster
2016-03-15 15:51 ` Daniel P. Berrange
2016-03-15 16:24 ` Markus Armbruster
2016-03-15 15:03 ` [Qemu-devel] [PATCH 14/15] Don't include qemu-common.h in headers Markus Armbruster
2016-03-15 15:54 ` Daniel P. Berrange [this message]
2016-03-15 16:35 ` Markus Armbruster
2016-03-15 15:55 ` Paolo Bonzini
2016-03-15 16:31 ` Markus Armbruster
2016-03-15 17:25 ` Paolo Bonzini
2016-03-15 17:34 ` Peter Maydell
2016-03-15 17:44 ` Paolo Bonzini
2016-03-15 17:53 ` Peter Maydell
2016-03-15 19:03 ` Markus Armbruster
2016-03-15 15:03 ` [Qemu-devel] [PATCH 15/15] Drop superfluous qemu-common.h inclusions Markus Armbruster
2016-03-15 15:30 ` [Qemu-devel] [PATCH 00/15] Clean up around osdep.h and qemu-common.h Paolo Bonzini
2016-03-18 8:47 ` Markus Armbruster
2016-03-18 9:05 ` Peter Maydell
2016-03-18 9:55 ` Paolo Bonzini
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=20160315155433.GG3168@redhat.com \
--to=berrange@redhat.com \
--cc=armbru@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--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).