[PULL for-5.0 0/4] Block patches
[PULL 0/3] Block patches
1
The following changes since commit 27c94566379069fb8930bb1433dcffbf7df3203d:
1
The following changes since commit 9c125d17e9402c232c46610802e5931b3639d77b:
2
2
3
Merge remote-tracking branch 'remotes/edgar/tags/edgar/xilinx-next-2020-04-30.for-upstream' into staging (2020-04-30 16:47:23 +0100)
3
Merge tag 'pull-tcg-20220420' of https://gitlab.com/rth7680/qemu into staging (2022-04-20 16:43:11 -0700)
4
4
5
are available in the Git repository at:
5
are available in the Git repository at:
6
6
7
https://github.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 cc1adc4488059ac16d4d2772a7aa7cd1323deeca:
9
for you to fetch changes up to d45c83328feab2e4083991693160f0a417cfd9b0:
10
10
11
lockable: Replace locks with lock guard macros (2020-05-01 09:19:25 +0100)
11
virtiofsd: Add docs/helper for killpriv_v2/no_killpriv_v2 option (2022-04-21 12:05:15 +0200)
12
12
13
----------------------------------------------------------------
13
----------------------------------------------------------------
14
Pull request
14
Pull request
15
15
16
Fix the QEMU_LOCK_GUARD() macros, use them more widely, and allow fuzzer
16
Small contrib/vhost-user-blk, contrib/vhost-user-scsi, and tools/virtiofsd
17
targets to be invoked depending on argv[0].
17
improvements.
18
18
19
----------------------------------------------------------------
19
----------------------------------------------------------------
20
20
21
Alexander Bulekov (1):
21
Liu Yiding (1):
22
fuzz: select fuzz target using executable name
22
virtiofsd: Add docs/helper for killpriv_v2/no_killpriv_v2 option
23
23
24
Daniel Brodsky (2):
24
Sakshi Kaushik (1):
25
lockable: fix __COUNTER__ macro to be referenced properly
25
Implements Backend Program conventions for vhost-user-scsi
26
lockable: replaced locks with lock guard macros where appropriate
27
26
28
Simran Singhal (1):
27
Stefan Hajnoczi (1):
29
lockable: Replace locks with lock guard macros
28
contrib/vhost-user-blk: add missing GOptionEntry NULL terminator
30
29
31
include/qemu/lockable.h | 7 +++---
30
docs/tools/virtiofsd.rst | 5 ++
32
include/qemu/rcu.h | 2 +-
31
contrib/vhost-user-blk/vhost-user-blk.c | 3 +-
33
block/iscsi.c | 7 ++----
32
contrib/vhost-user-scsi/vhost-user-scsi.c | 77 +++++++++++++++--------
34
block/nfs.c | 51 +++++++++++++++++++----------------------
33
tools/virtiofsd/helper.c | 3 +
35
cpus-common.c | 14 ++++-------
34
4 files changed, 62 insertions(+), 26 deletions(-)
36
hw/display/qxl.c | 43 ++++++++++++++++------------------
37
hw/hyperv/hyperv.c | 15 ++++++------
38
hw/rdma/rdma_backend.c | 50 ++++++++++++++++++++--------------------
39
hw/rdma/rdma_rm.c | 3 +--
40
hw/vfio/platform.c | 5 ++--
41
migration/migration.c | 3 +--
42
migration/multifd.c | 8 +++----
43
migration/ram.c | 3 +--
44
monitor/misc.c | 4 +---
45
tests/qtest/fuzz/fuzz.c | 19 ++++++++-------
46
ui/spice-display.c | 14 +++++------
47
util/log.c | 4 ++--
48
util/qemu-timer.c | 17 +++++++-------
49
util/rcu.c | 8 +++----
50
util/thread-pool.c | 3 +--
51
util/vfio-helpers.c | 5 ++--
52
slirp | 2 +-
53
22 files changed, 133 insertions(+), 154 deletions(-)
54
35
55
--
36
--
56
2.25.3
37
2.35.1
57
diff view generated by jsdifflib
New patch
[PULL 1/3] Implements Backend Program conventions for vhost-user-scsi
1
From: Sakshi Kaushik <sakshikaushik717@gmail.com>
1
2
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
New patch
[PULL 2/3] contrib/vhost-user-blk: add missing GOptionEntry NULL terminator
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.
1
5
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 for-5.0 1/4] fuzz: select fuzz target using executable name
[PULL 3/3] virtiofsd: Add docs/helper for killpriv_v2/no_killpriv_v2 option
1
From: Alexander Bulekov <alxndr@bu.edu>
1
From: Liu Yiding <liuyd.fnst@fujitsu.com>
2
2
3
The fuzzers are built into a binary (e.g. qemu-fuzz-i386). To select the
3
virtiofsd has introduced killpriv_v2/no_killpriv_v2 for a while. Add
4
device to fuzz/fuzz target, we usually use the --fuzz-target= argument.
4
description of it to docs/helper.
5
This commit allows the fuzz-target to be specified using the name of the
6
executable. If the executable name ends with -target-FUZZ_TARGET, then
7
we select the fuzz target based on this name, rather than the
8
--fuzz-target argument. This is useful for systems such as oss-fuzz
9
where we don't have control of the arguments passed to the fuzzer.
10
5
11
[Fixed incorrect indentation.
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/. /. /.
12
--Stefan]
11
--Stefan]
13
12
14
Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
15
Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
16
Message-id: 20200421182230.6313-1-alxndr@bu.edu
17
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
13
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
18
---
14
---
19
tests/qtest/fuzz/fuzz.c | 19 +++++++++++--------
15
docs/tools/virtiofsd.rst | 5 +++++
20
slirp | 2 +-
16
tools/virtiofsd/helper.c | 3 +++
21
2 files changed, 12 insertions(+), 9 deletions(-)
17
2 files changed, 8 insertions(+)
22
18
23
diff --git a/tests/qtest/fuzz/fuzz.c b/tests/qtest/fuzz/fuzz.c
19
diff --git a/docs/tools/virtiofsd.rst b/docs/tools/virtiofsd.rst
24
index XXXXXXX..XXXXXXX 100644
20
index XXXXXXX..XXXXXXX 100644
25
--- a/tests/qtest/fuzz/fuzz.c
21
--- a/docs/tools/virtiofsd.rst
26
+++ b/tests/qtest/fuzz/fuzz.c
22
+++ b/docs/tools/virtiofsd.rst
27
@@ -XXX,XX +XXX,XX @@ static void usage(char *path)
23
@@ -XXX,XX +XXX,XX @@ Options
28
printf(" * %s : %s\n", tmp->target->name,
24
label. Server will try to set that label on newly created file
29
tmp->target->description);
25
atomically wherever possible.
30
}
26
31
+ printf("Alternatively, add -target-FUZZ_TARGET to the executable name\n");
27
+ * killpriv_v2|no_killpriv_v2 -
32
exit(0);
28
+ Enable/disable ``FUSE_HANDLE_KILLPRIV_V2`` support. KILLPRIV_V2 is enabled
29
+ by default as long as the client supports it. Enabling this option helps
30
+ with performance in write path.
31
+
32
.. option:: --socket-path=PATH
33
34
Listen on vhost-user UNIX domain socket at PATH.
35
diff --git a/tools/virtiofsd/helper.c b/tools/virtiofsd/helper.c
36
index XXXXXXX..XXXXXXX 100644
37
--- a/tools/virtiofsd/helper.c
38
+++ b/tools/virtiofsd/helper.c
39
@@ -XXX,XX +XXX,XX @@ void fuse_cmdline_help(void)
40
" -o announce_submounts Announce sub-mount points to the guest\n"
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
);
33
}
47
}
34
48
35
@@ -XXX,XX +XXX,XX @@ int LLVMFuzzerInitialize(int *argc, char ***argv, char ***envp)
36
module_call_init(MODULE_INIT_QOM);
37
module_call_init(MODULE_INIT_LIBQOS);
38
39
- if (*argc <= 1) {
40
+ target_name = strstr(**argv, "-target-");
41
+ if (target_name) { /* The binary name specifies the target */
42
+ target_name += strlen("-target-");
43
+ } else if (*argc > 1) { /* The target is specified as an argument */
44
+ target_name = (*argv)[1];
45
+ if (!strstr(target_name, "--fuzz-target=")) {
46
+ usage(**argv);
47
+ }
48
+ target_name += strlen("--fuzz-target=");
49
+ } else {
50
usage(**argv);
51
}
52
53
/* Identify the fuzz target */
54
- target_name = (*argv)[1];
55
- if (!strstr(target_name, "--fuzz-target=")) {
56
- usage(**argv);
57
- }
58
-
59
- target_name += strlen("--fuzz-target=");
60
-
61
fuzz_target = fuzz_get_target(target_name);
62
if (!fuzz_target) {
63
usage(**argv);
64
diff --git a/slirp b/slirp
65
index XXXXXXX..XXXXXXX 160000
66
--- a/slirp
67
+++ b/slirp
68
@@ -1 +1 @@
69
-Subproject commit 2faae0f778f818fadc873308f983289df697eb93
70
+Subproject commit 55ab21c9a36852915b81f1b41ebaf3b6509dd8ba
71
--
49
--
72
2.25.3
50
2.35.1
73
diff view generated by jsdifflib

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.