Peter Maydell <peter.mayd...@linaro.org> writes: > This patchset runs clean-includes on all the .c files in > tests/, except those in tests/tcg, which I think are all > intended as standalone test programs for the guest. > > The first patch handles i440fx-test.c manually since otherwise > compilation would fail due to the redefinition of ARRAY_SIZE. > The second patch is automated; I can split it up if people > prefer but it seems just about small enough to leave as one patch. > > With these patches applied Eric's "qapi: Clean up includes in > generated files" patch no longer breaks 'make check'.
I applied this series, merged my qapi-next, topped off with Eric's patch, and got a working build. I'll send a pull request for qapi-next without Eric's patch, to avoid dependencies. If Eric's patch is not merged, but this series is, I'll include it in the next QAPI pull request. Feel free to apply it directly along with this series.