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

Thomas Huth posted 1 patch 5 years, 1 month ago
Test asan passed
Test docker-mingw@fedora passed
Test docker-clang@ubuntu passed
Test checkpatch passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/1548866382-14488-1-git-send-email-thuth@redhat.com
Maintainers: David Gibson <david@gibson.dropbear.id.au>
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(-)
[Qemu-devel] [PATCH] hw/ppc: Don't include m48t59.h if it is not necessary
Posted by Thomas Huth 5 years, 1 month ago
These files don't use anything from m48t59.h, so no need to include
this header here.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 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"
 #include "sysemu/kvm.h"
 #include "kvm_ppc.h"
 #include "trace.h"
diff --git a/hw/ppc/ppc_booke.c b/hw/ppc/ppc_booke.c
index 23bcf1b..4f11e00 100644
--- a/hw/ppc/ppc_booke.c
+++ b/hw/ppc/ppc_booke.c
@@ -28,7 +28,6 @@
 #include "hw/ppc/ppc.h"
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"
-#include "hw/timer/m48t59.h"
 #include "qemu/log.h"
 #include "hw/loader.h"
 #include "kvm_ppc.h"
-- 
1.8.3.1


Re: [Qemu-devel] [PATCH] hw/ppc: Don't include m48t59.h if it is not necessary
Posted by Philippe Mathieu-Daudé 5 years, 1 month ago
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 <thuth@redhat.com>
> ---
>  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.

For m48t59.h:
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

>  #include "sysemu/kvm.h"
>  #include "kvm_ppc.h"
>  #include "trace.h"
> diff --git a/hw/ppc/ppc_booke.c b/hw/ppc/ppc_booke.c
> index 23bcf1b..4f11e00 100644
> --- a/hw/ppc/ppc_booke.c
> +++ b/hw/ppc/ppc_booke.c
> @@ -28,7 +28,6 @@
>  #include "hw/ppc/ppc.h"
>  #include "qemu/timer.h"
>  #include "sysemu/sysemu.h"
> -#include "hw/timer/m48t59.h"
>  #include "qemu/log.h"
>  #include "hw/loader.h"
>  #include "kvm_ppc.h"
> 

Re: [Qemu-devel] [Qemu-ppc] [PATCH] hw/ppc: Don't include m48t59.h if it is not necessary
Posted by Thomas Huth 5 years, 1 month ago
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 <thuth@redhat.com>
>> ---
>>  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.

 Thomas

Re: [Qemu-devel] [Qemu-ppc] [PATCH] hw/ppc: Don't include m48t59.h if it is not necessary
Posted by David Gibson 5 years, 1 month ago
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 <thuth@redhat.com>
> >> ---
> >>  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