diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-12-19 14:57:27 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-12-20 15:28:57 +0000 |
commit | c1685b06e5f3684b1b5631b99b412e3ec2b10800 (patch) | |
tree | a0d0a1697e43f6761c2a373581573e23f9969752 /meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch | |
parent | a698cc12ac2d5b26b2415e3d14739d3f51b89dd1 (diff) | |
download | openembedded-core-contrib-c1685b06e5f3684b1b5631b99b412e3ec2b10800.tar.gz |
qemu: Upgrade 6.1.0 -> 6.2.0
Add config option for pulseaudio
Change audio to default mode since quoting of list of devices is broken in meson
Drop patch where code changed completed upstream
Refresh other patches
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 | 30 |
1 files changed, 15 insertions, 15 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 05dc849dad..cf8b0e7a45 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,10 +51,10 @@ Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> qapi/char.json | 5 +++ 3 files changed, 109 insertions(+) -Index: qemu-6.0.0/chardev/char-socket.c +Index: qemu-6.2.0/chardev/char-socket.c =================================================================== ---- qemu-6.0.0.orig/chardev/char-socket.c -+++ qemu-6.0.0/chardev/char-socket.c +--- qemu-6.2.0.orig/chardev/char-socket.c ++++ qemu-6.2.0/chardev/char-socket.c @@ -1362,6 +1362,67 @@ static bool qmp_chardev_validate_socket( return true; } @@ -133,7 +133,7 @@ Index: qemu-6.0.0/chardev/char-socket.c bool do_nodelay = sock->has_nodelay ? sock->nodelay : false; bool is_listen = sock->has_server ? sock->server : true; bool is_telnet = sock->has_telnet ? sock->telnet : false; -@@ -1446,6 +1510,14 @@ static void qmp_chardev_open_socket(Char +@@ -1440,6 +1504,14 @@ static void qmp_chardev_open_socket(Char update_disconnected_filename(s); @@ -148,7 +148,7 @@ Index: qemu-6.0.0/chardev/char-socket.c if (s->is_listen) { if (qmp_chardev_open_socket_server(chr, is_telnet || is_tn3270, is_waitconnect, errp) < 0) { -@@ -1465,6 +1537,9 @@ static void qemu_chr_parse_socket(QemuOp +@@ -1459,6 +1531,9 @@ static void qemu_chr_parse_socket(QemuOp const char *host = qemu_opt_get(opts, "host"); const char *port = qemu_opt_get(opts, "port"); const char *fd = qemu_opt_get(opts, "fd"); @@ -158,7 +158,7 @@ Index: qemu-6.0.0/chardev/char-socket.c #ifdef CONFIG_LINUX bool tight = qemu_opt_get_bool(opts, "tight", true); bool abstract = qemu_opt_get_bool(opts, "abstract", false); -@@ -1472,6 +1547,20 @@ static void qemu_chr_parse_socket(QemuOp +@@ -1466,6 +1541,20 @@ static void qemu_chr_parse_socket(QemuOp SocketAddressLegacy *addr; ChardevSocket *sock; @@ -179,7 +179,7 @@ Index: qemu-6.0.0/chardev/char-socket.c if ((!!path + !!fd + !!host) != 1) { error_setg(errp, "Exactly one of 'path', 'fd' or 'host' required"); -@@ -1522,13 +1611,24 @@ static void qemu_chr_parse_socket(QemuOp +@@ -1516,13 +1605,24 @@ static void qemu_chr_parse_socket(QemuOp sock->tls_creds = g_strdup(qemu_opt_get(opts, "tls-creds")); sock->has_tls_authz = qemu_opt_get(opts, "tls-authz"); sock->tls_authz = g_strdup(qemu_opt_get(opts, "tls-authz")); @@ -194,7 +194,7 @@ Index: qemu-6.0.0/chardev/char-socket.c if (path) { +#endif UnixSocketAddress *q_unix; - addr->type = SOCKET_ADDRESS_LEGACY_KIND_UNIX; + addr->type = SOCKET_ADDRESS_TYPE_UNIX; q_unix = addr->u.q_unix.data = g_new0(UnixSocketAddress, 1); +#ifndef _WIN32 + q_unix->path = cmd ? g_strdup_printf("cmd:%s", cmd) : g_strdup(path); @@ -204,11 +204,11 @@ Index: qemu-6.0.0/chardev/char-socket.c #ifdef CONFIG_LINUX q_unix->has_tight = true; q_unix->tight = tight; -Index: qemu-6.0.0/chardev/char.c +Index: qemu-6.2.0/chardev/char.c =================================================================== ---- qemu-6.0.0.orig/chardev/char.c -+++ qemu-6.0.0/chardev/char.c -@@ -840,6 +840,9 @@ QemuOptsList qemu_chardev_opts = { +--- qemu-6.2.0.orig/chardev/char.c ++++ qemu-6.2.0/chardev/char.c +@@ -836,6 +836,9 @@ QemuOptsList qemu_chardev_opts = { .name = "path", .type = QEMU_OPT_STRING, },{ @@ -218,10 +218,10 @@ Index: qemu-6.0.0/chardev/char.c .name = "host", .type = QEMU_OPT_STRING, },{ -Index: qemu-6.0.0/qapi/char.json +Index: qemu-6.2.0/qapi/char.json =================================================================== ---- qemu-6.0.0.orig/qapi/char.json -+++ qemu-6.0.0/qapi/char.json +--- qemu-6.2.0.orig/qapi/char.json ++++ qemu-6.2.0/qapi/char.json @@ -250,6 +250,10 @@ # # @addr: socket address to listen on (server=true) |