* [Qemu-devel] [PATCH] hw/ppc: Don't include m48t59.h if it is not necessary
@ 2019-01-30 16:39 Thomas Huth
2019-01-30 17:21 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 4+ messages in thread
From: Thomas Huth @ 2019-01-30 16:39 UTC (permalink / raw)
To: qemu-ppc, David Gibson; +Cc: qemu-devel, qemu-trivial
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] hw/ppc: Don't include m48t59.h if it is not necessary
2019-01-30 16:39 [Qemu-devel] [PATCH] hw/ppc: Don't include m48t59.h if it is not necessary Thomas Huth
@ 2019-01-30 17:21 ` Philippe Mathieu-Daudé
2019-01-31 14:12 ` [Qemu-devel] [Qemu-ppc] " Thomas Huth
0 siblings, 1 reply; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-01-30 17:21 UTC (permalink / raw)
To: Thomas Huth, qemu-ppc, David Gibson; +Cc: qemu-trivial, qemu-devel
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"
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [Qemu-ppc] [PATCH] hw/ppc: Don't include m48t59.h if it is not necessary
2019-01-30 17:21 ` Philippe Mathieu-Daudé
@ 2019-01-31 14:12 ` Thomas Huth
2019-02-01 1:04 ` David Gibson
0 siblings, 1 reply; 4+ messages in thread
From: Thomas Huth @ 2019-01-31 14:12 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-ppc, David Gibson
Cc: qemu-trivial, qemu-devel
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [Qemu-ppc] [PATCH] hw/ppc: Don't include m48t59.h if it is not necessary
2019-01-31 14:12 ` [Qemu-devel] [Qemu-ppc] " Thomas Huth
@ 2019-02-01 1:04 ` David Gibson
0 siblings, 0 replies; 4+ messages in thread
From: David Gibson @ 2019-02-01 1:04 UTC (permalink / raw)
To: Thomas Huth
Cc: Philippe Mathieu-Daudé, qemu-ppc, qemu-trivial, qemu-devel
[-- Attachment #1: Type: text/plain, Size: 2198 bytes --]
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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-02-01 3:22 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-30 16:39 [Qemu-devel] [PATCH] hw/ppc: Don't include m48t59.h if it is not necessary Thomas Huth
2019-01-30 17:21 ` Philippe Mathieu-Daudé
2019-01-31 14:12 ` [Qemu-devel] [Qemu-ppc] " Thomas Huth
2019-02-01 1:04 ` David Gibson
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).