Hi On Wed, Aug 26, 2026 at 9:43 PM Philippe Mathieu-Daudé <[email protected]> wrote: > > On 25/8/26 21:09, Marc-André Lureau wrote: > > Exclude all *-hmp-cmds.c files and HMP-only source files from the > > build when HMP is disabled. > > > > Also conditionalise the hmp-commands.hx header generation and the > > test-hmp qtest. > > > > Acked-by: Dr. David Alan Gilbert <[email protected]> > > Signed-off-by: Marc-André Lureau <[email protected]> > > --- > > audio/meson.build | 4 +++- > > backends/meson.build | 5 ++++- > > block/monitor/meson.build | 4 +++- > > chardev/meson.build | 5 ++++- > > disas/meson.build | 4 +++- > > dump/meson.build | 5 ++++- > > hw/core/meson.build | 5 +++-- > > hw/i386/meson.build | 4 +++- > > hw/net/meson.build | 4 +++- > > hw/pci/meson.build | 4 +++- > > hw/virtio/meson.build | 4 +++- > > meson.build | 2 +- > > migration/meson.build | 4 +++- > > monitor/hmp.c | 2 -- > > monitor/meson.build | 9 +++++++-- > > net/meson.build | 4 +++- > > qom/meson.build | 4 +++- > > stats/meson.build | 5 ++++- > > stubs/meson.build | 12 +++++++----- > > system/meson.build | 11 ++++++++--- > > tests/qtest/meson.build | 8 +++++++- > > trace/meson.build | 5 ++++- > > ui/meson.build | 4 +++- > > 23 files changed, 86 insertions(+), 32 deletions(-) > > > > diff --git a/hw/i386/meson.build b/hw/i386/meson.build > > index 39ac8c9edc09..e16930c43197 100644 > > --- a/hw/i386/meson.build > > +++ b/hw/i386/meson.build > > @@ -24,7 +24,9 @@ i386_ss.add(when: 'CONFIG_VTD', if_true: > > files('intel_iommu.c')) > > i386_ss.add(when: 'CONFIG_VTD_ACCEL', if_true: > > files('intel_iommu_accel.c')) > > i386_ss.add(when: 'CONFIG_SGX', if_true: files('sgx-epc.c','sgx.c'), > > if_false: files('sgx-stub.c')) > > -stub_ss.add(files('sgx-hmp-stub.c')) > > +if have_hmp > > + stub_ss.add(files('sgx-hmp-stub.c')) > > This doesn't sound right: this is a stub and we shouldn't bother to > conditionally include it. > > hmp_info_sgx() is defined in sgx.c, which you #ifdef guarded few > patches before in #40 "Guard HMP command implementations with CONFIG_HMP". >
Yes, but it depends on CONFIG_SGX (which is poisoined). There might be HMP stubs that we can get rid of by the end of the series, but this is not one of them. > Otherwise: > Reviewed-by: Philippe Mathieu-Daudé <[email protected]> I'll take it :) thanks > > > +endif >
