55 lines
1.8 KiB
Diff
55 lines
1.8 KiB
Diff
|
From 011b121d7f84c8974f03a81582cf1107249245bb Mon Sep 17 00:00:00 2001
|
||
|
|
From: Keno Fischer <keno@juliacomputing.com>
|
||
|
|
Date: Sun, 27 Feb 2022 17:35:13 -0500
|
||
|
|
Subject: [PATCH] 9p: Rename 9p-util -> 9p-util-linux
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
The current file only has the Linux versions of these functions.
|
||
|
|
Rename the file accordingly and update the Makefile to only build
|
||
|
|
it on Linux. A Darwin version of these will follow later in the
|
||
|
|
series.
|
||
|
|
|
||
|
|
Signed-off-by: Keno Fischer <keno@juliacomputing.com>
|
||
|
|
[Michael Roitzsch: - Rebase for NixOS]
|
||
|
|
Signed-off-by: Michael Roitzsch <reactorcontrol@icloud.com>
|
||
|
|
Signed-off-by: Will Cohen <wwcohen@gmail.com>
|
||
|
|
Reviewed-by: Greg Kurz <groug@kaod.org>
|
||
|
|
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
|
||
|
|
Message-Id: <20220227223522.91937-3-wwcohen@gmail.com>
|
||
|
|
Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
|
||
|
|
---
|
||
|
|
hw/9pfs/{9p-util.c => 9p-util-linux.c} | 0
|
||
|
|
hw/9pfs/meson.build | 2 +-
|
||
|
|
2 files changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
rename hw/9pfs/{9p-util.c => 9p-util-linux.c} (100%)
|
||
|
|
|
||
|
|
diff --git a/hw/9pfs/9p-util.c b/hw/9pfs/9p-util-linux.c
|
||
|
|
similarity index 100%
|
||
|
|
rename from hw/9pfs/9p-util.c
|
||
|
|
rename to hw/9pfs/9p-util-linux.c
|
||
|
|
diff --git a/hw/9pfs/meson.build b/hw/9pfs/meson.build
|
||
|
|
index 99be5d9119..1b28e70040 100644
|
||
|
|
--- a/hw/9pfs/meson.build
|
||
|
|
+++ b/hw/9pfs/meson.build
|
||
|
|
@@ -4,7 +4,6 @@ fs_ss.add(files(
|
||
|
|
'9p-posix-acl.c',
|
||
|
|
'9p-proxy.c',
|
||
|
|
'9p-synth.c',
|
||
|
|
- '9p-util.c',
|
||
|
|
'9p-xattr-user.c',
|
||
|
|
'9p-xattr.c',
|
||
|
|
'9p.c',
|
||
|
|
@@ -14,6 +13,7 @@ fs_ss.add(files(
|
||
|
|
'coth.c',
|
||
|
|
'coxattr.c',
|
||
|
|
))
|
||
|
|
+fs_ss.add(when: 'CONFIG_LINUX', if_true: files('9p-util-linux.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)
|
||
|
|
|
||
|
|
--
|
||
|
|
2.35.1
|
||
|
|
|