Hi, As his first comment describes itself, the "hw/devices.h" contains declarations for "Devices that have nowhere better to go." This series remove it, creating new headers for devices covered there. MAINTAINERS is updated. I also included 2 cleanups while working on this, in "qemu/typedefs.h" and "hw/net/ne2000-isa.h" header guard.
v3: - rebased - added 2 patches suggested by Markus - addressed Markus review comments - added Markus's R-b v2: https://lists.gnu.org/archive/html/qemu-devel/2019-02/msg00925.html - added R-b, T-b tags - addressed many review comments from Thomas v1: https://lists.gnu.org/archive/html/qemu-devel/2019-01/msg00611.html Phil. $ git backport-diff -u remove_hw_devices-v2 Key: [----] : patches are identical [####] : number of functional differences between upstream/downstream patch [down] : patch is downstream-only The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively 001/12:[----] [-C] 'hw/arm/aspeed: Use TYPE_TMP105/TYPE_PCA9552 instead of hardcoded string' 002/12:[down] 'hw/arm/nseries: Use TYPE_TMP105 instead of hardcoded string' 003/12:[down] 'hw/display/tc6393xb: Remove unused functions' 004/12:[0006] [FC] 'hw/devices: Move TC6393XB declarations into a new header' 005/12:[----] [-C] 'hw/devices: Move Blizzard declarations into a new header' 006/12:[----] [-C] 'hw/devices: Move CBus declarations into a new header' 007/12:[0002] [FC] 'hw/devices: Move Gamepad declarations into a new header' 008/12:[0002] [FC] 'hw/devices: Move TI touchscreen declarations into a new header' 009/12:[----] [--] 'hw/devices: Move LAN9118 declarations into a new header' 010/12:[----] [--] 'hw/net/ne2000-isa: Add guards to the header' 011/12:[----] [--] 'hw/net/lan9118: Export TYPE_LAN9118 and use it instead of hardcoded string' 012/12:[----] [--] 'hw/devices: Move SMSC 91C111 declaration into a new header' Philippe Mathieu-Daudé (12): hw/arm/aspeed: Use TYPE_TMP105/TYPE_PCA9552 instead of hardcoded string hw/arm/nseries: Use TYPE_TMP105 instead of hardcoded string hw/display/tc6393xb: Remove unused functions hw/devices: Move TC6393XB declarations into a new header hw/devices: Move Blizzard declarations into a new header hw/devices: Move CBus declarations into a new header hw/devices: Move Gamepad declarations into a new header hw/devices: Move TI touchscreen declarations into a new header hw/devices: Move LAN9118 declarations into a new header hw/net/ne2000-isa: Add guards to the header hw/net/lan9118: Export TYPE_LAN9118 and use it instead of hardcoded string hw/devices: Move SMSC 91C111 declaration into a new header MAINTAINERS | 7 ++++ hw/arm/aspeed.c | 13 +++++--- hw/arm/exynos4_boards.c | 3 +- hw/arm/gumstix.c | 2 +- hw/arm/integratorcp.c | 2 +- hw/arm/kzm.c | 2 +- hw/arm/mainstone.c | 2 +- hw/arm/mps2-tz.c | 3 +- hw/arm/mps2.c | 2 +- hw/arm/nseries.c | 7 ++-- hw/arm/palm.c | 2 +- hw/arm/realview.c | 3 +- hw/arm/stellaris.c | 2 +- hw/arm/tosa.c | 2 +- hw/arm/versatilepb.c | 2 +- hw/arm/vexpress.c | 2 +- hw/display/blizzard.c | 2 +- hw/display/tc6393xb.c | 18 +--------- hw/input/stellaris_input.c | 2 +- hw/input/tsc2005.c | 2 +- hw/input/tsc210x.c | 4 +-- hw/misc/cbus.c | 2 +- hw/net/lan9118.c | 3 +- hw/net/smc91c111.c | 2 +- include/hw/arm/omap.h | 6 +--- include/hw/devices.h | 62 ----------------------------------- include/hw/display/blizzard.h | 22 +++++++++++++ include/hw/display/tc6393xb.h | 24 ++++++++++++++ include/hw/input/gamepad.h | 19 +++++++++++ include/hw/input/tsc2xxx.h | 36 ++++++++++++++++++++ include/hw/misc/cbus.h | 32 ++++++++++++++++++ include/hw/net/lan9118.h | 21 ++++++++++++ include/hw/net/ne2000-isa.h | 6 ++++ include/hw/net/smc91c111.h | 19 +++++++++++ include/qemu/typedefs.h | 1 - 35 files changed, 226 insertions(+), 113 deletions(-) delete mode 100644 include/hw/devices.h create mode 100644 include/hw/display/blizzard.h create mode 100644 include/hw/display/tc6393xb.h create mode 100644 include/hw/input/gamepad.h create mode 100644 include/hw/input/tsc2xxx.h create mode 100644 include/hw/misc/cbus.h create mode 100644 include/hw/net/lan9118.h create mode 100644 include/hw/net/smc91c111.h -- 2.20.1
