Re: [Qemu-devel] [Qemu-ppc] [PATCH] hw/ppc: Don't include m48t59.h if it is not necessary

[David Gibson]

On Thu, Jan 31, 2019 at 03:12:48PM +0100, Thomas Huth wrote:
> On 2019-01-30 18:21, Philippe Mathieu-Daudé wrote:
> > On 1/30/19 5:39 PM, Thomas Huth wrote:
> >> These files don't use anything from m48t59.h, so no need to include
> >> this header here.
> >>
> >> Signed-off-by: Thomas Huth <address@hidden>
> >> ---
> >>  hw/ppc/mac_newworld.c | 1 -
> >>  hw/ppc/mac_oldworld.c | 1 -
> >>  hw/ppc/ppc.c          | 2 --
> >>  hw/ppc/ppc_booke.c    | 1 -
> >>  4 files changed, 5 deletions(-)
> >>
> >> diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
> >> index bb19eab..f1c8400 100644
> >> --- a/hw/ppc/mac_newworld.c
> >> +++ b/hw/ppc/mac_newworld.c
> >> @@ -53,7 +53,6 @@
> >>  #include "hw/ppc/mac.h"
> >>  #include "hw/input/adb.h"
> >>  #include "hw/ppc/mac_dbdma.h"
> >> -#include "hw/timer/m48t59.h"
> >>  #include "hw/pci/pci.h"
> >>  #include "net/net.h"
> >>  #include "sysemu/sysemu.h"
> >> diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
> >> index 817f70e..98d531d 100644
> >> --- a/hw/ppc/mac_oldworld.c
> >> +++ b/hw/ppc/mac_oldworld.c
> >> @@ -30,7 +30,6 @@
> >>  #include "hw/ppc/ppc.h"
> >>  #include "mac.h"
> >>  #include "hw/input/adb.h"
> >> -#include "hw/timer/m48t59.h"
> >>  #include "sysemu/sysemu.h"
> >>  #include "net/net.h"
> >>  #include "hw/isa/isa.h"
> >> diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c
> >> index 98b409f..cffdc39 100644
> >> --- a/hw/ppc/ppc.c
> >> +++ b/hw/ppc/ppc.c
> >> @@ -30,10 +30,8 @@
> >>  #include "qemu/timer.h"
> >>  #include "sysemu/sysemu.h"
> >>  #include "sysemu/cpus.h"
> >> -#include "hw/timer/m48t59.h"
> >>  #include "qemu/log.h"
> >>  #include "qemu/error-report.h"
> >> -#include "hw/loader.h"
> > 
> > I supposed the "hw/loader.h" change slipped in by mistake.
> 
> I should have mentioned it in the patch description, I guess. ppc.c also
> compiles without this line, so it can be removed, too.

Fair enough, applied to ppc-for-4.0.

> 
>  Thomas
> 

-- 
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