Re: [Qemu-devel] [PATCH v4 6/7] Makefile: Move bootdevice.o to common-obj-y

[Philippe Mathieu-Daudé]

On 06/26/2017 02:22 AM, Thomas Huth wrote:
> There does not seem to be any target specific code in this file, so
> we can put it into "common-obj" instead of "obj" to compile it only
> once for all targets.
>
> Signed-off-by: Thomas Huth <address@hidden>

Reviewed-by: Philippe Mathieu-Daudé <address@hidden>

> ---
>   Makefile.objs   | 2 +-
>   Makefile.target | 2 +-
>   bootdevice.c    | 2 +-
>   3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/Makefile.objs b/Makefile.objs
> index b2e6322..756644c 100644
> --- a/Makefile.objs
> +++ b/Makefile.objs
> @@ -40,7 +40,7 @@ io-obj-y = io/
>   
>   ifeq ($(CONFIG_SOFTMMU),y)
>   common-obj-y = blockdev.o blockdev-nbd.o block/
> -common-obj-y += iothread.o
> +common-obj-y += bootdevice.o iothread.o
>   common-obj-y += net/
>   common-obj-y += qdev-monitor.o device-hotplug.o
>   common-obj-$(CONFIG_WIN32) += os-win32.o
> diff --git a/Makefile.target b/Makefile.target
> index 0066579..ffa7a8f 100644
> --- a/Makefile.target
> +++ b/Makefile.target
> @@ -137,7 +137,7 @@ endif #CONFIG_BSD_USER
>   # System emulator target
>   ifdef CONFIG_SOFTMMU
>   obj-y += arch_init.o cpus.o monitor.o gdbstub.o balloon.o ioport.o numa.o
> -obj-y += qtest.o bootdevice.o
> +obj-y += qtest.o
>   obj-y += hw/
>   obj-y += memory.o
>   obj-y += memory_mapping.o
> diff --git a/bootdevice.c b/bootdevice.c
> index 33e3029..1141009 100644
> --- a/bootdevice.c
> +++ b/bootdevice.c
> @@ -27,7 +27,7 @@
>   #include "sysemu/sysemu.h"
>   #include "qapi/visitor.h"
>   #include "qemu/error-report.h"
> -#include "hw/hw.h"
> +#include "sysemu/reset.h"
>   #include "hw/qdev-core.h"
>   
>   typedef struct FWBootEntry FWBootEntry;