[Qemu-devel] [PULL 0/2] Block patches
[PULL 0/3] Block patches
1
The following changes since commit 41feb5b955f0d7c9d071b2c5adbc404ae2895c7a:
1
The following changes since commit 9c125d17e9402c232c46610802e5931b3639d77b:
2
2
3
Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-3.0-pull-request' into staging (2018-06-05 10:38:33 +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
git://github.com/codyprime/qemu-kvm-jtc.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 68acc99f143b60ec4faa2903065b187d4d3c4bf3:
9
for you to fetch changes up to d45c83328feab2e4083991693160f0a417cfd9b0:
10
10
11
sheepdog: remove huge BSS object (2018-06-05 10:15:12 -0400)
11
virtiofsd: Add docs/helper for killpriv_v2/no_killpriv_v2 option (2022-04-21 12:05:15 +0200)
12
12
13
----------------------------------------------------------------
13
----------------------------------------------------------------
14
Sheepdog patches
14
Pull request
15
16
Small contrib/vhost-user-blk, contrib/vhost-user-scsi, and tools/virtiofsd
17
improvements.
18
15
----------------------------------------------------------------
19
----------------------------------------------------------------
16
20
17
Paolo Bonzini (2):
21
Liu Yiding (1):
18
sheepdog: cleanup repeated expression
22
virtiofsd: Add docs/helper for killpriv_v2/no_killpriv_v2 option
19
sheepdog: remove huge BSS object
20
23
21
block/sheepdog.c | 28 +++++++++++++++-------------
24
Sakshi Kaushik (1):
22
1 file changed, 15 insertions(+), 13 deletions(-)
25
Implements Backend Program conventions for vhost-user-scsi
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(-)
23
35
24
--
36
--
25
2.13.6
37
2.35.1
26
27
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
[Qemu-devel] [PULL 2/2] sheepdog: remove huge BSS object
[PULL 2/3] contrib/vhost-user-blk: add missing GOptionEntry NULL terminator
1
From: Paolo Bonzini <pbonzini@redhat.com>
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.
2
5
3
block/sheepdog.o has a 4M static variable that is 90% of QEMU's whole .bss
6
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
4
section. Replace it with a heap-allocated block, and make it smaller too
7
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
5
since only the inode header is actually being used.
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(-)
6
13
7
bss size goes down from 4464280 to 269976.
14
diff --git a/contrib/vhost-user-blk/vhost-user-blk.c b/contrib/vhost-user-blk/vhost-user-blk.c
8
9
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
10
Reviewed-by: Jeff Cody <jcody@redhat.com>
11
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
12
Message-Id: <20180523160721.14018-3-pbonzini@redhat.com>
13
Signed-off-by: Jeff Cody <jcody@redhat.com>
14
---
15
block/sheepdog.c | 22 ++++++++++++----------
16
1 file changed, 12 insertions(+), 10 deletions(-)
17
18
diff --git a/block/sheepdog.c b/block/sheepdog.c
19
index XXXXXXX..XXXXXXX 100644
15
index XXXXXXX..XXXXXXX 100644
20
--- a/block/sheepdog.c
16
--- a/contrib/vhost-user-blk/vhost-user-blk.c
21
+++ b/block/sheepdog.c
17
+++ b/contrib/vhost-user-blk/vhost-user-blk.c
22
@@ -XXX,XX +XXX,XX @@ static int sd_snapshot_list(BlockDriverState *bs, QEMUSnapshotInfo **psn_tab)
18
@@ -XXX,XX +XXX,XX @@ static GOptionEntry entries[] = {
23
QEMUSnapshotInfo *sn_tab = NULL;
19
{"blk-file", 'b', 0, G_OPTION_ARG_FILENAME, &opt_blk_file,
24
unsigned wlen, rlen;
20
"block device or file path", "PATH"},
25
int found = 0;
21
{ "read-only", 'r', 0, G_OPTION_ARG_NONE, &opt_read_only,
26
- static SheepdogInode inode;
22
- "Enable read-only", NULL }
27
+ SheepdogInode *inode;
23
+ "Enable read-only", NULL },
28
unsigned long *vdi_inuse;
24
+ { NULL, },
29
unsigned int start_nr;
25
};
30
uint64_t hval;
26
31
uint32_t vid;
27
int main(int argc, char **argv)
32
33
vdi_inuse = g_malloc(max);
34
+ inode = g_malloc(SD_INODE_HEADER_SIZE);
35
36
fd = connect_to_sdog(s, &local_err);
37
if (fd < 0) {
38
@@ -XXX,XX +XXX,XX @@ static int sd_snapshot_list(BlockDriverState *bs, QEMUSnapshotInfo **psn_tab)
39
}
40
41
/* we don't need to read entire object */
42
- ret = read_object(fd, s->bs, (char *)&inode,
43
+ ret = read_object(fd, s->bs, (char *)inode,
44
vid_to_vdi_oid(vid),
45
0, SD_INODE_HEADER_SIZE, 0,
46
s->cache_flags);
47
@@ -XXX,XX +XXX,XX @@ static int sd_snapshot_list(BlockDriverState *bs, QEMUSnapshotInfo **psn_tab)
48
continue;
49
}
50
51
- if (!strcmp(inode.name, s->name) && is_snapshot(&inode)) {
52
- sn_tab[found].date_sec = inode.snap_ctime >> 32;
53
- sn_tab[found].date_nsec = inode.snap_ctime & 0xffffffff;
54
- sn_tab[found].vm_state_size = inode.vm_state_size;
55
- sn_tab[found].vm_clock_nsec = inode.vm_clock_nsec;
56
+ if (!strcmp(inode->name, s->name) && is_snapshot(inode)) {
57
+ sn_tab[found].date_sec = inode->snap_ctime >> 32;
58
+ sn_tab[found].date_nsec = inode->snap_ctime & 0xffffffff;
59
+ sn_tab[found].vm_state_size = inode->vm_state_size;
60
+ sn_tab[found].vm_clock_nsec = inode->vm_clock_nsec;
61
62
snprintf(sn_tab[found].id_str, sizeof(sn_tab[found].id_str),
63
- "%" PRIu32, inode.snap_id);
64
+ "%" PRIu32, inode->snap_id);
65
pstrcpy(sn_tab[found].name,
66
- MIN(sizeof(sn_tab[found].name), sizeof(inode.tag)),
67
- inode.tag);
68
+ MIN(sizeof(sn_tab[found].name), sizeof(inode->tag)),
69
+ inode->tag);
70
found++;
71
}
72
}
73
@@ -XXX,XX +XXX,XX @@ out:
74
*psn_tab = sn_tab;
75
76
g_free(vdi_inuse);
77
+ g_free(inode);
78
79
if (ret < 0) {
80
return ret;
81
--
28
--
82
2.13.6
29
2.35.1
83
84
diff view generated by jsdifflib
[Qemu-devel] [PULL 1/2] sheepdog: cleanup repeated expression
[PULL 3/3] virtiofsd: Add docs/helper for killpriv_v2/no_killpriv_v2 option
1
From: Paolo Bonzini <pbonzini@redhat.com>
1
From: Liu Yiding <liuyd.fnst@fujitsu.com>
2
2
3
The expression "SD_INODE_SIZE - sizeof(inode.data_vdi_id)" already has a macro
3
virtiofsd has introduced killpriv_v2/no_killpriv_v2 for a while. Add
4
defined for the same value (though with a nicer definition using offsetof).
4
description of it to docs/helper.
5
Replace it.
6
5
7
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
6
Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
8
Reviewed-by: Fam Zheng <famz@redhat.com>
7
Message-Id: <20220421095151.2231099-1-liuyd.fnst@fujitsu.com>
9
Reviewed-by: Jeff Cody <jcody@redhat.com>
8
10
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
9
[Small documentation fixes: s/as client supports/as the client supports/
11
Message-Id: <20180523160721.14018-2-pbonzini@redhat.com>
10
and s/. /. /.
12
Signed-off-by: Jeff Cody <jcody@redhat.com>
11
--Stefan]
12
13
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
13
---
14
---
14
block/sheepdog.c | 6 +++---
15
docs/tools/virtiofsd.rst | 5 +++++
15
1 file changed, 3 insertions(+), 3 deletions(-)
16
tools/virtiofsd/helper.c | 3 +++
17
2 files changed, 8 insertions(+)
16
18
17
diff --git a/block/sheepdog.c b/block/sheepdog.c
19
diff --git a/docs/tools/virtiofsd.rst b/docs/tools/virtiofsd.rst
18
index XXXXXXX..XXXXXXX 100644
20
index XXXXXXX..XXXXXXX 100644
19
--- a/block/sheepdog.c
21
--- a/docs/tools/virtiofsd.rst
20
+++ b/block/sheepdog.c
22
+++ b/docs/tools/virtiofsd.rst
21
@@ -XXX,XX +XXX,XX @@ static int sd_truncate(BlockDriverState *bs, int64_t offset,
23
@@ -XXX,XX +XXX,XX @@ Options
22
}
24
label. Server will try to set that label on newly created file
23
25
atomically wherever possible.
24
/* we don't need to update entire object */
26
25
- datalen = SD_INODE_SIZE - sizeof(s->inode.data_vdi_id);
27
+ * killpriv_v2|no_killpriv_v2 -
26
+ datalen = SD_INODE_HEADER_SIZE;
28
+ Enable/disable ``FUSE_HANDLE_KILLPRIV_V2`` support. KILLPRIV_V2 is enabled
27
s->inode.vdi_size = offset;
29
+ by default as long as the client supports it. Enabling this option helps
28
ret = write_object(fd, s->bs, (char *)&s->inode,
30
+ with performance in write path.
29
vid_to_vdi_oid(s->inode.vdi_id), s->inode.nr_copies,
31
+
30
@@ -XXX,XX +XXX,XX @@ static int sd_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info)
32
.. option:: --socket-path=PATH
31
*/
33
32
strncpy(s->inode.tag, sn_info->name, sizeof(s->inode.tag));
34
Listen on vhost-user UNIX domain socket at PATH.
33
/* we don't need to update entire object */
35
diff --git a/tools/virtiofsd/helper.c b/tools/virtiofsd/helper.c
34
- datalen = SD_INODE_SIZE - sizeof(s->inode.data_vdi_id);
36
index XXXXXXX..XXXXXXX 100644
35
+ datalen = SD_INODE_HEADER_SIZE;
37
--- a/tools/virtiofsd/helper.c
36
inode = g_malloc(datalen);
38
+++ b/tools/virtiofsd/helper.c
37
39
@@ -XXX,XX +XXX,XX @@ void fuse_cmdline_help(void)
38
/* refresh inode. */
40
" -o announce_submounts Announce sub-mount points to the guest\n"
39
@@ -XXX,XX +XXX,XX @@ static int sd_snapshot_list(BlockDriverState *bs, QEMUSnapshotInfo **psn_tab)
41
" -o posix_acl/no_posix_acl Enable/Disable posix_acl. (default: disabled)\n"
40
/* we don't need to read entire object */
42
" -o security_label/no_security_label Enable/Disable security label. (default: disabled)\n"
41
ret = read_object(fd, s->bs, (char *)&inode,
43
+ " -o killpriv_v2/no_killpriv_v2\n"
42
vid_to_vdi_oid(vid),
44
+ " Enable/Disable FUSE_HANDLE_KILLPRIV_V2.\n"
43
- 0, SD_INODE_SIZE - sizeof(inode.data_vdi_id), 0,
45
+ " (default: enabled as long as client supports it)\n"
44
+ 0, SD_INODE_HEADER_SIZE, 0,
46
);
45
s->cache_flags);
47
}
46
48
47
if (ret) {
48
--
49
--
49
2.13.6
50
2.35.1
50
51
diff view generated by jsdifflib

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.