diff mbox

[10/12] timer.h: Don't include qemu-common.h

Message ID 1437583451-9677-11-git-send-email-peter.maydell@linaro.org
State New
Headers show

Commit Message

Peter Maydell July 22, 2015, 4:44 p.m. UTC
Include the specific headers we need, rather than qemu-common.h.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 include/qemu/timer.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Daniel P. Berrangé July 31, 2015, 5:36 p.m. UTC | #1
On Wed, Jul 22, 2015 at 05:44:09PM +0100, Peter Maydell wrote:
> Include the specific headers we need, rather than qemu-common.h.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>  include/qemu/timer.h | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/include/qemu/timer.h b/include/qemu/timer.h
> index 9939246..6205024 100644
> --- a/include/qemu/timer.h
> +++ b/include/qemu/timer.h
> @@ -1,8 +1,9 @@
>  #ifndef QEMU_TIMER_H
>  #define QEMU_TIMER_H
>  
> +#include "osdep.h"
> +#include "glib-compat.h"

I think there's probably a reasonable argument for glib-compat.h to
be part of osdep.h as essentially all source files use glib now and
so could potentially require the compat definitions.

As mentioned in the cover letter, my preference would be for the
osdep.h header to be mandated in all the .c files, which would
mean we wouldn't need to add it here.

Looks like the same points apply to your patches 11 & 12, so I
won't repeat it again in those.

>  #include "qemu/typedefs.h"
> -#include "qemu-common.h"
>  #include "qemu/notify.h"
>  #include "qemu/host-utils.h"

Regards,
Daniel
diff mbox

Patch

diff --git a/include/qemu/timer.h b/include/qemu/timer.h
index 9939246..6205024 100644
--- a/include/qemu/timer.h
+++ b/include/qemu/timer.h
@@ -1,8 +1,9 @@ 
 #ifndef QEMU_TIMER_H
 #define QEMU_TIMER_H
 
+#include "osdep.h"
+#include "glib-compat.h"
 #include "qemu/typedefs.h"
-#include "qemu-common.h"
 #include "qemu/notify.h"
 #include "qemu/host-utils.h"