From: Christian Schoenebeck <qemu_oss@crudebyte.com>
To: qemu-devel@nongnu.org
Cc: Will Cohen <wwcohen@gmail.com>, Greg Kurz <groug@kaod.org>,
Michael Roitzsch <reactorcontrol@icloud.com>,
Keno Fischer <keno@juliacomputing.com>,
Akihiko Odaki <akihiko.odaki@gmail.com>,
qemu-stable@nongnu.org
Subject: [PATCH 2/5] 9pfs: fix qemu_mknodat(S_IFSOCK) on macOS
Date: Tue, 19 Apr 2022 13:41:03 +0200 [thread overview]
Message-ID: <2e88acab7b3f998ceff7232b5e3d6a8a6d2a6f8b.1650370026.git.qemu_oss@crudebyte.com> (raw)
In-Reply-To: <cover.1650370026.git.qemu_oss@crudebyte.com>
mknod() on macOS does not support creating sockets, so divert to
call sequence socket(), bind() and chmod() respectively if S_IFSOCK
was passed with mode argument.
Link: https://lore.kernel.org/qemu-devel/17933734.zYzKuhC07K@silver/
Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
---
hw/9pfs/9p-util-darwin.c | 24 +++++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/hw/9pfs/9p-util-darwin.c b/hw/9pfs/9p-util-darwin.c
index 53e0625501..252a6fc5dd 100644
--- a/hw/9pfs/9p-util-darwin.c
+++ b/hw/9pfs/9p-util-darwin.c
@@ -74,6 +74,24 @@ int fsetxattrat_nofollow(int dirfd, const char *filename, const char *name,
*/
#if defined CONFIG_PTHREAD_FCHDIR_NP
+static int create_socket_file_at_cwd(const char *filename, mode_t mode) {
+ int fd, err;
+ struct sockaddr_un addr = {
+ .sun_family = AF_UNIX
+ };
+
+ fd = socket(PF_UNIX, SOCK_DGRAM, 0);
+ if (fd < 0) {
+ return fd;
+ }
+ snprintf(addr.sun_path, sizeof(addr.sun_path), "./%s", filename);
+ err = bind(fd, (struct sockaddr *) &addr, sizeof(addr));
+ if (err < 0) {
+ return err;
+ }
+ return chmod(addr.sun_path, mode);
+}
+
int qemu_mknodat(int dirfd, const char *filename, mode_t mode, dev_t dev)
{
int preserved_errno, err;
@@ -88,7 +106,11 @@ int qemu_mknodat(int dirfd, const char *filename, mode_t mode, dev_t dev)
if (pthread_fchdir_np(dirfd) < 0) {
return -1;
}
- err = mknod(filename, mode, dev);
+ if (S_ISSOCK(mode)) {
+ err = create_socket_file_at_cwd(filename, mode);
+ } else {
+ err = mknod(filename, mode, dev);
+ }
preserved_errno = errno;
/* Stop using the thread-local cwd */
pthread_fchdir_np(-1);
--
2.32.0 (Apple Git-132)
next prev parent reply other threads:[~2022-04-19 12:27 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-19 12:07 [PATCH 0/5] 9pfs: macOS host fixes Christian Schoenebeck
2022-04-19 11:40 ` [PATCH 1/5] 9pfs: fix qemu_mknodat(S_IFREG) on macOS Christian Schoenebeck
2022-04-19 13:44 ` Will Cohen
2022-04-20 2:03 ` Akihiko Odaki
2022-04-20 8:40 ` Greg Kurz
2022-04-20 9:38 ` Christian Schoenebeck
2022-04-19 11:41 ` Christian Schoenebeck [this message]
2022-04-19 13:46 ` [PATCH 2/5] 9pfs: fix qemu_mknodat(S_IFSOCK) " Will Cohen
2022-04-20 9:09 ` Greg Kurz
2022-04-20 10:28 ` Christian Schoenebeck
2022-04-20 12:08 ` Greg Kurz
2022-04-20 12:10 ` Greg Kurz
2022-04-20 12:41 ` Christian Schoenebeck
2022-04-19 11:41 ` [PATCH 3/5] 9pfs: fix wrong encoding of rdev field in Rgetattr " Christian Schoenebeck
2022-04-21 7:30 ` Greg Kurz
2022-04-21 10:25 ` Christian Schoenebeck
2022-04-21 10:31 ` Greg Kurz
2022-04-19 11:41 ` [PATCH 4/5] 9pfs: fix wrong errno being sent to Linux client on macOS host Christian Schoenebeck
2022-04-21 10:48 ` Greg Kurz
2022-04-21 11:13 ` Christian Schoenebeck
2022-04-21 11:46 ` Greg Kurz
2022-04-21 12:20 ` Christian Schoenebeck
2022-04-19 11:43 ` [PATCH 5/5] 9pfs: fix removing non-existent POSIX ACL xattr " Christian Schoenebeck
2022-04-21 8:26 ` Greg Kurz
2022-04-21 10:55 ` Christian Schoenebeck
2022-04-21 12:26 ` Greg Kurz
2022-04-21 13:03 ` Christian Schoenebeck
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=2e88acab7b3f998ceff7232b5e3d6a8a6d2a6f8b.1650370026.git.qemu_oss@crudebyte.com \
--to=qemu_oss@crudebyte.com \
--cc=akihiko.odaki@gmail.com \
--cc=groug@kaod.org \
--cc=keno@juliacomputing.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-stable@nongnu.org \
--cc=reactorcontrol@icloud.com \
--cc=wwcohen@gmail.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).