Markus Armbruster <arm...@redhat.com> writes: > Eduardo Habkost <ehabk...@redhat.com> writes: > >> On Fri, Jul 26, 2019 at 02:05:36PM +0200, Markus Armbruster wrote: >>> hw/boards.h pulls in almost 60 headers. The less we include it into >>> headers, the better. As a first step, drop superfluous inclusions, >>> and downgrade some more to what's actually needed. Gets rid of just >>> one inclusion into a header. >>> >>> Cc: Eduardo Habkost <ehabk...@redhat.com> >>> Cc: Marcel Apfelbaum <marcel.apfelb...@gmail.com> >>> Signed-off-by: Markus Armbruster <arm...@redhat.com> >>> --- >> >> The following files use the MACHINE macro and require >> hw/boards.h, but are touched by this patch: >> >> hw/acpi/cpu.c: MachineState *machine = MACHINE(qdev_get_machine()); >> hw/acpi/memory_hotplug.c: MachineState *machine = >> MACHINE(qdev_get_machine()); >> hw/i386/intel_iommu.c: MachineState *ms = MACHINE(qdev_get_machine()); >> hw/i386/x86-iommu.c: MachineState *ms = MACHINE(qdev_get_machine()); >> hw/ppc/spapr_rtas.c: MachineState *ms = MACHINE(qdev_get_machine()); >> hw/s390x/s390-stattrib-kvm.c: MachineState *machine = >> MACHINE(qdev_get_machine()); >> hw/s390x/s390-stattrib-kvm.c: MachineState *machine = >> MACHINE(qdev_get_machine()); > > Since they still compile, they obviously still get it indirectly. I'll > drop these hunks. > >> Maybe there are other files touched by this patch that require >> struct MachineClass or struct MachineState contents to be >> defined, but this is a bit trickier to verify. > > I tried to exclude those, but I might have screwed it up, just like I > screwed up for MACHINE(). I'll double-check.
None contain matches for /\bMachine(Class|State) *[^ *]/.
