Re: [Qemu-devel] [PATCH v3 09/29] Include migration/qemu-file-types.h a lot less

[Markus Armbruster <armbru@redhat.com>]

Philippe Mathieu-Daudé <philmd@redhat.com> writes:

> On 8/9/19 8:46 AM, Markus Armbruster wrote:
>> In my "build everything" tree, changing migration/qemu-file-types.h
>> triggers a recompile of some 2600 out of 6600 objects (not counting
>> tests and objects that don't depend on qemu/osdep.h).
>> 
>> The culprit is again hw/hw.h, which supposedly includes it for
>> convenience.
>> 
>> Include migration/qemu-file-types.h only where it's needed.  Touching
>> it now recompiles less than 200 objects.
>> 
>> Signed-off-by: Markus Armbruster <armbru@redhat.com>
>> ---
> [...]
>> diff --git a/hw/intc/s390_flic.c b/hw/intc/s390_flic.c
>> index d0be755c82..83c72ee18d 100644
>> --- a/hw/intc/s390_flic.c
>> +++ b/hw/intc/s390_flic.c
>> @@ -22,6 +22,7 @@
>>  #include "hw/qdev.h"
>>  #include "qapi/error.h"
>>  #include "hw/s390x/s390-virtio-ccw.h"
>> +#include "migration/qemu-file-types.h"
>>  
>>  S390FLICStateClass *s390_get_flic_class(S390FLICState *fs)
>>  {
>
> I am not sure this one requires it.
> Did you edit the incorrect file? I still get:
>
> $ make docker-run-test-build@debian-s390x-cross
> [...]
> hw/intc/s390_flic_kvm.c: In function 'kvm_flic_save':
> hw/intc/s390_flic_kvm.c:395:9: error: implicit declaration of function
> 'qemu_put_be64' [-Werror=implicit-function-declaration]
>          qemu_put_be64(f, FLIC_FAILED);
>          ^~~~~~~~~~~~~

You're right.  Will fix.