Eric Blake <ebl...@redhat.com> writes:
> On 12/4/18 11:25 AM, Markus Armbruster wrote:
>> Clean up includes so that osdep.h is included first and headers
>> which it implies are not included manually.
>>
>> This commit was created with scripts/clean-includes, with the changes
>> to the following files manually reverted:
>>
>> contrib/libvhost-user/libvhost-user-glib.h
>> contrib/libvhost-user/libvhost-user.c
>> contrib/libvhost-user/libvhost-user.h
>
> The script should probably auto-exclude contrib/ if none of those
> files make it into our final binary, and especially if they are meant
> to be compiled as stand-alone examples.
>> linux-user/mips64/cpu_loop.c
>> linux-user/mips64/signal.c
>> linux-user/sparc64/cpu_loop.c
>> linux-user/sparc64/signal.c
>> linux-user/x86_64/cpu_loop.c
>> linux-user/x86_64/signal.c
>> target/s390x/gen-features.c
>> tests/migration/s390x/a-b-bios.c
>> tests/test-rcu-simpleq.c
>> tests/test-rcu-tailq.c
>
> Should any of these files be renamed *.c.inc to match their usage?
> (Presuming that you excluded them because they are pulled in via
> another .c file?)
The linux-user/T64/N.c contain nothing but
#include "../T/N.c"
plus sometimes a #define T_TARGET_SINGAL_H thrown in to suppress
inclusion of a header.
Perhaps moving the actual meat into a common .inc.c would be cleaner.
Similarly, tests/test-rcu-simpleq.c contains nothing but
#define TEST_LIST_TYPE 2
#include "test-rcu-list.c"
and tests/test-rcu-tailq.c is the same with 3 instead of 2.
Again, we could move the actual meat into a common .inc.c. But I'd
first investigate compiling the test three times with the appropriate
-DTEST_LIST_TYPE, using GNU Make's target-specific variable values.
target/s390x/gen-features.c is a standalone program that is compiled in
a way that breaks when we include osdep.h. If that's fixable, fixing it
would be nice. Aside: not sure I'd have written this in C.
tests/migration/s390x/ is a s390x guest firmware program for
migration-test.c. It's compiled as a freestanding application. I guess
osdep.h just gets in the way there.
All of the above is well beyond the scope of this simple cleanup patch.
>>
>> Signed-off-by: Markus Armbruster <arm...@redhat.com>
>> ---
>> contrib/elf2dmp/pdb.h | 2 --
>> contrib/elf2dmp/pe.h | 1 -
>> contrib/elf2dmp/qemu_elf.h | 1 -
>> contrib/vhost-user-blk/vhost-user-blk.c | 1 -
>> contrib/vhost-user-scsi/vhost-user-scsi.c | 1 -
>
> Hmm - my earlier question about auto-excluding contrib/ gets
> trickier. What's the rationale for including some files in here?
These are standalone programs that already include osdep.h. My patch
simply drops superfluous include directives.
>> hw/rdma/rdma_utils.c | 1 +
>> hw/rdma/rdma_utils.h | 1 -
>> hw/rdma/vmw/pvrdma_dev_ring.h | 1 -
>> hw/vfio/ap.c | 2 +-
>> include/qemu/vfio-helpers.h | 1 -
>> include/sysemu/whpx.h | 1 -
>> target/i386/sev.c | 3 ++-
>> target/i386/whp-dispatch.h | 1 -
>> target/riscv/fpu_helper.c | 1 -
>> tests/fp/platform.h | 1 -
>> tests/tpm-util.h | 1 -
>> tests/vhost-user-bridge.c | 2 +-
>> util/qemu-thread-common.h | 1 -
>> 18 files changed, 5 insertions(+), 18 deletions(-)
>
> The remainder of these files look reasonable.
Thanks!
