[PULL 0/3] Block patches
[PULL for-7.1 0/1] Block patches
1
The following changes since commit 9c125d17e9402c232c46610802e5931b3639d77b:
1
The following changes since commit 2480f3bbd03814b0651a1f74959f5c6631ee5819:
2
2
3
Merge tag 'pull-tcg-20220420' of https://gitlab.com/rth7680/qemu into staging (2022-04-20 16:43:11 -0700)
3
Merge tag 'linux-user-for-7.1-pull-request' of https://gitlab.com/laurent_vivier/qemu into staging (2022-08-03 08:32:44 -0700)
4
4
5
are available in the Git repository at:
5
are available in the Git repository at:
6
6
7
https://gitlab.com/stefanha/qemu.git tags/block-pull-request
7
https://gitlab.com/stefanha/qemu.git tags/block-pull-request
8
8
9
for you to fetch changes up to d45c83328feab2e4083991693160f0a417cfd9b0:
9
for you to fetch changes up to 7b0ca313647532a2c7007379ff800c9a2415c95d:
10
10
11
virtiofsd: Add docs/helper for killpriv_v2/no_killpriv_v2 option (2022-04-21 12:05:15 +0200)
11
virtiofsd: Fix format strings (2022-08-04 14:44:25 -0400)
12
12
13
----------------------------------------------------------------
13
----------------------------------------------------------------
14
Pull request
14
Pull request
15
15
16
Small contrib/vhost-user-blk, contrib/vhost-user-scsi, and tools/virtiofsd
16
- Format string portability fix in virtiofsd
17
improvements.
18
17
19
----------------------------------------------------------------
18
----------------------------------------------------------------
20
19
21
Liu Yiding (1):
20
Stefan Weil (1):
22
virtiofsd: Add docs/helper for killpriv_v2/no_killpriv_v2 option
21
virtiofsd: Fix format strings
23
22
24
Sakshi Kaushik (1):
23
tools/virtiofsd/fuse_lowlevel.c | 4 ++--
25
Implements Backend Program conventions for vhost-user-scsi
24
1 file changed, 2 insertions(+), 2 deletions(-)
26
27
Stefan Hajnoczi (1):
28
contrib/vhost-user-blk: add missing GOptionEntry NULL terminator
29
30
docs/tools/virtiofsd.rst | 5 ++
31
contrib/vhost-user-blk/vhost-user-blk.c | 3 +-
32
contrib/vhost-user-scsi/vhost-user-scsi.c | 77 +++++++++++++++--------
33
tools/virtiofsd/helper.c | 3 +
34
4 files changed, 62 insertions(+), 26 deletions(-)
35
25
36
--
26
--
37
2.35.1
27
2.37.1
diff view generated by jsdifflib
[PULL 1/3] Implements Backend Program conventions for vhost-user-scsi
Deleted patch
1
From: Sakshi Kaushik <sakshikaushik717@gmail.com>
2
1
3
Signed-off-by: Sakshi Kaushik <sakshikaushik717@gmail.com>
4
Message-id: 20220406162410.8536-1-sakshikaushik717@gmail.com
5
6
[Name the iSCSI URL long option --iscsi-uri instead of --iscsi_uri for
7
consistency, fix --fd which was rejected due to an outdated
8
--socket-path check, and add missing entries[] terminator.
9
--Stefan]
10
11
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
12
---
13
contrib/vhost-user-scsi/vhost-user-scsi.c | 77 +++++++++++++++--------
14
1 file changed, 52 insertions(+), 25 deletions(-)
15
16
diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c
17
index XXXXXXX..XXXXXXX 100644
18
--- a/contrib/vhost-user-scsi/vhost-user-scsi.c
19
+++ b/contrib/vhost-user-scsi/vhost-user-scsi.c
20
@@ -XXX,XX +XXX,XX @@ fail:
21
22
/** vhost-user-scsi **/
23
24
+static int opt_fdnum = -1;
25
+static char *opt_socket_path;
26
+static gboolean opt_print_caps;
27
+static char *iscsi_uri;
28
+
29
+static GOptionEntry entries[] = {
30
+ { "print-capabilities", 'c', 0, G_OPTION_ARG_NONE, &opt_print_caps,
31
+ "Print capabilities", NULL },
32
+ { "fd", 'f', 0, G_OPTION_ARG_INT, &opt_fdnum,
33
+ "Use inherited fd socket", "FDNUM" },
34
+ { "iscsi-uri", 'i', 0, G_OPTION_ARG_FILENAME, &iscsi_uri,
35
+ "iSCSI URI to connect to", "FDNUM" },
36
+ { "socket-path", 's', 0, G_OPTION_ARG_FILENAME, &opt_socket_path,
37
+ "Use UNIX socket path", "PATH" },
38
+ { NULL, }
39
+};
40
+
41
int main(int argc, char **argv)
42
{
43
VusDev *vdev_scsi = NULL;
44
- char *unix_fn = NULL;
45
- char *iscsi_uri = NULL;
46
- int lsock = -1, csock = -1, opt, err = EXIT_SUCCESS;
47
+ int lsock = -1, csock = -1, err = EXIT_SUCCESS;
48
49
- while ((opt = getopt(argc, argv, "u:i:")) != -1) {
50
- switch (opt) {
51
- case 'h':
52
- goto help;
53
- case 'u':
54
- unix_fn = g_strdup(optarg);
55
- break;
56
- case 'i':
57
- iscsi_uri = g_strdup(optarg);
58
- break;
59
- default:
60
- goto help;
61
- }
62
+ GError *error = NULL;
63
+ GOptionContext *context;
64
+
65
+ context = g_option_context_new(NULL);
66
+ g_option_context_add_main_entries(context, entries, NULL);
67
+ if (!g_option_context_parse(context, &argc, &argv, &error)) {
68
+ g_printerr("Option parsing failed: %s\n", error->message);
69
+ exit(EXIT_FAILURE);
70
+ }
71
+
72
+ if (opt_print_caps) {
73
+ g_print("{\n");
74
+ g_print(" \"type\": \"scsi\"\n");
75
+ g_print("}\n");
76
+ goto out;
77
}
78
- if (!unix_fn || !iscsi_uri) {
79
+
80
+ if (!iscsi_uri) {
81
goto help;
82
}
83
84
- lsock = unix_sock_new(unix_fn);
85
- if (lsock < 0) {
86
- goto err;
87
+ if (opt_socket_path) {
88
+ lsock = unix_sock_new(opt_socket_path);
89
+ if (lsock < 0) {
90
+ exit(EXIT_FAILURE);
91
+ }
92
+ } else if (opt_fdnum < 0) {
93
+ g_print("%s\n", g_option_context_get_help(context, true, NULL));
94
+ exit(EXIT_FAILURE);
95
+ } else {
96
+ lsock = opt_fdnum;
97
}
98
99
csock = accept(lsock, NULL, NULL);
100
@@ -XXX,XX +XXX,XX @@ out:
101
if (vdev_scsi) {
102
g_main_loop_unref(vdev_scsi->loop);
103
g_free(vdev_scsi);
104
- unlink(unix_fn);
105
+ unlink(opt_socket_path);
106
}
107
if (csock >= 0) {
108
close(csock);
109
@@ -XXX,XX +XXX,XX @@ out:
110
if (lsock >= 0) {
111
close(lsock);
112
}
113
- g_free(unix_fn);
114
+ g_free(opt_socket_path);
115
g_free(iscsi_uri);
116
117
return err;
118
@@ -XXX,XX +XXX,XX @@ err:
119
goto out;
120
121
help:
122
- fprintf(stderr, "Usage: %s [ -u unix_sock_path -i iscsi_uri ] | [ -h ]\n",
123
+ fprintf(stderr, "Usage: %s [ -s socket-path -i iscsi-uri -f fd -p print-capabilities ] | [ -h ]\n",
124
argv[0]);
125
- fprintf(stderr, " -u path to unix socket\n");
126
- fprintf(stderr, " -i iscsi uri for lun 0\n");
127
+ fprintf(stderr, " -s, --socket-path=SOCKET_PATH path to unix socket\n");
128
+ fprintf(stderr, " -i, --iscsi-uri=ISCSI_URI iscsi uri for lun 0\n");
129
+ fprintf(stderr, " -f, --fd=FILE_DESCRIPTOR file-descriptor\n");
130
+ fprintf(stderr, " -p, --print-capabilities=PRINT_CAPABILITIES denotes print-capabilities\n");
131
fprintf(stderr, " -h print help and quit\n");
132
133
goto err;
134
--
135
2.35.1
diff view generated by jsdifflib
[PULL 2/3] contrib/vhost-user-blk: add missing GOptionEntry NULL terminator
Deleted patch
1
The GLib documentation says "a NULL-terminated array of GOptionEntrys"
2
so we'd better make sure there is a terminator that lets
3
g_option_context_add_main_entries() know when the end of the array has
4
been reached.
5
1
6
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
7
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
8
Message-id: 20220411150057.3009667-1-stefanha@redhat.com
9
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
10
---
11
contrib/vhost-user-blk/vhost-user-blk.c | 3 ++-
12
1 file changed, 2 insertions(+), 1 deletion(-)
13
14
diff --git a/contrib/vhost-user-blk/vhost-user-blk.c b/contrib/vhost-user-blk/vhost-user-blk.c
15
index XXXXXXX..XXXXXXX 100644
16
--- a/contrib/vhost-user-blk/vhost-user-blk.c
17
+++ b/contrib/vhost-user-blk/vhost-user-blk.c
18
@@ -XXX,XX +XXX,XX @@ static GOptionEntry entries[] = {
19
{"blk-file", 'b', 0, G_OPTION_ARG_FILENAME, &opt_blk_file,
20
"block device or file path", "PATH"},
21
{ "read-only", 'r', 0, G_OPTION_ARG_NONE, &opt_read_only,
22
- "Enable read-only", NULL }
23
+ "Enable read-only", NULL },
24
+ { NULL, },
25
};
26
27
int main(int argc, char **argv)
28
--
29
2.35.1
diff view generated by jsdifflib
[PULL 3/3] virtiofsd: Add docs/helper for killpriv_v2/no_killpriv_v2 option
[PULL for-7.1 1/1] virtiofsd: Fix format strings
1
From: Liu Yiding <liuyd.fnst@fujitsu.com>
1
From: Stefan Weil <sw@weilnetz.de>
2
2
3
virtiofsd has introduced killpriv_v2/no_killpriv_v2 for a while. Add
3
Signed-off-by: Stefan Weil <sw@weilnetz.de>
4
description of it to docs/helper.
4
Message-Id: <20220804074833.892604-1-sw@weilnetz.de>
5
6
Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
7
Message-Id: <20220421095151.2231099-1-liuyd.fnst@fujitsu.com>
8
9
[Small documentation fixes: s/as client supports/as the client supports/
10
and s/. /. /.
11
--Stefan]
12
13
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
5
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
14
---
6
---
15
docs/tools/virtiofsd.rst | 5 +++++
7
tools/virtiofsd/fuse_lowlevel.c | 4 ++--
16
tools/virtiofsd/helper.c | 3 +++
8
1 file changed, 2 insertions(+), 2 deletions(-)
17
2 files changed, 8 insertions(+)
18
9
19
diff --git a/docs/tools/virtiofsd.rst b/docs/tools/virtiofsd.rst
10
diff --git a/tools/virtiofsd/fuse_lowlevel.c b/tools/virtiofsd/fuse_lowlevel.c
20
index XXXXXXX..XXXXXXX 100644
11
index XXXXXXX..XXXXXXX 100644
21
--- a/docs/tools/virtiofsd.rst
12
--- a/tools/virtiofsd/fuse_lowlevel.c
22
+++ b/docs/tools/virtiofsd.rst
13
+++ b/tools/virtiofsd/fuse_lowlevel.c
23
@@ -XXX,XX +XXX,XX @@ Options
14
@@ -XXX,XX +XXX,XX @@ static void do_init(fuse_req_t req, fuse_ino_t nodeid,
24
label. Server will try to set that label on newly created file
15
25
atomically wherever possible.
16
fuse_log(FUSE_LOG_DEBUG, "INIT: %u.%u\n", arg->major, arg->minor);
26
17
if (arg->major == 7 && arg->minor >= 6) {
27
+ * killpriv_v2|no_killpriv_v2 -
18
- fuse_log(FUSE_LOG_DEBUG, "flags=0x%016llx\n", flags);
28
+ Enable/disable ``FUSE_HANDLE_KILLPRIV_V2`` support. KILLPRIV_V2 is enabled
19
+ fuse_log(FUSE_LOG_DEBUG, "flags=0x%016" PRIx64 "\n", flags);
29
+ by default as long as the client supports it. Enabling this option helps
20
fuse_log(FUSE_LOG_DEBUG, "max_readahead=0x%08x\n", arg->max_readahead);
30
+ with performance in write path.
21
}
31
+
22
se->conn.proto_major = arg->major;
32
.. option:: --socket-path=PATH
23
@@ -XXX,XX +XXX,XX @@ static void do_init(fuse_req_t req, fuse_ino_t nodeid,
33
24
if (se->conn.want & (~se->conn.capable)) {
34
Listen on vhost-user UNIX domain socket at PATH.
25
fuse_log(FUSE_LOG_ERR,
35
diff --git a/tools/virtiofsd/helper.c b/tools/virtiofsd/helper.c
26
"fuse: error: filesystem requested capabilities "
36
index XXXXXXX..XXXXXXX 100644
27
- "0x%llx that are not supported by kernel, aborting.\n",
37
--- a/tools/virtiofsd/helper.c
28
+ "0x%" PRIx64 " that are not supported by kernel, aborting.\n",
38
+++ b/tools/virtiofsd/helper.c
29
se->conn.want & (~se->conn.capable));
39
@@ -XXX,XX +XXX,XX @@ void fuse_cmdline_help(void)
30
fuse_reply_err(req, EPROTO);
40
" -o announce_submounts Announce sub-mount points to the guest\n"
31
se->error = -EPROTO;
41
" -o posix_acl/no_posix_acl Enable/Disable posix_acl. (default: disabled)\n"
42
" -o security_label/no_security_label Enable/Disable security label. (default: disabled)\n"
43
+ " -o killpriv_v2/no_killpriv_v2\n"
44
+ " Enable/Disable FUSE_HANDLE_KILLPRIV_V2.\n"
45
+ " (default: enabled as long as client supports it)\n"
46
);
47
}
48
49
--
32
--
50
2.35.1
33
2.37.1
diff view generated by jsdifflib

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.