The main src/ directory is getting pretty crowded - it has 133 files in the directory. This patch series breaks up the main src/ directory into three directories src/, src/hw/, and src/fw/. The idea is to put "hardware" files (eg, disk drivers, keyboard drivers, etc.) into the hw/ sub-directory and "firmware" files (mainly qemu initialization code) into the fw/ sub-directory.
After this series, there remain 52 files in the src/ directory, 49 files in the src/hw/ directory, and 34 files in the src/fw/ directory.
There are other ways to split up the code files in the repository, but splitting up by hardware, firmware, and everything else does do a good job of segmenting the files into reasonable buckets.
Thoughts? -Kevin
Kevin O'Connor (4): build: Don't use vpath makefile directive. Move code centered around specific hardware devices to src/hw/ Move code cenetered around firmware initialization to src/fw/ build: Reorder makefile source list to group like files together.
Makefile | 59 ++++++++++++++++++---------------- src/apm.c | 4 +-- src/block.c | 10 +++--- src/boot.c | 10 +++--- src/bootsplash.c | 2 +- src/cdrom.c | 4 +-- src/clock.c | 8 ++--- src/disk.c | 6 ++-- src/{ => fw}/LegacyBios.h | 0 src/{ => fw}/acpi-dsdt-cpu-hotplug.dsl | 0 src/{ => fw}/acpi-dsdt-dbug.dsl | 0 src/{ => fw}/acpi-dsdt-hpet.dsl | 0 src/{ => fw}/acpi-dsdt-isa.dsl | 0 src/{ => fw}/acpi-dsdt-pci-crs.dsl | 0 src/{ => fw}/acpi-dsdt.dsl | 0 src/{ => fw}/acpi.c | 14 ++++---- src/{ => fw}/acpi.h | 0 src/{ => fw}/biostables.c | 2 +- src/{ => fw}/coreboot.c | 2 +- src/{ => fw}/csm.c | 4 +-- src/{ => fw}/csm.h | 2 +- src/{ => fw}/dev-q35.h | 0 src/{ => fw}/lzmadecode.c | 0 src/{ => fw}/lzmadecode.h | 0 src/{ => fw}/mptable.c | 4 +-- src/{ => fw}/mptable.h | 0 src/{ => fw}/mtrr.c | 2 +- src/{ => fw}/paravirt.c | 4 +-- src/{ => fw}/paravirt.h | 0 src/{ => fw}/pciinit.c | 6 ++-- src/{ => fw}/pirtable.c | 2 +- src/{ => fw}/q35-acpi-dsdt.dsl | 0 src/{ => fw}/shadow.c | 6 ++-- src/{ => fw}/smbios.c | 0 src/{ => fw}/smbios.h | 0 src/{ => fw}/smm.c | 6 ++-- src/{ => fw}/smp.c | 2 +- src/{ => fw}/ssdt-misc.dsl | 0 src/{ => fw}/ssdt-pcihp.dsl | 0 src/{ => fw}/ssdt-proc.dsl | 0 src/{ => fw}/xen.c | 0 src/{ => fw}/xen.h | 0 src/{ => hw}/ahci.c | 0 src/{ => hw}/ahci.h | 0 src/{ => hw}/ata.c | 0 src/{ => hw}/ata.h | 0 src/{ => hw}/blockcmd.c | 0 src/{ => hw}/blockcmd.h | 0 src/{ => hw}/cmos.h | 0 src/{ => hw}/esp-scsi.c | 2 +- src/{ => hw}/esp-scsi.h | 0 src/{ => hw}/floppy.c | 0 src/{ => hw}/lsi-scsi.c | 2 +- src/{ => hw}/lsi-scsi.h | 0 src/{ => hw}/megasas.c | 0 src/{ => hw}/megasas.h | 0 src/{ => hw}/pci.c | 0 src/{ => hw}/pci.h | 0 src/{ => hw}/pci_ids.h | 0 src/{ => hw}/pci_regs.h | 0 src/{ => hw}/pic.c | 0 src/{ => hw}/pic.h | 0 src/{ => hw}/pit.h | 0 src/{ => hw}/ps2port.c | 0 src/{ => hw}/ps2port.h | 0 src/{ => hw}/ramdisk.c | 0 src/{ => hw}/timer.c | 0 src/{ => hw}/usb-ehci.c | 0 src/{ => hw}/usb-ehci.h | 0 src/{ => hw}/usb-hid.c | 0 src/{ => hw}/usb-hid.h | 0 src/{ => hw}/usb-hub.c | 0 src/{ => hw}/usb-hub.h | 0 src/{ => hw}/usb-msc.c | 0 src/{ => hw}/usb-msc.h | 0 src/{ => hw}/usb-ohci.c | 0 src/{ => hw}/usb-ohci.h | 0 src/{ => hw}/usb-uas.c | 0 src/{ => hw}/usb-uas.h | 0 src/{ => hw}/usb-uhci.c | 0 src/{ => hw}/usb-uhci.h | 0 src/{ => hw}/usb.c | 0 src/{ => hw}/usb.h | 0 src/{ => hw}/virtio-blk.c | 0 src/{ => hw}/virtio-blk.h | 0 src/{ => hw}/virtio-pci.c | 0 src/{ => hw}/virtio-pci.h | 0 src/{ => hw}/virtio-ring.c | 0 src/{ => hw}/virtio-ring.h | 0 src/{ => hw}/virtio-scsi.c | 0 src/{ => hw}/virtio-scsi.h | 0 src/kbd.c | 4 +-- src/misc.c | 2 +- src/mouse.c | 4 +-- src/optionroms.c | 6 ++-- src/output.c | 2 +- src/pcibios.c | 4 +-- src/post.c | 26 +++++++-------- src/resume.c | 10 +++--- src/romlayout.S | 2 +- src/system.c | 2 +- src/util.h | 16 ++++----- src/vgahooks.c | 6 ++-- vgasrc/bochsvga.c | 4 +-- vgasrc/clext.c | 4 +-- vgasrc/geodevga.c | 4 +-- vgasrc/vgabios.c | 4 +-- 107 files changed, 133 insertions(+), 130 deletions(-) rename src/{ => fw}/LegacyBios.h (100%) rename src/{ => fw}/acpi-dsdt-cpu-hotplug.dsl (100%) rename src/{ => fw}/acpi-dsdt-dbug.dsl (100%) rename src/{ => fw}/acpi-dsdt-hpet.dsl (100%) rename src/{ => fw}/acpi-dsdt-isa.dsl (100%) rename src/{ => fw}/acpi-dsdt-pci-crs.dsl (100%) rename src/{ => fw}/acpi-dsdt.dsl (100%) rename src/{ => fw}/acpi.c (98%) rename src/{ => fw}/acpi.h (100%) rename src/{ => fw}/biostables.c (98%) rename src/{ => fw}/coreboot.c (99%) rename src/{ => fw}/csm.c (99%) rename src/{ => fw}/csm.h (94%) rename src/{ => fw}/dev-q35.h (100%) rename src/{ => fw}/lzmadecode.c (100%) rename src/{ => fw}/lzmadecode.h (100%) rename src/{ => fw}/mptable.c (99%) rename src/{ => fw}/mptable.h (100%) rename src/{ => fw}/mtrr.c (98%) rename src/{ => fw}/paravirt.c (99%) rename src/{ => fw}/paravirt.h (100%) rename src/{ => fw}/pciinit.c (99%) rename src/{ => fw}/pirtable.c (98%) rename src/{ => fw}/q35-acpi-dsdt.dsl (100%) rename src/{ => fw}/shadow.c (97%) rename src/{ => fw}/smbios.c (100%) rename src/{ => fw}/smbios.h (100%) rename src/{ => fw}/smm.c (97%) rename src/{ => fw}/smp.c (98%) rename src/{ => fw}/ssdt-misc.dsl (100%) rename src/{ => fw}/ssdt-pcihp.dsl (100%) rename src/{ => fw}/ssdt-proc.dsl (100%) rename src/{ => fw}/xen.c (100%) rename src/{ => fw}/xen.h (100%) rename src/{ => hw}/ahci.c (100%) rename src/{ => hw}/ahci.h (100%) rename src/{ => hw}/ata.c (100%) rename src/{ => hw}/ata.h (100%) rename src/{ => hw}/blockcmd.c (100%) rename src/{ => hw}/blockcmd.h (100%) rename src/{ => hw}/cmos.h (100%) rename src/{ => hw}/esp-scsi.c (99%) rename src/{ => hw}/esp-scsi.h (100%) rename src/{ => hw}/floppy.c (100%) rename src/{ => hw}/lsi-scsi.c (99%) rename src/{ => hw}/lsi-scsi.h (100%) rename src/{ => hw}/megasas.c (100%) rename src/{ => hw}/megasas.h (100%) rename src/{ => hw}/pci.c (100%) rename src/{ => hw}/pci.h (100%) rename src/{ => hw}/pci_ids.h (100%) rename src/{ => hw}/pci_regs.h (100%) rename src/{ => hw}/pic.c (100%) rename src/{ => hw}/pic.h (100%) rename src/{ => hw}/pit.h (100%) rename src/{ => hw}/ps2port.c (100%) rename src/{ => hw}/ps2port.h (100%) rename src/{ => hw}/ramdisk.c (100%) rename src/{ => hw}/timer.c (100%) rename src/{ => hw}/usb-ehci.c (100%) rename src/{ => hw}/usb-ehci.h (100%) rename src/{ => hw}/usb-hid.c (100%) rename src/{ => hw}/usb-hid.h (100%) rename src/{ => hw}/usb-hub.c (100%) rename src/{ => hw}/usb-hub.h (100%) rename src/{ => hw}/usb-msc.c (100%) rename src/{ => hw}/usb-msc.h (100%) rename src/{ => hw}/usb-ohci.c (100%) rename src/{ => hw}/usb-ohci.h (100%) rename src/{ => hw}/usb-uas.c (100%) rename src/{ => hw}/usb-uas.h (100%) rename src/{ => hw}/usb-uhci.c (100%) rename src/{ => hw}/usb-uhci.h (100%) rename src/{ => hw}/usb.c (100%) rename src/{ => hw}/usb.h (100%) rename src/{ => hw}/virtio-blk.c (100%) rename src/{ => hw}/virtio-blk.h (100%) rename src/{ => hw}/virtio-pci.c (100%) rename src/{ => hw}/virtio-pci.h (100%) rename src/{ => hw}/virtio-ring.c (100%) rename src/{ => hw}/virtio-ring.h (100%) rename src/{ => hw}/virtio-scsi.c (100%) rename src/{ => hw}/virtio-scsi.h (100%)