From: "Daniel P. Berrangé" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Thomas Huth" <thuth@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Michael Roth" <michael.roth@amd.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Konstantin Kostiuk" <kkostiuk@redhat.com>
Subject: [PATCH v3 07/22] qga: move CONFIG_FSFREEZE/TRIM to be meson defined options
Date: Fri, 12 Jul 2024 14:24:44 +0100 [thread overview]
Message-ID: <20240712132459.3974109-8-berrange@redhat.com> (raw)
In-Reply-To: <20240712132459.3974109-1-berrange@redhat.com>
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
next prev parent reply other threads:[~2024-07-12 13:26 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-12 13:24 [PATCH v3 00/22] qga: clean up command source locations and conditionals Daniel P. Berrangé
2024-07-12 13:24 ` [PATCH v3 01/22] qga: drop blocking of guest-get-memory-block-size command Daniel P. Berrangé
2024-07-12 13:24 ` [PATCH v3 02/22] qga: move linux vcpu command impls to commands-linux.c Daniel P. Berrangé
2024-07-12 13:24 ` [PATCH v3 03/22] qga: move linux suspend " Daniel P. Berrangé
2024-07-12 13:24 ` [PATCH v3 04/22] qga: move linux fs/disk " Daniel P. Berrangé
2024-07-12 13:24 ` [PATCH v3 05/22] qga: move linux disk/cpu stats " Daniel P. Berrangé
2024-07-12 13:24 ` [PATCH v3 06/22] qga: move linux memory block " Daniel P. Berrangé
2024-07-12 13:24 ` Daniel P. Berrangé [this message]
2024-07-19 7:34 ` [PATCH v3 07/22] qga: move CONFIG_FSFREEZE/TRIM to be meson defined options Konstantin Kostiuk
2024-07-12 13:24 ` [PATCH v3 08/22] qga: conditionalize schema for commands unsupported on Windows Daniel P. Berrangé
2024-07-12 13:24 ` [PATCH v3 09/22] qga: conditionalize schema for commands unsupported on non-Linux POSIX Daniel P. Berrangé
2024-07-12 13:24 ` [PATCH v3 10/22] qga: conditionalize schema for commands requiring getifaddrs Daniel P. Berrangé
2024-07-12 13:24 ` [PATCH v3 11/22] qga: conditionalize schema for commands requiring linux/win32 Daniel P. Berrangé
2024-07-19 7:35 ` Konstantin Kostiuk
2024-07-12 13:24 ` [PATCH v3 12/22] qga: conditionalize schema for commands only supported on Windows Daniel P. Berrangé
2024-07-12 13:24 ` [PATCH v3 13/22] qga: conditionalize schema for commands requiring fsfreeze Daniel P. Berrangé
2024-07-12 13:24 ` [PATCH v3 14/22] qga: conditionalize schema for commands requiring fstrim Daniel P. Berrangé
2024-07-12 13:24 ` [PATCH v3 15/22] qga: conditionalize schema for commands requiring libudev Daniel P. Berrangé
2024-07-12 13:24 ` [PATCH v3 16/22] qga: conditionalize schema for commands requiring utmpx Daniel P. Berrangé
2024-07-12 13:24 ` [PATCH v3 17/22] qga: conditionalize schema for commands not supported on other UNIX Daniel P. Berrangé
2024-07-12 13:24 ` [PATCH v3 18/22] qga: don't disable fsfreeze commands if vss_init fails Daniel P. Berrangé
2024-07-19 7:35 ` Konstantin Kostiuk
2024-07-12 13:24 ` [PATCH v3 19/22] qga: move declare of QGAConfig struct to top of file Daniel P. Berrangé
2024-07-12 13:24 ` [PATCH v3 20/22] qga: remove pointless 'blockrpcs_key' variable Daniel P. Berrangé
2024-07-12 13:24 ` [PATCH v3 21/22] qga: allow configuration file path via the cli Daniel P. Berrangé
2024-07-19 7:35 ` Konstantin Kostiuk
2024-07-12 13:24 ` [PATCH v3 22/22] qga: centralize logic for disabling/enabling commands Daniel P. Berrangé
2024-07-19 7:36 ` Konstantin Kostiuk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240712132459.3974109-8-berrange@redhat.com \
--to=berrange@redhat.com \
--cc=kkostiuk@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=michael.roth@amd.com \
--cc=pbonzini@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).