From patchwork Thu Feb 10 13:29:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Will Cohen X-Patchwork-Id: 12742175 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 4EAA1C433EF for ; Thu, 10 Feb 2022 16:42:30 +0000 (UTC) Received: from localhost ([::1]:56708 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nICWb-0007bn-Du for qemu-devel@archiver.kernel.org; Thu, 10 Feb 2022 11:42:29 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44710) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nI9WP-0002yp-2d for qemu-devel@nongnu.org; Thu, 10 Feb 2022 08:30:06 -0500 Received: from [2607:f8b0:4864:20::735] (port=33421 helo=mail-qk1-x735.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nI9WM-0004D8-Uq for qemu-devel@nongnu.org; Thu, 10 Feb 2022 08:30:04 -0500 Received: by mail-qk1-x735.google.com with SMTP id o10so4810888qkg.0 for ; Thu, 10 Feb 2022 05:30:02 -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=q/a52Ymyen9MRJFePDxCcyYr+mACfmfhjAFtBkPNnik=; b=n0Tbbjp3QCq17AsTkdIDm+cRmhLu2VNP6zflEFdn1qSoDbz2ynvcLLQCv/fecBBwVS gpeQUwqDBa7xg7651XvXby1iHKXFVSfwI+RNP9N5/ygFE+sypdX6aFs3a4WkkVkSSnyz bRrA9veHUptC7d7ccHfKAG/evIMxtfNbtRWIa2dL/Y+KBzw7SlyXvsHOTvQOQ5co3Xc6 2DERJ/LLgxfvZXXGIbjQNgXaIDP/tYlar3DiwqUq0faNJTNnWGpcdJ2OTXzGF8qY9RtI AZ5LPm3hbp2BBhOfJONRkH2+YPJw0Jhd2DSlzLJZ3AO0C+xwYihqePcjBtxv70fAHMnc OMUA== 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=q/a52Ymyen9MRJFePDxCcyYr+mACfmfhjAFtBkPNnik=; b=RugwZNuk6s8q07wA5s9nPZ06GzjCxjrh2zN0JbwLHx55cJs+mYagLPzCYJ3Pi0pb70 5HTCyX9SOSdwZ0CqK8wXG1b/ajqxHD+x3n0JyOpc9g3s+eE1s0B9aN6NBKbIW6XAq2Hz hCau34Y+qVNjzFZ7IWvj2xVPsQxD6fHChGZy4Qcto1dkGveip2j+BGXw1lxizLvcUrqJ Cu3bQSsH0oYsbvRdXvPWyB0oUnNVnDZH1uI2m24cEl0bffJe3VfpnsDj8Sif/knJlVxB eQ3zLly8KFE6PRrnfcyCb6dOe7faTIHUiFf8xMmKhPqFgj5gviJH/vDN/V+S8UqyoDtx LQMQ== X-Gm-Message-State: AOAM530AOhFnJ+PMD2LMROoFZ3sOe9nUe+TRD5rQ1jkEn9b4fSKn3zkq uxp1pBQy2/prh+vkWlFH3pvCBqw9rw6GYQ== X-Google-Smtp-Source: ABdhPJx9eSrIIVhBLGstZYIueB0zymaNtfDG0+6Y9F1QvfGrp+ZtOc4i6uT2bWUWtl6XGmPTw3wCdg== X-Received: by 2002:a05:620a:170e:: with SMTP id az14mr3682526qkb.780.1644499801220; Thu, 10 Feb 2022 05:30:01 -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 t1sm11289616qtc.48.2022.02.10.05.29.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Feb 2022 05:30:00 -0800 (PST) From: Will Cohen To: qemu-devel@nongnu.org Subject: [PATCH v6 01/11] 9p: linux: Fix a couple Linux assumptions Date: Thu, 10 Feb 2022 08:29:36 -0500 Message-Id: <20220210132946.2303-2-wwcohen@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220210132946.2303-1-wwcohen@gmail.com> References: <20220210132946.2303-1-wwcohen@gmail.com> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::735 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::735; envelope-from=wwcohen@gmail.com; helo=mail-qk1-x735.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, T_SCC_BODY_TEXT_LINE=-0.01 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: Laurent Vivier , Thomas Huth , Christian Schoenebeck , Greg Kurz , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , hi@alyssa.is, Michael Roitzsch , Will Cohen , Paolo Bonzini , Keno Fischer Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Keno Fischer - Guard Linux only headers. - Add qemu/statfs.h header to abstract over the which headers are needed for struct statfs - Define `ENOATTR` only if not only defined (it's defined in system headers on Darwin). Signed-off-by: Keno Fischer [Michael Roitzsch: - Rebase for NixOS] Signed-off-by: Michael Roitzsch While it might at first appear that fsdev/virtfs-proxy-header.c would need similar adjustment for darwin as file-op-9p here, a later patch in this series disables virtfs-proxy-helper for non-Linux. Allowing virtfs-proxy-helper on darwin could potentially be an additional optimization later. [Will Cohen: - Fix headers for Alpine - Integrate statfs.h back into file-op-9p.h - Remove superfluous header guards from file-opt-9p - Add note about virtfs-proxy-helper being disabled on non-Linux for this patch series] Signed-off-by: Will Cohen Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Greg Kurz --- fsdev/file-op-9p.h | 9 ++++++++- hw/9pfs/9p-local.c | 2 ++ hw/9pfs/9p.c | 4 ++++ include/qemu/xattr.h | 4 +++- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/fsdev/file-op-9p.h b/fsdev/file-op-9p.h index 8fd89f0447..4997677460 100644 --- a/fsdev/file-op-9p.h +++ b/fsdev/file-op-9p.h @@ -16,10 +16,17 @@ #include #include -#include #include "qemu-fsdev-throttle.h" #include "p9array.h" +#ifdef CONFIG_LINUX +# include +#endif +#ifdef CONFIG_DARWIN +# include +# include +#endif + #define SM_LOCAL_MODE_BITS 0600 #define SM_LOCAL_DIR_MODE_BITS 0700 diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c index 210d9e7705..1a5e3eed73 100644 --- a/hw/9pfs/9p-local.c +++ b/hw/9pfs/9p-local.c @@ -32,10 +32,12 @@ #include "qemu/error-report.h" #include "qemu/option.h" #include +#ifdef CONFIG_LINUX #include #ifdef CONFIG_LINUX_MAGIC_H #include #endif +#endif #include #ifndef XFS_SUPER_MAGIC diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c index 15b3f4d385..9c63e14b28 100644 --- a/hw/9pfs/9p.c +++ b/hw/9pfs/9p.c @@ -32,7 +32,11 @@ #include "migration/blocker.h" #include "qemu/xxhash.h" #include +#ifdef CONFIG_LINUX #include +#else +#include +#endif int open_fd_hw; int total_open_fd; diff --git a/include/qemu/xattr.h b/include/qemu/xattr.h index a83fe8e749..f1d0f7be74 100644 --- a/include/qemu/xattr.h +++ b/include/qemu/xattr.h @@ -22,7 +22,9 @@ #ifdef CONFIG_LIBATTR # include #else -# define ENOATTR ENODATA +# if !defined(ENOATTR) +# define ENOATTR ENODATA +# endif # include #endif