| Message ID | 20240712132459.3974109-8-berrange@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | qga: clean up command source locations and conditionals | expand |
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com> On Fri, Jul 12, 2024 at 4:25 PM Daniel P. Berrangé <berrange@redhat.com> wrote: > Defining these at the meson level allows them to be used a conditional > tests in the QAPI schemas. > > Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> > --- > meson.build | 15 +++++++++++++++ > qga/commands-common.h | 9 --------- > 2 files changed, 15 insertions(+), 9 deletions(-) > > diff --git a/meson.build b/meson.build > index 6a93da48e1..3f125d1b02 100644 > --- a/meson.build > +++ b/meson.build > @@ -2186,6 +2186,19 @@ have_virtfs_proxy_helper = > get_option('virtfs_proxy_helper') \ > .require(libcap_ng.found(), error_message: 'the virtfs proxy helper > requires libcap-ng') \ > .allowed() > > +qga_fsfreeze = false > +qga_fstrim = false > +if host_os == 'linux' > + if cc.has_header_symbol('linux/fs.h', 'FIFREEZE') > + qga_fsfreeze = true > + endif > + if cc.has_header_symbol('linux/fs.h', 'FITRIM') > + qga_fstrim = true > + endif > +elif host_os == 'freebsd' and cc.has_header_symbol('ufs/ffs/fs.h', > 'UFSSUSPEND') > + qga_fsfreeze = true > +endif > + > if get_option('block_drv_ro_whitelist') == '' > config_host_data.set('CONFIG_BDRV_RO_WHITELIST', '') > else > @@ -2422,6 +2435,8 @@ config_host_data.set('CONFIG_DEBUG_TCG', > get_option('debug_tcg')) > config_host_data.set('CONFIG_DEBUG_REMAP', get_option('debug_remap')) > config_host_data.set('CONFIG_QOM_CAST_DEBUG', > get_option('qom_cast_debug')) > config_host_data.set('CONFIG_REPLICATION', > get_option('replication').allowed()) > +config_host_data.set('CONFIG_FSFREEZE', qga_fsfreeze) > +config_host_data.set('CONFIG_FSTRIM', qga_fstrim) > > # has_header > config_host_data.set('CONFIG_EPOLL', cc.has_header('sys/epoll.h')) > diff --git a/qga/commands-common.h b/qga/commands-common.h > index 8c1c56aac9..263e7c0525 100644 > --- a/qga/commands-common.h > +++ b/qga/commands-common.h > @@ -15,19 +15,10 @@ > > #if defined(__linux__) > #include <linux/fs.h> > -#ifdef FIFREEZE > -#define CONFIG_FSFREEZE > -#endif > -#ifdef FITRIM > -#define CONFIG_FSTRIM > -#endif > #endif /* __linux__ */ > > #ifdef __FreeBSD__ > #include <ufs/ffs/fs.h> > -#ifdef UFSSUSPEND > -#define CONFIG_FSFREEZE > -#endif > #endif /* __FreeBSD__ */ > > #if defined(CONFIG_FSFREEZE) || defined(CONFIG_FSTRIM) > -- > 2.45.1 > >
diff --git a/meson.build b/meson.build index 6a93da48e1..3f125d1b02 100644 --- a/meson.build +++ b/meson.build @@ -2186,6 +2186,19 @@ have_virtfs_proxy_helper = get_option('virtfs_proxy_helper') \ .require(libcap_ng.found(), error_message: 'the virtfs proxy helper requires libcap-ng') \ .allowed() +qga_fsfreeze = false +qga_fstrim = false +if host_os == 'linux' + if cc.has_header_symbol('linux/fs.h', 'FIFREEZE') + qga_fsfreeze = true + endif + if cc.has_header_symbol('linux/fs.h', 'FITRIM') + qga_fstrim = true + endif +elif host_os == 'freebsd' and cc.has_header_symbol('ufs/ffs/fs.h', 'UFSSUSPEND') + qga_fsfreeze = true +endif + if get_option('block_drv_ro_whitelist') == '' config_host_data.set('CONFIG_BDRV_RO_WHITELIST', '') else @@ -2422,6 +2435,8 @@ config_host_data.set('CONFIG_DEBUG_TCG', get_option('debug_tcg')) config_host_data.set('CONFIG_DEBUG_REMAP', get_option('debug_remap')) config_host_data.set('CONFIG_QOM_CAST_DEBUG', get_option('qom_cast_debug')) config_host_data.set('CONFIG_REPLICATION', get_option('replication').allowed()) +config_host_data.set('CONFIG_FSFREEZE', qga_fsfreeze) +config_host_data.set('CONFIG_FSTRIM', qga_fstrim) # has_header config_host_data.set('CONFIG_EPOLL', cc.has_header('sys/epoll.h')) diff --git a/qga/commands-common.h b/qga/commands-common.h index 8c1c56aac9..263e7c0525 100644 --- a/qga/commands-common.h +++ b/qga/commands-common.h @@ -15,19 +15,10 @@ #if defined(__linux__) #include <linux/fs.h> -#ifdef FIFREEZE -#define CONFIG_FSFREEZE -#endif -#ifdef FITRIM -#define CONFIG_FSTRIM -#endif #endif /* __linux__ */ #ifdef __FreeBSD__ #include <ufs/ffs/fs.h> -#ifdef UFSSUSPEND -#define CONFIG_FSFREEZE -#endif #endif /* __FreeBSD__ */ #if defined(CONFIG_FSFREEZE) || defined(CONFIG_FSTRIM)
Defining these at the meson level allows them to be used a conditional tests in the QAPI schemas. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- meson.build | 15 +++++++++++++++ qga/commands-common.h | 9 --------- 2 files changed, 15 insertions(+), 9 deletions(-)