diff options
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch b/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch index 201125c1f4..05dc849dad 100644 --- a/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch +++ b/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch | |||
@@ -51,11 +51,11 @@ Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> | |||
51 | qapi/char.json | 5 +++ | 51 | qapi/char.json | 5 +++ |
52 | 3 files changed, 109 insertions(+) | 52 | 3 files changed, 109 insertions(+) |
53 | 53 | ||
54 | Index: qemu-5.2.0/chardev/char-socket.c | 54 | Index: qemu-6.0.0/chardev/char-socket.c |
55 | =================================================================== | 55 | =================================================================== |
56 | --- qemu-5.2.0.orig/chardev/char-socket.c | 56 | --- qemu-6.0.0.orig/chardev/char-socket.c |
57 | +++ qemu-5.2.0/chardev/char-socket.c | 57 | +++ qemu-6.0.0/chardev/char-socket.c |
58 | @@ -1308,6 +1308,67 @@ static bool qmp_chardev_validate_socket( | 58 | @@ -1362,6 +1362,67 @@ static bool qmp_chardev_validate_socket( |
59 | return true; | 59 | return true; |
60 | } | 60 | } |
61 | 61 | ||
@@ -123,7 +123,7 @@ Index: qemu-5.2.0/chardev/char-socket.c | |||
123 | 123 | ||
124 | static void qmp_chardev_open_socket(Chardev *chr, | 124 | static void qmp_chardev_open_socket(Chardev *chr, |
125 | ChardevBackend *backend, | 125 | ChardevBackend *backend, |
126 | @@ -1316,6 +1377,9 @@ static void qmp_chardev_open_socket(Char | 126 | @@ -1370,6 +1431,9 @@ static void qmp_chardev_open_socket(Char |
127 | { | 127 | { |
128 | SocketChardev *s = SOCKET_CHARDEV(chr); | 128 | SocketChardev *s = SOCKET_CHARDEV(chr); |
129 | ChardevSocket *sock = backend->u.socket.data; | 129 | ChardevSocket *sock = backend->u.socket.data; |
@@ -133,7 +133,7 @@ Index: qemu-5.2.0/chardev/char-socket.c | |||
133 | bool do_nodelay = sock->has_nodelay ? sock->nodelay : false; | 133 | bool do_nodelay = sock->has_nodelay ? sock->nodelay : false; |
134 | bool is_listen = sock->has_server ? sock->server : true; | 134 | bool is_listen = sock->has_server ? sock->server : true; |
135 | bool is_telnet = sock->has_telnet ? sock->telnet : false; | 135 | bool is_telnet = sock->has_telnet ? sock->telnet : false; |
136 | @@ -1381,6 +1445,14 @@ static void qmp_chardev_open_socket(Char | 136 | @@ -1446,6 +1510,14 @@ static void qmp_chardev_open_socket(Char |
137 | 137 | ||
138 | update_disconnected_filename(s); | 138 | update_disconnected_filename(s); |
139 | 139 | ||
@@ -148,7 +148,7 @@ Index: qemu-5.2.0/chardev/char-socket.c | |||
148 | if (s->is_listen) { | 148 | if (s->is_listen) { |
149 | if (qmp_chardev_open_socket_server(chr, is_telnet || is_tn3270, | 149 | if (qmp_chardev_open_socket_server(chr, is_telnet || is_tn3270, |
150 | is_waitconnect, errp) < 0) { | 150 | is_waitconnect, errp) < 0) { |
151 | @@ -1400,6 +1472,9 @@ static void qemu_chr_parse_socket(QemuOp | 151 | @@ -1465,6 +1537,9 @@ static void qemu_chr_parse_socket(QemuOp |
152 | const char *host = qemu_opt_get(opts, "host"); | 152 | const char *host = qemu_opt_get(opts, "host"); |
153 | const char *port = qemu_opt_get(opts, "port"); | 153 | const char *port = qemu_opt_get(opts, "port"); |
154 | const char *fd = qemu_opt_get(opts, "fd"); | 154 | const char *fd = qemu_opt_get(opts, "fd"); |
@@ -158,7 +158,7 @@ Index: qemu-5.2.0/chardev/char-socket.c | |||
158 | #ifdef CONFIG_LINUX | 158 | #ifdef CONFIG_LINUX |
159 | bool tight = qemu_opt_get_bool(opts, "tight", true); | 159 | bool tight = qemu_opt_get_bool(opts, "tight", true); |
160 | bool abstract = qemu_opt_get_bool(opts, "abstract", false); | 160 | bool abstract = qemu_opt_get_bool(opts, "abstract", false); |
161 | @@ -1407,6 +1482,20 @@ static void qemu_chr_parse_socket(QemuOp | 161 | @@ -1472,6 +1547,20 @@ static void qemu_chr_parse_socket(QemuOp |
162 | SocketAddressLegacy *addr; | 162 | SocketAddressLegacy *addr; |
163 | ChardevSocket *sock; | 163 | ChardevSocket *sock; |
164 | 164 | ||
@@ -179,7 +179,7 @@ Index: qemu-5.2.0/chardev/char-socket.c | |||
179 | if ((!!path + !!fd + !!host) != 1) { | 179 | if ((!!path + !!fd + !!host) != 1) { |
180 | error_setg(errp, | 180 | error_setg(errp, |
181 | "Exactly one of 'path', 'fd' or 'host' required"); | 181 | "Exactly one of 'path', 'fd' or 'host' required"); |
182 | @@ -1448,13 +1537,24 @@ static void qemu_chr_parse_socket(QemuOp | 182 | @@ -1522,13 +1611,24 @@ static void qemu_chr_parse_socket(QemuOp |
183 | sock->tls_creds = g_strdup(qemu_opt_get(opts, "tls-creds")); | 183 | sock->tls_creds = g_strdup(qemu_opt_get(opts, "tls-creds")); |
184 | sock->has_tls_authz = qemu_opt_get(opts, "tls-authz"); | 184 | sock->has_tls_authz = qemu_opt_get(opts, "tls-authz"); |
185 | sock->tls_authz = g_strdup(qemu_opt_get(opts, "tls-authz")); | 185 | sock->tls_authz = g_strdup(qemu_opt_get(opts, "tls-authz")); |
@@ -204,11 +204,11 @@ Index: qemu-5.2.0/chardev/char-socket.c | |||
204 | #ifdef CONFIG_LINUX | 204 | #ifdef CONFIG_LINUX |
205 | q_unix->has_tight = true; | 205 | q_unix->has_tight = true; |
206 | q_unix->tight = tight; | 206 | q_unix->tight = tight; |
207 | Index: qemu-5.2.0/chardev/char.c | 207 | Index: qemu-6.0.0/chardev/char.c |
208 | =================================================================== | 208 | =================================================================== |
209 | --- qemu-5.2.0.orig/chardev/char.c | 209 | --- qemu-6.0.0.orig/chardev/char.c |
210 | +++ qemu-5.2.0/chardev/char.c | 210 | +++ qemu-6.0.0/chardev/char.c |
211 | @@ -839,6 +839,9 @@ QemuOptsList qemu_chardev_opts = { | 211 | @@ -840,6 +840,9 @@ QemuOptsList qemu_chardev_opts = { |
212 | .name = "path", | 212 | .name = "path", |
213 | .type = QEMU_OPT_STRING, | 213 | .type = QEMU_OPT_STRING, |
214 | },{ | 214 | },{ |
@@ -218,10 +218,10 @@ Index: qemu-5.2.0/chardev/char.c | |||
218 | .name = "host", | 218 | .name = "host", |
219 | .type = QEMU_OPT_STRING, | 219 | .type = QEMU_OPT_STRING, |
220 | },{ | 220 | },{ |
221 | Index: qemu-5.2.0/qapi/char.json | 221 | Index: qemu-6.0.0/qapi/char.json |
222 | =================================================================== | 222 | =================================================================== |
223 | --- qemu-5.2.0.orig/qapi/char.json | 223 | --- qemu-6.0.0.orig/qapi/char.json |
224 | +++ qemu-5.2.0/qapi/char.json | 224 | +++ qemu-6.0.0/qapi/char.json |
225 | @@ -250,6 +250,10 @@ | 225 | @@ -250,6 +250,10 @@ |
226 | # | 226 | # |
227 | # @addr: socket address to listen on (server=true) | 227 | # @addr: socket address to listen on (server=true) |