Skip to contentSkip to conversation

input/adb: Only include where needed

PATCH In review BALATON Zoltan 3 participants 4 messages Jul 5, 2021 – Feb 5, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 input/adb: Only include where needed

The header hw/input/adb.h is included by some files that don't need it. Clean it up and include only where necessary.

---
 hw/misc/macio/cuda.c         | 2 --
 hw/misc/macio/pmu.c          | 3 ---
 hw/misc/mos6522.c            | 1 -
 hw/ppc/mac.h                 | 2 --
 include/hw/misc/mac_via.h    | 1 +
 include/hw/misc/macio/cuda.h | 1 +
 include/hw/misc/macio/pmu.h  | 1 +
 include/hw/misc/mos6522.h    | 3 +--
 8 files changed, 4 insertions(+), 10 deletions(-)
hw/misc/macio/cuda.c +0 -2
index edbd4186b2..584d81dc22 100644
@@ -28,8 +28,6 @@
 #include "hw/ppc/mac.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
-#include "hw/input/adb.h"
-#include "hw/misc/mos6522.h"
 #include "hw/misc/macio/cuda.h"
 #include "qapi/error.h"
 #include "qemu/timer.h"
hw/misc/macio/pmu.c +0 -3
index 71924d4768..eb746aee34 100644
@@ -33,10 +33,7 @@
 #include "hw/ppc/mac.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
-#include "hw/input/adb.h"
 #include "hw/irq.h"
-#include "hw/misc/mos6522.h"
-#include "hw/misc/macio/gpio.h"
 #include "hw/misc/macio/pmu.h"
 #include "qapi/error.h"
 #include "qemu/timer.h"
hw/misc/mos6522.c +0 -1
index 1c57332b40..359bd64dea 100644
@@ -25,7 +25,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/input/adb.h"
 #include "hw/irq.h"
 #include "hw/misc/mos6522.h"
 #include "hw/qdev-properties.h"
hw/ppc/mac.h +0 -2
index 22c8408078..3fad371701 100644
@@ -30,8 +30,6 @@
 #include "exec/memory.h"
 #include "hw/boards.h"
 #include "hw/sysbus.h"
-#include "hw/input/adb.h"
-#include "hw/misc/mos6522.h"
 #include "hw/pci/pci_host.h"
 #include "hw/pci-host/uninorth.h"
 #include "qom/object.h"
include/hw/misc/mac_via.h +1 -0
index 3058b30685..ada338eff1 100644
@@ -12,6 +12,7 @@
 #include "exec/memory.h"
 #include "hw/sysbus.h"
 #include "hw/misc/mos6522.h"
+#include "hw/input/adb.h"
 #include "qom/object.h"
 
 
include/hw/misc/macio/cuda.h +1 -0
index a71deec968..8a6678c749 100644
@@ -26,6 +26,7 @@
 #ifndef CUDA_H
 #define CUDA_H
 
+#include "hw/input/adb.h"
 #include "hw/misc/mos6522.h"
 #include "qom/object.h"
 
include/hw/misc/macio/pmu.h +1 -0
index 78237d99a2..306e59ba6e 100644
@@ -10,6 +10,7 @@
 #ifndef PMU_H
 #define PMU_H
 
+#include "hw/input/adb.h"
 #include "hw/misc/mos6522.h"
 #include "hw/misc/macio/gpio.h"
 #include "qom/object.h"
include/hw/misc/mos6522.h +1 -2
index fc95d22b0f..862b3f5642 100644
@@ -27,9 +27,8 @@
 #ifndef MOS6522_H
 #define MOS6522_H
 
-#include "exec/memory.h"
+#include "exec/hwaddr.h"
 #include "hw/sysbus.h"
-#include "hw/input/adb.h"
 #include "qom/object.h"
 
 /* Bits in ACR */
Signature · 1 line
2.21.4
#1 lore raw
Quoted 2 lines · BALATON Zoltan

The header hw/input/adb.h is included by some files that don't need it. Clean it up and include only where necessary.

When you're touching mos6522, I've also have this patch that cleans up includes that's somewhat related to mos6522 so you could consider it to be included in your series. I haven't checked but it should still apply. At least I got no problem with rebasing so at least with --3way should probably work but if not I can resend just let me know.

Regards,
BALATON Zoltan

Quoted 117 lines

---

hw/misc/macio/cuda.c         | 2 --
hw/misc/macio/pmu.c          | 3 ---
hw/misc/mos6522.c            | 1 -
hw/ppc/mac.h                 | 2 --
include/hw/misc/mac_via.h    | 1 +
include/hw/misc/macio/cuda.h | 1 +
include/hw/misc/macio/pmu.h  | 1 +
include/hw/misc/mos6522.h    | 3 +--
8 files changed, 4 insertions(+), 10 deletions(-)
hw/misc/macio/cuda.c +0 -2
index edbd4186b2..584d81dc22 100644
@@ -28,8 +28,6 @@
 #include "hw/ppc/mac.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
