| Message ID | 20220111184309.28637-3-f4bug@amsat.org |
|---|---|
| State | New |
| Headers | show |
| Series | hw/dma: Use dma_addr_t type definition when relevant | expand |
On 11.01.22 19:43, Philippe Mathieu-Daudé wrote: > From: Philippe Mathieu-Daudé <philmd@redhat.com> > > fw_cfg QOM interface is required by system emulation and > qemu-storage-daemon. User-mode emulation doesn't need it. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/nvram/meson.build | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/hw/nvram/meson.build b/hw/nvram/meson.build > index 202a5466e63..f5ee9f6b88c 100644 > --- a/hw/nvram/meson.build > +++ b/hw/nvram/meson.build > @@ -1,5 +1,7 @@ > -# QOM interfaces must be available anytime QOM is used. > -qom_ss.add(files('fw_cfg-interface.c')) > +if have_system or have_tools > + # QOM interfaces must be available anytime QOM is used. > + qom_ss.add(files('fw_cfg-interface.c')) > +endif > > softmmu_ss.add(files('fw_cfg.c')) > softmmu_ss.add(when: 'CONFIG_CHRP_NVRAM', if_true: files('chrp_nvram.c')) Reviewed-by: David Hildenbrand <david@redhat.com>
On 1/12/22 05:43, Philippe Mathieu-Daudé wrote: > From: Philippe Mathieu-Daudé <philmd@redhat.com> > > fw_cfg QOM interface is required by system emulation and > qemu-storage-daemon. User-mode emulation doesn't need it. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/nvram/meson.build | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/hw/nvram/meson.build b/hw/nvram/meson.build > index 202a5466e63..f5ee9f6b88c 100644 > --- a/hw/nvram/meson.build > +++ b/hw/nvram/meson.build > @@ -1,5 +1,7 @@ > -# QOM interfaces must be available anytime QOM is used. > -qom_ss.add(files('fw_cfg-interface.c')) > +if have_system or have_tools > + # QOM interfaces must be available anytime QOM is used. > + qom_ss.add(files('fw_cfg-interface.c')) > +endif Is this intended to save the compilation of one file, if and only if this is a completely user-only build? Because if this is a normal "all targets" build, this will still be included in the user-only binaries, afaics (libqom -> qom -> common_ss). r~
diff --git a/hw/nvram/meson.build b/hw/nvram/meson.build index 202a5466e63..f5ee9f6b88c 100644 --- a/hw/nvram/meson.build +++ b/hw/nvram/meson.build @@ -1,5 +1,7 @@ -# QOM interfaces must be available anytime QOM is used. -qom_ss.add(files('fw_cfg-interface.c')) +if have_system or have_tools + # QOM interfaces must be available anytime QOM is used. + qom_ss.add(files('fw_cfg-interface.c')) +endif softmmu_ss.add(files('fw_cfg.c')) softmmu_ss.add(when: 'CONFIG_CHRP_NVRAM', if_true: files('chrp_nvram.c'))