summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorHanna Reitz2022-02-23 10:23:40 +0100
committerDr. David Alan Gilbert2022-03-02 19:12:40 +0100
commit4ce7a08d3e3a869f89c2af622fa77e967ade7cbf (patch)
treefb4890bf55a6729f17d4d43c6d9f06c18dabd814 /tools
parentclock-vmstate: Add missing END_OF_LIST (diff)
downloadqemu-4ce7a08d3e3a869f89c2af622fa77e967ade7cbf.tar.gz
qemu-4ce7a08d3e3a869f89c2af622fa77e967ade7cbf.tar.xz
qemu-4ce7a08d3e3a869f89c2af622fa77e967ade7cbf.zip
virtiofsd: Let meson check for statx.stx_mnt_id
In virtiofsd, we assume that the presence of the STATX_MNT_ID macro implies existence of the statx.stx_mnt_id field. Unfortunately, that is not necessarily the case: glibc has introduced the macro in its commit 88a2cf6c4bab6e94a65e9c0db8813709372e9180, but the statx.stx_mnt_id field is still missing from its own headers. Let meson.build actually chek for both STATX_MNT_ID and statx.stx_mnt_id, and set CONFIG_STATX_MNT_ID if both are present. Then, use this config macro in virtiofsd. Closes: https://gitlab.com/qemu-project/qemu/-/issues/882 Signed-off-by: Hanna Reitz <hreitz@redhat.com> Message-Id: <20220223092340.9043-1-hreitz@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/virtiofsd/passthrough_ll.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
index dfa2fc250d..028dacdd8f 100644
--- a/tools/virtiofsd/passthrough_ll.c
+++ b/tools/virtiofsd/passthrough_ll.c
@@ -1039,7 +1039,7 @@ static int do_statx(struct lo_data *lo, int dirfd, const char *pathname,
{
int res;
-#if defined(CONFIG_STATX) && defined(STATX_MNT_ID)
+#if defined(CONFIG_STATX) && defined(CONFIG_STATX_MNT_ID)
if (lo->use_statx) {
struct statx statxbuf;