-#include "hw/input/adb.h"
-#include "hw/misc/mos6522.h"
 #include "hw/misc/macio/cuda.h"
 #include "qapi/error.h"
 #include "qemu/timer.h"
hw/misc/macio/pmu.c +0 -3
index 71924d4768..eb746aee34 100644
@@ -33,10 +33,7 @@
 #include "hw/ppc/mac.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
-#include "hw/input/adb.h"
 #include "hw/irq.h"
-#include "hw/misc/mos6522.h"
-#include "hw/misc/macio/gpio.h"
 #include "hw/misc/macio/pmu.h"
 #include "qapi/error.h"
 #include "qemu/timer.h"
hw/misc/mos6522.c +0 -1
index 1c57332b40..359bd64dea 100644
@@ -25,7 +25,6 @@
 */
 
 #include "qemu/osdep.h"
-#include "hw/input/adb.h"
 #include "hw/irq.h"
 #include "hw/misc/mos6522.h"
 #include "hw/qdev-properties.h"
hw/ppc/mac.h +0 -2
index 22c8408078..3fad371701 100644
@@ -30,8 +30,6 @@
 #include "exec/memory.h"
 #include "hw/boards.h"
 #include "hw/sysbus.h"
-#include "hw/input/adb.h"
-#include "hw/misc/mos6522.h"
 #include "hw/pci/pci_host.h"
 #include "hw/pci-host/uninorth.h"
 #include "qom/object.h"
include/hw/misc/mac_via.h +1 -0
index 3058b30685..ada338eff1 100644
@@ -12,6 +12,7 @@
 #include "exec/memory.h"
 #include "hw/sysbus.h"
 #include "hw/misc/mos6522.h"
+#include "hw/input/adb.h"
 #include "qom/object.h"
 
 
include/hw/misc/macio/cuda.h +1 -0
index a71deec968..8a6678c749 100644
@@ -26,6 +26,7 @@
 #ifndef CUDA_H
 #define CUDA_H
 
+#include "hw/input/adb.h"
 #include "hw/misc/mos6522.h"
 #include "qom/object.h"
 
include/hw/misc/macio/pmu.h +1 -0
index 78237d99a2..306e59ba6e 100644
@@ -10,6 +10,7 @@
 #ifndef PMU_H
 #define PMU_H
 
+#include "hw/input/adb.h"
 #include "hw/misc/mos6522.h"
 #include "hw/misc/macio/gpio.h"
 #include "qom/object.h"
include/hw/misc/mos6522.h +1 -2
index fc95d22b0f..862b3f5642 100644
@@ -27,9 +27,8 @@
 #ifndef MOS6522_H
 #define MOS6522_H
 
-#include "exec/memory.h"
+#include "exec/hwaddr.h"
 #include "hw/sysbus.h"
-#include "hw/input/adb.h"
 #include "qom/object.h"
 
 /* Bits in ACR */
#2 lore raw
Quoted 5 lines · BALATON Zoltan
Quoted 2 lines · BALATON Zoltan

The header hw/input/adb.h is included by some files that don't need it. Clean it up and include only where necessary.

When you're touching mos6522, I've also have this patch that cleans up includes that's somewhat related to mos6522 so you could consider it to be included in your series. I haven't checked but it should still apply. At least I got no problem with rebasing so at least with --3way should probably work but if not I can resend just let me know.

I have a vague memory that someone was advocating a while back for the opposite of this patch in the way it uses headers i.e. the .c file should contain the include for the header as well as the .h file, so I'm not sure what the recommendation is here.

The parts related to tidying up the mos6522.c and mos6522.h includes look correct though, as they shouldn't be referencing any ADB headers.

ATB,

Mark.

Quoted 117 lines
Quoted 117 lines

---
hw/misc/macio/cuda.c         | 2 --
hw/misc/macio/pmu.c          | 3 ---
hw/misc/mos6522.c            | 1 -
hw/ppc/mac.h                 | 2 --
include/hw/misc/mac_via.h    | 1 +
include/hw/misc/macio/cuda.h | 1 +
include/hw/misc/macio/pmu.h  | 1 +
include/hw/misc/mos6522.h    | 3 +--

8 files changed, 4 insertions(+), 10 deletions(-)
hw/misc/macio/cuda.c +0 -2
index edbd4186b2..584d81dc22 100644
@@ -28,8 +28,6 @@
 #include "hw/ppc/mac.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
