Skip to contentSkip to conversation

hw/ppc: Don't include m48t59.h if it is not necessary

PATCH In review Thomas Huth 3 participants 4 messages Jan 30, 2019 – Feb 1, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hw/ppc: Don't include m48t59.h if it is not necessary

These files don't use anything from m48t59.h, so no need to include this header here.

---
 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(-)
hw/ppc/mac_newworld.c +0 -1
index bb19eab..f1c8400 100644
@@ -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"
hw/ppc/mac_oldworld.c +0 -1
index 817f70e..98d531d 100644
@@ -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"
hw/ppc/ppc.c +0 -2
index 98b409f..cffdc39 100644
@@ -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"
hw/ppc/ppc_booke.c +0 -1
index 23bcf1b..4f11e00 100644
@@ -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"
Signature · 1 line
1.8.3.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 40 lines · Thomas Huth

These files don't use anything from m48t59.h, so no need to include this header here.

---
 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(-)
hw/ppc/mac_newworld.c +0 -1
index bb19eab..f1c8400 100644
@@ -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"
hw/ppc/mac_oldworld.c +0 -1
index 817f70e..98d531d 100644
@@ -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"
hw/ppc/ppc.c +0 -0
index 98b409f..cffdc39 100644

hw/ppc/ppc.c line 36

Quoted 7 lines
hw/ppc/ppc.c +0 -2
@@ -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:

Quoted 16 lines
hw/ppc/ppc.c +0 -0
 #include "sysemu/kvm.h"
 #include "kvm_ppc.h"
 #include "trace.h"
hw/ppc/ppc_booke.c +0 -1
index 23bcf1b..4f11e00 100644
@@ -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"
#2 lore raw
Quoted 42 lines · Philippe Mathieu-Daudé
Quoted 41 lines · Thomas Huth

These files don't use anything from m48t59.h, so no need to include this header here.

---
 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(-)
hw/ppc/mac_newworld.c +0 -1
index bb19eab..f1c8400 100644
@@ -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"
hw/ppc/mac_oldworld.c +0 -1
index 817f70e..98d531d 100644
@@ -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"
hw/ppc/ppc.c +0 -0
index 98b409f..cffdc39 100644
@@ -30,10 +30,8 @@
 #include "qemu/timer.h"
Quoted 8 lines

hw/ppc/ppc.c line 36

Quoted 6 lines
hw/ppc/ppc.c +0 -2
 #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

#3 lore raw
Quoted 52 lines · Thomas Huth
Quoted 42 lines · Philippe Mathieu-Daudé
Quoted 41 lines · Thomas Huth

These files don't use anything from m48t59.h, so no need to include this header here.

---
 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(-)
hw/ppc/mac_newworld.c +0 -1
index bb19eab..f1c8400 100644
@@ -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"
hw/ppc/mac_oldworld.c +0 -1
index 817f70e..98d531d 100644
@@ -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"
hw/ppc/ppc.c +0 -0
index 98b409f..cffdc39 100644
@@ -30,10 +30,8 @@
 #include "qemu/timer.h"
Quoted 8 lines

hw/ppc/ppc.c line 36

Quoted 6 lines
hw/ppc/ppc.c +0 -2
 #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.

Quoted 2 lines

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.

Quoted 3 lines

Thomas

Signature · 4 lines
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