[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 12/19] 9pfs: move qemu_dirent_dup() from osdep -> 9p-util
From: |
Christian Schoenebeck |
Subject: |
[PULL v2 12/19] 9pfs: move qemu_dirent_dup() from osdep -> 9p-util |
Date: |
Mon, 07 Mar 2022 12:15:00 +0100 |
Function qemu_dirent_dup() is currently only used by 9pfs server, so move
it from project global header osdep.h to 9pfs specific header 9p-util.h.
Link:
https://lore.kernel.org/qemu-devel/CAFEAcA_=HAUNomKD2wurSVaAHa5mrk22A1oHKLWUDjk7v6Khmg@mail.gmail.com/
Based-on: <20220227223522.91937-12-wwcohen@gmail.com>
Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <E1nP9Oz-00043L-KJ@lizzy.crudebyte.com>
---
hw/9pfs/9p-util.h | 30 ++++++++++++++++++++++++++++++
include/qemu/osdep.h | 13 -------------
util/osdep.c | 21 ---------------------
3 files changed, 30 insertions(+), 34 deletions(-)
diff --git a/hw/9pfs/9p-util.h b/hw/9pfs/9p-util.h
index 73b08c5561..408d71c8f7 100644
--- a/hw/9pfs/9p-util.h
+++ b/hw/9pfs/9p-util.h
@@ -114,6 +114,36 @@ static inline off_t qemu_dirent_off(struct dirent *dent)
#endif
}
+/**
+ * Duplicate directory entry @dent.
+ *
+ * It is highly recommended to use this function instead of open coding
+ * duplication of @c dirent objects, because the actual @c struct @c dirent
+ * size may be bigger or shorter than @c sizeof(struct dirent) and correct
+ * handling is platform specific (see gitlab issue #841).
+ *
+ * @dent - original directory entry to be duplicated
+ * @returns duplicated directory entry which should be freed with g_free()
+ */
+static inline struct dirent *qemu_dirent_dup(struct dirent *dent)
+{
+ size_t sz = 0;
+#if defined _DIRENT_HAVE_D_RECLEN
+ /* Avoid use of strlen() if platform supports d_reclen. */
+ sz = dent->d_reclen;
+#endif
+ /*
+ * Test sz for zero even if d_reclen is available
+ * because some drivers may set d_reclen to zero.
+ */
+ if (sz == 0) {
+ /* Fallback to the most portable way. */
+ sz = offsetof(struct dirent, d_name) +
+ strlen(dent->d_name) + 1;
+ }
+ return g_memdup(dent, sz);
+}
+
/*
* As long as mknodat is not available on macOS, this workaround
* using pthread_fchdir_np is needed. qemu_mknodat is defined in
diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
index 7bcce3bceb..650ba1aa50 100644
--- a/include/qemu/osdep.h
+++ b/include/qemu/osdep.h
@@ -673,19 +673,6 @@ static inline int platform_does_not_support_system(const
char *command)
}
#endif /* !HAVE_SYSTEM_FUNCTION */
-/**
- * Duplicate directory entry @dent.
- *
- * It is highly recommended to use this function instead of open coding
- * duplication of @c dirent objects, because the actual @c struct @c dirent
- * size may be bigger or shorter than @c sizeof(struct dirent) and correct
- * handling is platform specific (see gitlab issue #841).
- *
- * @dent - original directory entry to be duplicated
- * @returns duplicated directory entry which should be freed with g_free()
- */
-struct dirent *qemu_dirent_dup(struct dirent *dent);
-
#ifdef __cplusplus
}
#endif
diff --git a/util/osdep.c b/util/osdep.c
index 723cdcb004..7c4deda6fe 100644
--- a/util/osdep.c
+++ b/util/osdep.c
@@ -33,7 +33,6 @@
extern int madvise(char *, size_t, int);
#endif
-#include <dirent.h>
#include "qemu-common.h"
#include "qemu/cutils.h"
#include "qemu/sockets.h"
@@ -619,23 +618,3 @@ writev(int fd, const struct iovec *iov, int iov_cnt)
return readv_writev(fd, iov, iov_cnt, true);
}
#endif
-
-struct dirent *
-qemu_dirent_dup(struct dirent *dent)
-{
- size_t sz = 0;
-#if defined _DIRENT_HAVE_D_RECLEN
- /* Avoid use of strlen() if platform supports d_reclen. */
- sz = dent->d_reclen;
-#endif
- /*
- * Test sz for zero even if d_reclen is available
- * because some drivers may set d_reclen to zero.
- */
- if (sz == 0) {
- /* Fallback to the most portable way. */
- sz = offsetof(struct dirent, d_name) +
- strlen(dent->d_name) + 1;
- }
- return g_memdup(dent, sz);
-}
--
2.20.1
- [PULL v2 01/19] 9p: linux: Fix a couple Linux assumptions, (continued)
- [PULL v2 01/19] 9p: linux: Fix a couple Linux assumptions, Christian Schoenebeck, 2022/03/07
- [PULL v2 16/19] 9pfs/9p.c: convert Doxygen -> kerneldoc format, Christian Schoenebeck, 2022/03/07
- [PULL v2 13/19] 9pfs: drop Doxygen format from qemu_dirent_dup() API comment, Christian Schoenebeck, 2022/03/07
- [PULL v2 15/19] 9pfs/codir.c: convert Doxygen -> kerneldoc format, Christian Schoenebeck, 2022/03/07
- [PULL v2 11/19] 9p: darwin: meson: Allow VirtFS on Darwin, Christian Schoenebeck, 2022/03/07
- [PULL v2 10/19] 9p: darwin: Adjust assumption on virtio-9p-test, Christian Schoenebeck, 2022/03/07
- [PULL v2 09/19] 9p: darwin: Implement compatibility for mknodat, Christian Schoenebeck, 2022/03/07
- [PULL v2 18/19] 9pfs/coth.h: drop Doxygen format on v9fs_co_run_in_worker(), Christian Schoenebeck, 2022/03/07
- [PULL v2 17/19] 9pfs/9p-util.h: convert Doxygen -> kerneldoc format, Christian Schoenebeck, 2022/03/07
- [PULL v2 14/19] 9pfs/9p.h: convert Doxygen -> kerneldoc format, Christian Schoenebeck, 2022/03/07
- [PULL v2 12/19] 9pfs: move qemu_dirent_dup() from osdep -> 9p-util,
Christian Schoenebeck <=
- Re: [PULL v2 00/19] 9p queue 2022-03-07 (previous 2022-03-04), Peter Maydell, 2022/03/08