-#include "hw/input/adb.h"
-#include "hw/misc/mos6522.h"
 #include "hw/misc/macio/cuda.h"
 #include "qapi/error.h"
 #include "qemu/timer.h"
hw/misc/macio/pmu.c +0 -3
index 71924d4768..eb746aee34 100644
@@ -33,10 +33,7 @@
 #include "hw/ppc/mac.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
-#include "hw/input/adb.h"
 #include "hw/irq.h"
-#include "hw/misc/mos6522.h"
-#include "hw/misc/macio/gpio.h"
 #include "hw/misc/macio/pmu.h"
 #include "qapi/error.h"
 #include "qemu/timer.h"
hw/misc/mos6522.c +0 -1
index 1c57332b40..359bd64dea 100644
@@ -25,7 +25,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/input/adb.h"
 #include "hw/irq.h"
 #include "hw/misc/mos6522.h"
 #include "hw/qdev-properties.h"
hw/ppc/mac.h +0 -2
index 22c8408078..3fad371701 100644
@@ -30,8 +30,6 @@
 #include "exec/memory.h"
 #include "hw/boards.h"
 #include "hw/sysbus.h"
-#include "hw/input/adb.h"
-#include "hw/misc/mos6522.h"
 #include "hw/pci/pci_host.h"
 #include "hw/pci-host/uninorth.h"
 #include "qom/object.h"
include/hw/misc/mac_via.h +1 -0
index 3058b30685..ada338eff1 100644
@@ -12,6 +12,7 @@
 #include "exec/memory.h"
 #include "hw/sysbus.h"
 #include "hw/misc/mos6522.h"
+#include "hw/input/adb.h"
 #include "qom/object.h"
 
 
include/hw/misc/macio/cuda.h +1 -0
index a71deec968..8a6678c749 100644
@@ -26,6 +26,7 @@
 #ifndef CUDA_H
 #define CUDA_H
 
+#include "hw/input/adb.h"
 #include "hw/misc/mos6522.h"
 #include "qom/object.h"
 
include/hw/misc/macio/pmu.h +1 -0
index 78237d99a2..306e59ba6e 100644
@@ -10,6 +10,7 @@
 #ifndef PMU_H
 #define PMU_H
 
+#include "hw/input/adb.h"
 #include "hw/misc/mos6522.h"
 #include "hw/misc/macio/gpio.h"
 #include "qom/object.h"
include/hw/misc/mos6522.h +1 -2
index fc95d22b0f..862b3f5642 100644
@@ -27,9 +27,8 @@
 #ifndef MOS6522_H
 #define MOS6522_H
 
-#include "exec/memory.h"
+#include "exec/hwaddr.h"
 #include "hw/sysbus.h"
-#include "hw/input/adb.h"
 #include "qom/object.h"
 
 /* Bits in ACR */
#3 lore raw
Quoted 9 lines · Mark Cave-Ayland
Quoted 5 lines · BALATON Zoltan
Quoted 2 lines · BALATON Zoltan

The header hw/input/adb.h is included by some files that don't need it. Clean it up and include only where necessary.

When you're touching mos6522, I've also have this patch that cleans up includes that's somewhat related to mos6522 so you could consider it to be included in your series. I haven't checked but it should still apply. At least I got no problem with rebasing so at least with --3way should probably work but if not I can resend just let me know.

I have a vague memory that someone was advocating a while back for the opposite of this patch in the way it uses headers i.e. the .c file should contain the include for the header as well as the .h file, so I'm not sure what the recommendation is here.

Headers should include the minimum headers they require.

hw/misc/macio/cuda.h uses ADBBusState which is declared in "hw/input/adb.h", so it must include this header, otherwise we can consider this a bug.

I haven't checked the rest.

Quoted 30 lines

The parts related to tidying up the mos6522.c and mos6522.h includes look correct though, as they shouldn't be referencing any ADB headers.

ATB,

Mark.

Quoted 23 lines
Quoted 23 lines

---
hw/misc/macio/cuda.c         | 2 --
hw/misc/macio/pmu.c          | 3 ---
hw/misc/mos6522.c            | 1 -
hw/ppc/mac.h                 | 2 --
include/hw/misc/mac_via.h    | 1 +
include/hw/misc/macio/cuda.h | 1 +
include/hw/misc/macio/pmu.h  | 1 +
include/hw/misc/mos6522.h    | 3 +--

8 files changed, 4 insertions(+), 10 deletions(-)
include/hw/misc/macio/cuda.h +1 -0
index a71deec968..8a6678c749 100644
@@ -26,6 +26,7 @@
 #ifndef CUDA_H
 #define CUDA_H
 
+#include "hw/input/adb.h"
 #include "hw/misc/mos6522.h"
 #include "qom/object.h"