On Sun, Jun 10, 2018 at 10:14:27PM -0300, Philippe Mathieu-Daudé wrote: > These files don't use anything exposed by "qemu/cutils.h", > simplify preprocessing including directly "qemu/units.h". > > Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org>
ppc parts
Acked-by: David Gibson <da...@gibson.dropbear.id.au>
> ---
> hw/arm/msf2-soc.c | 2 +-
> hw/arm/msf2-som.c | 2 +-
> hw/core/machine.c | 2 +-
> hw/display/sm501.c | 2 +-
> hw/mips/boston.c | 2 +-
> hw/ppc/pnv.c | 2 +-
> hw/ppc/ppc440_uc.c | 2 +-
> 7 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/hw/arm/msf2-soc.c b/hw/arm/msf2-soc.c
> index 530e461c42..edb3ba824f 100644
> --- a/hw/arm/msf2-soc.c
> +++ b/hw/arm/msf2-soc.c
> @@ -23,13 +23,13 @@
> */
>
> #include "qemu/osdep.h"
> +#include "qemu/units.h"
> #include "qapi/error.h"
> #include "qemu-common.h"
> #include "hw/arm/arm.h"
> #include "exec/address-spaces.h"
> #include "hw/char/serial.h"
> #include "hw/boards.h"
> -#include "qemu/cutils.h"
> #include "hw/arm/msf2-soc.h"
> #include "hw/misc/unimp.h"
>
> diff --git a/hw/arm/msf2-som.c b/hw/arm/msf2-som.c
> index ed533bbde1..2432b5e935 100644
> --- a/hw/arm/msf2-som.c
> +++ b/hw/arm/msf2-som.c
> @@ -23,12 +23,12 @@
> */
>
> #include "qemu/osdep.h"
> +#include "qemu/units.h"
> #include "qapi/error.h"
> #include "qemu/error-report.h"
> #include "hw/boards.h"
> #include "hw/arm/arm.h"
> #include "exec/address-spaces.h"
> -#include "qemu/cutils.h"
> #include "hw/arm/msf2-soc.h"
> #include "cpu.h"
>
> diff --git a/hw/core/machine.c b/hw/core/machine.c
> index ccf3a4b9c7..2077328bcc 100644
> --- a/hw/core/machine.c
> +++ b/hw/core/machine.c
> @@ -11,6 +11,7 @@
> */
>
> #include "qemu/osdep.h"
> +#include "qemu/units.h"
> #include "hw/boards.h"
> #include "qapi/error.h"
> #include "qapi/qapi-visit-common.h"
> @@ -19,7 +20,6 @@
> #include "sysemu/sysemu.h"
> #include "sysemu/numa.h"
> #include "qemu/error-report.h"
> -#include "qemu/cutils.h"
> #include "sysemu/qtest.h"
>
> static char *machine_get_accel(Object *obj, Error **errp)
> diff --git a/hw/display/sm501.c b/hw/display/sm501.c
> index 1c6c9445c5..bbb9274886 100644
> --- a/hw/display/sm501.c
> +++ b/hw/display/sm501.c
> @@ -24,7 +24,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "qemu/cutils.h"
> +#include "qemu/units.h"
> #include "qapi/error.h"
> #include "qemu-common.h"
> #include "cpu.h"
> diff --git a/hw/mips/boston.c b/hw/mips/boston.c
> index 512c60c03e..b7bfeccf4c 100644
> --- a/hw/mips/boston.c
> +++ b/hw/mips/boston.c
> @@ -18,6 +18,7 @@
> */
>
> #include "qemu/osdep.h"
> +#include "qemu/units.h"
> #include "qemu-common.h"
>
> #include "exec/address-spaces.h"
> @@ -32,7 +33,6 @@
> #include "hw/mips/cpudevs.h"
> #include "hw/pci-host/xilinx-pcie.h"
> #include "qapi/error.h"
> -#include "qemu/cutils.h"
> #include "qemu/error-report.h"
> #include "qemu/log.h"
> #include "chardev/char.h"
> diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
> index bdb6f63d2c..0df4a4fd74 100644
> --- a/hw/ppc/pnv.c
> +++ b/hw/ppc/pnv.c
> @@ -18,6 +18,7 @@
> */
>
> #include "qemu/osdep.h"
> +#include "qemu/units.h"
> #include "qapi/error.h"
> #include "sysemu/sysemu.h"
> #include "sysemu/numa.h"
> @@ -31,7 +32,6 @@
> #include "hw/ppc/pnv_core.h"
> #include "hw/loader.h"
> #include "exec/address-spaces.h"
> -#include "qemu/cutils.h"
> #include "qapi/visitor.h"
> #include "monitor/monitor.h"
> #include "hw/intc/intc.h"
> diff --git a/hw/ppc/ppc440_uc.c b/hw/ppc/ppc440_uc.c
> index b5b31b4b9b..1ab2235f20 100644
> --- a/hw/ppc/ppc440_uc.c
> +++ b/hw/ppc/ppc440_uc.c
> @@ -9,8 +9,8 @@
> */
>
> #include "qemu/osdep.h"
> +#include "qemu/units.h"
> #include "qemu-common.h"
> -#include "qemu/cutils.h"
> #include "qemu/error-report.h"
> #include "qapi/error.h"
> #include "cpu.h"
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
