From patchwork Mon Nov 22 00:49:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Cohen X-Patchwork-Id: 12631127 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5495CC433EF for ; Mon, 22 Nov 2021 00:54:52 +0000 (UTC) Received: from localhost ([::1]:35374 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1moxbf-0000x3-Dx for qemu-devel@archiver.kernel.org; Sun, 21 Nov 2021 19:54:51 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56110) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1moxWW-000496-Re for qemu-devel@nongnu.org; Sun, 21 Nov 2021 19:49:33 -0500 Received: from [2607:f8b0:4864:20::f2f] (port=38628 helo=mail-qv1-xf2f.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1moxWV-0000xQ-4m for qemu-devel@nongnu.org; Sun, 21 Nov 2021 19:49:32 -0500 Received: by mail-qv1-xf2f.google.com with SMTP id a24so11340305qvb.5 for ; Sun, 21 Nov 2021 16:49:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LtTpcGKmGqBvRmAbEh2LW1gO3KOlVqc7je6R2Ml/UdE=; b=pCbt4vJk6d5jKitQXf2Ind3dDSKBKQE7gfc+Iaj4X1usXM/TBa86vu99MwX5bGQt8m o4jKllaufBeevjwxW2y0jVoUuifRwgQSVKNGwVvAfWMqlfGEptrcqQgArLmuHLpxN3df XPPcWdoIIi0fT/usPGHYhJcYtlHBRzRwNtUxw2MZJFKChZ+0eVDlmHuJQo0WgPmu7I8a 3Hr/4ZmGx4Kbpil6O2lpvQ9v/B2TrE1LBGqjgac8WekvXryvkgBMjMfjuqJfmgswcgJa 7LwxfmxEWrU9v0gKNJU97tzB7mz5dBWAleyQMFAsPVK6CzS+lGhuUZW+Sl112YEhWzOz 2ydg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LtTpcGKmGqBvRmAbEh2LW1gO3KOlVqc7je6R2Ml/UdE=; b=02qm4XGvSros50MzkRNQeMX/KF+m57rKsdZ6shYjrdljPotMGGMpZ+mIgwA6bsc558 p7kGnCjOlm9YcjsFwORCO78MxDUub+u5dquwuSDtwvdMptrJnTmS0MfglNTSs4HLuBNy 3G7W7SMw2UbAEJXZqENe3Og8uVm6L9tXwqKlPCycQKc2Yjt8ou8D0EPX+LqEk3BLEVju vM7qHIobyP2hqAyFklsSznI/SqdDhmPNqemW9ICGiAcO9QwsbSMlaQKRtc+ryedsRWKq Xl6zEAgQTo3LgTDdsYn+2C0n/GpU1ql2lasDZL5rw1hkNnm+r4HZ13X6j/ujE9DDYLvk Lt6g== X-Gm-Message-State: AOAM530OL58tQ/oFDONcb4Rk47xJp2gUZqmGwVxqr9XnLRMJW+eUrOfA 2JnTstwnljFGdHaTRdFASNyOD9KJ9KKkiA== X-Google-Smtp-Source: ABdhPJz0C7oHGmzY0konzKbGNWngn+3FMaY1c7uqaXsBmRDXGrl3Web2Z5I/wO8+aFnxccF6//vwMw== X-Received: by 2002:a05:6214:d8e:: with SMTP id e14mr98756075qve.50.1637542170210; Sun, 21 Nov 2021 16:49:30 -0800 (PST) Received: from localhost.localdomain (209-6-248-219.s2265.c3-0.wrx-ubr1.sbo-wrx.ma.cable.rcncustomer.com. [209.6.248.219]) by smtp.gmail.com with ESMTPSA id x17sm3651745qta.66.2021.11.21.16.49.29 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 21 Nov 2021 16:49:29 -0800 (PST) From: Will Cohen To: qemu-devel@nongnu.org Subject: [PATCH v2 07/11] 9p: darwin: *xattr_nofollow implementations Date: Sun, 21 Nov 2021 19:49:09 -0500 Message-Id: <20211122004913.20052-8-wwcohen@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211122004913.20052-1-wwcohen@gmail.com> References: <20211122004913.20052-1-wwcohen@gmail.com> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::f2f (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::f2f; envelope-from=wwcohen@gmail.com; helo=mail-qv1-xf2f.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Christian Schoenebeck , Keno Fischer , Greg Kurz , hi@alyssa.is, Michael Roitzsch , Will Cohen Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Keno Fischer This implements the darwin equivalent of the functions that were moved to 9p-util(-linux) earlier in this series in the new 9p-util-darwin file. Signed-off-by: Keno Fischer [Michael Roitzsch: - Rebase for NixOS] Signed-off-by: Michael Roitzsch Signed-off-by: Will Cohen --- hw/9pfs/9p-util-darwin.c | 64 ++++++++++++++++++++++++++++++++++++++++ hw/9pfs/meson.build | 1 + 2 files changed, 65 insertions(+) create mode 100644 hw/9pfs/9p-util-darwin.c diff --git a/hw/9pfs/9p-util-darwin.c b/hw/9pfs/9p-util-darwin.c new file mode 100644 index 0000000000..cdb4c9e24c --- /dev/null +++ b/hw/9pfs/9p-util-darwin.c @@ -0,0 +1,64 @@ +/* + * 9p utilities (Darwin Implementation) + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ + +#include "qemu/osdep.h" +#include "qemu/xattr.h" +#include "9p-util.h" + +ssize_t fgetxattrat_nofollow(int dirfd, const char *filename, const char *name, + void *value, size_t size) +{ + int ret; + int fd = openat_file(dirfd, filename, + O_RDONLY | O_PATH_9P_UTIL | O_NOFOLLOW, 0); + if (fd == -1) { + return -1; + } + ret = fgetxattr(fd, name, value, size, 0, 0); + close_preserve_errno(fd); + return ret; +} + +ssize_t flistxattrat_nofollow(int dirfd, const char *filename, + char *list, size_t size) +{ + int ret; + int fd = openat_file(dirfd, filename, + O_RDONLY | O_PATH_9P_UTIL | O_NOFOLLOW, 0); + if (fd == -1) { + return -1; + } + ret = flistxattr(fd, list, size, 0); + close_preserve_errno(fd); + return ret; +} + +ssize_t fremovexattrat_nofollow(int dirfd, const char *filename, + const char *name) +{ + int ret; + int fd = openat_file(dirfd, filename, O_PATH_9P_UTIL | O_NOFOLLOW, 0); + if (fd == -1) { + return -1; + } + ret = fremovexattr(fd, name, 0); + close_preserve_errno(fd); + return ret; +} + +int fsetxattrat_nofollow(int dirfd, const char *filename, const char *name, + void *value, size_t size, int flags) +{ + int ret; + int fd = openat_file(dirfd, filename, O_PATH_9P_UTIL | O_NOFOLLOW, 0); + if (fd == -1) { + return -1; + } + ret = fsetxattr(fd, name, value, size, 0, flags); + close_preserve_errno(fd); + return ret; +} diff --git a/hw/9pfs/meson.build b/hw/9pfs/meson.build index 1b28e70040..12443b6ad5 100644 --- a/hw/9pfs/meson.build +++ b/hw/9pfs/meson.build @@ -14,6 +14,7 @@ fs_ss.add(files( 'coxattr.c', )) fs_ss.add(when: 'CONFIG_LINUX', if_true: files('9p-util-linux.c')) +fs_ss.add(when: 'CONFIG_DARWIN', if_true: files('9p-util-darwin.c')) fs_ss.add(when: 'CONFIG_XEN', if_true: files('xen-9p-backend.c')) softmmu_ss.add_all(when: 'CONFIG_FSDEV_9P', if_true: fs_ss)