On Mon, Dec 14, 2020 at 03:25:41PM +0100, Igor Mammedov wrote: > On Fri, 11 Dec 2020 17:05:12 -0500 > Eduardo Habkost <ehabk...@redhat.com> wrote: > > > Move the property types and property macros implemented in > > qdev-properties-system.c to a new qdev-properties-system.h > > header. > > > > Signed-off-by: Eduardo Habkost <ehabk...@redhat.com> > > --- > > Changes v1 -> v2: > > * Move UUID property type too, as it was moved to > > qdev-properties-system.c in the previous patch > > --- [...] > > diff --git a/audio/audio.h b/audio/audio.h > > index b883ebfb1f..21fe3226ae 100644 > > --- a/audio/audio.h > > +++ b/audio/audio.h > > @@ -28,6 +28,7 @@ > > #include "qemu/queue.h" > > #include "qapi/qapi-types-audio.h" > > #include "hw/qdev-properties.h" > it's already included into new header > so maybe s/old/new/ here and in other such places?
There's no guarantee that qdev-system-properties.h will always depend on qdev-properties.h. If a file depends on definitions from qdev-properties.h, it should include qdev-properties.h explicitly. > > > +#include "hw/qdev-properties-system.h" > > > > typedef void (*audio_callback_fn) (void *opaque, int avail); > > > > diff --git a/include/hw/block/block.h b/include/hw/block/block.h > > index 1e8b6253dd..c172cbe65f 100644 > > --- a/include/hw/block/block.h > > +++ b/include/hw/block/block.h > > @@ -13,6 +13,7 @@ > > > > #include "exec/hwaddr.h" > > #include "qapi/qapi-types-block-core.h" > > +#include "hw/qdev-properties-system.h" > > what for it is included here? hw/block/block.h has references to DEFINE_PROP_BLOCKSIZE, DEFINE_PROP_DRIVE, and others. > [...] -- Eduardo
