Re: [Qemu-devel] [PATCH 21/28] Include hw/qdev-properties.h less

[Markus Armbruster <armbru@redhat.com>]

Eduardo Habkost <ehabkost@redhat.com> writes:

> On Fri, Jul 26, 2019 at 02:05:35PM +0200, Markus Armbruster wrote:
>> In my "build everything" tree, changing hw/qdev-properties.h triggers
>> a recompile of some 2700 out of 6600 objects (not counting tests and
>> objects that don't depend on qemu/osdep.h).
>> 
>> Many places including hw/qdev-properties.h (directly or via hw/qdev.h)
>> actually need only hw/qdev-core.h.  Include hw/qdev-core.h there
>> instead.
>> 
>> hw/qdev.h is actually pointless: all it does is include hw/qdev-core.h
>> and hw/qdev-properties.h, which in turn includes hw/qdev-core.h.
>> Replace the remaining uses of hw/qdev.h by hw/qdev-properties.h.
>> 
>> While there, delete a few superfluous inclusions of hw/qdev-core.h.
>> 
>> Touching hw/qdev-properties.h now recompiles some 1200 objects.
>
> Impressive, thanks for doing this.
>
> I only see superfluous whitespace changes at
> hw/sd/sdhci-internal.h and hw/qdev-dma.h, below.

Rebasing leftovers, will drop.

> They are harmless, though, so:
>
> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>

Thanks!

> [...]
>> diff --git a/hw/sd/sdhci-internal.h b/hw/sd/sdhci-internal.h
>> index 34141400f8..1d9053c183 100644
>> --- a/hw/sd/sdhci-internal.h
>> +++ b/hw/sd/sdhci-internal.h
>> @@ -21,6 +21,7 @@
>>   * You should have received a copy of the GNU General Public License along
>>   * with this program; if not, see <http://www.gnu.org/licenses/>.
>>   */
>> +
>>  #ifndef SDHCI_INTERNAL_H
>>  #define SDHCI_INTERNAL_H
>>  
> [...]
>> diff --git a/include/hw/qdev-dma.h b/include/hw/qdev-dma.h
>> index b00391aa0c..002705c57d 100644
>> --- a/include/hw/qdev-dma.h
>> +++ b/include/hw/qdev-dma.h
>> @@ -10,6 +10,7 @@
>>  #ifndef HW_QDEV_DMA_H
>>  #define HW_QDEV_DMA_H
>>  
>> +
>>  #define DEFINE_PROP_DMAADDR(_n, _s, _f, _d)                               \
>>      DEFINE_PROP_UINT64(_n, _s, _f, _d)
>>  
> [...]