* [Qemu-devel] [PATCH] exec: don't include hw/boards for linux-user
@ 2015-03-11 6:58 Michael S. Tsirkin
2015-03-11 7:08 ` Paolo Bonzini
2015-03-11 11:10 ` Andreas Färber
0 siblings, 2 replies; 3+ messages in thread
From: Michael S. Tsirkin @ 2015-03-11 6:58 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Maydell, =?UTF-8?q?Andreas=20F=C3=A4rber?=, Paolo Bonzini
As noted by Andreas, hw/boards.h shouldn't be used outside softmmu code.
Include it conditionally, and drop the (now unnecessary) ifdef guards in
hw/boards.h
Reported-by: Andreas Färber <afaerber@suse.de>
Cc: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
include/hw/boards.h | 4 ----
exec.c | 2 ++
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/include/hw/boards.h b/include/hw/boards.h
index cd6deb0..f44d6f5 100644
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -3,8 +3,6 @@
#ifndef HW_BOARDS_H
#define HW_BOARDS_H
-#if !defined(CONFIG_USER_ONLY)
-
#include "qemu/typedefs.h"
#include "sysemu/blockdev.h"
#include "sysemu/accel.h"
@@ -158,5 +156,3 @@ struct MachineState {
};
#endif
-
-#endif
diff --git a/exec.c b/exec.c
index fe64009..bc37c7b 100644
--- a/exec.c
+++ b/exec.c
@@ -26,7 +26,9 @@
#include "cpu.h"
#include "tcg.h"
#include "hw/hw.h"
+#if !defined(CONFIG_USER_ONLY)
#include "hw/boards.h"
+#endif
#include "hw/qdev.h"
#include "qemu/osdep.h"
#include "sysemu/kvm.h"
--
MST
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] exec: don't include hw/boards for linux-user
2015-03-11 6:58 [Qemu-devel] [PATCH] exec: don't include hw/boards for linux-user Michael S. Tsirkin
@ 2015-03-11 7:08 ` Paolo Bonzini
2015-03-11 11:10 ` Andreas Färber
1 sibling, 0 replies; 3+ messages in thread
From: Paolo Bonzini @ 2015-03-11 7:08 UTC (permalink / raw)
To: Michael S. Tsirkin, qemu-devel; +Cc: Peter Maydell, Andreas Färber
On 11/03/2015 07:58, Michael S. Tsirkin wrote:
> As noted by Andreas, hw/boards.h shouldn't be used outside softmmu code.
> Include it conditionally, and drop the (now unnecessary) ifdef guards in
> hw/boards.h
>
> Reported-by: Andreas Färber <afaerber@suse.de>
> Cc: Peter Maydell <peter.maydell@linaro.org>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> include/hw/boards.h | 4 ----
> exec.c | 2 ++
> 2 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/include/hw/boards.h b/include/hw/boards.h
> index cd6deb0..f44d6f5 100644
> --- a/include/hw/boards.h
> +++ b/include/hw/boards.h
> @@ -3,8 +3,6 @@
> #ifndef HW_BOARDS_H
> #define HW_BOARDS_H
>
> -#if !defined(CONFIG_USER_ONLY)
> -
> #include "qemu/typedefs.h"
> #include "sysemu/blockdev.h"
> #include "sysemu/accel.h"
> @@ -158,5 +156,3 @@ struct MachineState {
> };
>
> #endif
> -
> -#endif
> diff --git a/exec.c b/exec.c
> index fe64009..bc37c7b 100644
> --- a/exec.c
> +++ b/exec.c
> @@ -26,7 +26,9 @@
> #include "cpu.h"
> #include "tcg.h"
> #include "hw/hw.h"
> +#if !defined(CONFIG_USER_ONLY)
> #include "hw/boards.h"
> +#endif
> #include "hw/qdev.h"
> #include "qemu/osdep.h"
> #include "sysemu/kvm.h"
>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] exec: don't include hw/boards for linux-user
2015-03-11 6:58 [Qemu-devel] [PATCH] exec: don't include hw/boards for linux-user Michael S. Tsirkin
2015-03-11 7:08 ` Paolo Bonzini
@ 2015-03-11 11:10 ` Andreas Färber
1 sibling, 0 replies; 3+ messages in thread
From: Andreas Färber @ 2015-03-11 11:10 UTC (permalink / raw)
To: Michael S. Tsirkin, qemu-devel; +Cc: Peter Maydell, Paolo Bonzini
Am 11.03.2015 um 07:58 schrieb Michael S. Tsirkin:
> As noted by Andreas, hw/boards.h shouldn't be used outside softmmu code.
> Include it conditionally, and drop the (now unnecessary) ifdef guards in
> hw/boards.h
>
> Reported-by: Andreas Färber <afaerber@suse.de>
> Cc: Peter Maydell <peter.maydell@linaro.org>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> include/hw/boards.h | 4 ----
> exec.c | 2 ++
> 2 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/include/hw/boards.h b/include/hw/boards.h
> index cd6deb0..f44d6f5 100644
> --- a/include/hw/boards.h
> +++ b/include/hw/boards.h
> @@ -3,8 +3,6 @@
> #ifndef HW_BOARDS_H
> #define HW_BOARDS_H
>
> -#if !defined(CONFIG_USER_ONLY)
> -
> #include "qemu/typedefs.h"
> #include "sysemu/blockdev.h"
> #include "sysemu/accel.h"
> @@ -158,5 +156,3 @@ struct MachineState {
> };
>
> #endif
> -
> -#endif
> diff --git a/exec.c b/exec.c
> index fe64009..bc37c7b 100644
> --- a/exec.c
> +++ b/exec.c
> @@ -26,7 +26,9 @@
> #include "cpu.h"
> #include "tcg.h"
> #include "hw/hw.h"
> +#if !defined(CONFIG_USER_ONLY)
> #include "hw/boards.h"
> +#endif
> #include "hw/qdev.h"
> #include "qemu/osdep.h"
> #include "sysemu/kvm.h"
Reviewed-by: Andreas Färber <afaerber@suse.de>
Thanks,
Andreas
--
SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Felix Imendörffer, Jane Smithard, Jennifer Guild, Dilip Upmanyu,
Graham Norton; HRB 21284 (AG Nürnberg)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-03-11 11:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-11 6:58 [Qemu-devel] [PATCH] exec: don't include hw/boards for linux-user Michael S. Tsirkin
2015-03-11 7:08 ` Paolo Bonzini
2015-03-11 11:10 ` Andreas Färber
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).