{"id":1571506,"url":"http://patchwork.ozlabs.org/api/patches/1571506/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20211221065855.142578-35-marcandre.lureau@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20211221065855.142578-35-marcandre.lureau@redhat.com>","list_archive_url":null,"date":"2021-12-21T06:58:53","name":"[PULL,v2,34/36] ui/dbus: add chardev backend & interface","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"977867ae4bc1a1dc53447b270cc3a16c0fe12b9a","submitter":{"id":66774,"url":"http://patchwork.ozlabs.org/api/people/66774/?format=json","name":"Marc-André Lureau","email":"marcandre.lureau@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20211221065855.142578-35-marcandre.lureau@redhat.com/mbox/","series":[{"id":277865,"url":"http://patchwork.ozlabs.org/api/series/277865/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=277865","date":"2021-12-21T06:58:19","name":"[PULL,v2,01/36] ui/vdagent: add CHECK_SPICE_PROTOCOL_VERSION","version":2,"mbox":"http://patchwork.ozlabs.org/series/277865/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/1571506/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1571506/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["bilbo.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=fylgcL2x;\n\tdkim-atps=neutral","ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=)","relay.mimecast.com;\n auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby bilbo.ozlabs.org (Postfix) with ESMTPS id 4JJ89D3nJfz9s0r\n\tfor ; Tue, 21 Dec 2021 19:03:44 +1100 (AEDT)","from localhost ([::1]:40186 helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1mza7a-0005A6-90\n\tfor incoming@patchwork.ozlabs.org; Tue, 21 Dec 2021 03:03:42 -0500","from eggs.gnu.org ([209.51.188.92]:59316)\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1mzZGM-00037J-0f\n for qemu-devel@nongnu.org; Tue, 21 Dec 2021 02:08:42 -0500","from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:23777)\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1mzZGJ-0002Zr-J0\n for qemu-devel@nongnu.org; Tue, 21 Dec 2021 02:08:41 -0500","from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com\n [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS\n (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n us-mta-140-IvdnszT7NEey-xXjEa9c0A-1; Tue, 21 Dec 2021 02:08:35 -0500","from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com\n [10.5.11.11])\n (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n (No client certificate requested)\n by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C4A901006AA8;\n Tue, 21 Dec 2021 07:08:34 +0000 (UTC)","from localhost (unknown [10.39.208.37])\n by smtp.corp.redhat.com (Postfix) with ESMTP id 0F0FA7E8EF;\n Tue, 21 Dec 2021 07:08:32 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1640070519;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:content-type:content-type:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=WD+diccYspHcK42TZHiUltG4AN8zRmhAbQNor1ss9pY=;\n b=fylgcL2xLAu/VxHuG6BBQGqf7DY6mfDXnjtUSN573oj9c6LKoX4KfU0nHxBknQLCgZpphQ\n /GDXixrDX8K2JGp1xWU9W4RoPcLVVbfWqDhMJ3ede8qvFlAVxziUJtB3j/A8NfElIO+jzo\n P35ndh6VIv0+lZpj6cb/ura1SJ9G6hQ=","X-MC-Unique":"IvdnszT7NEey-xXjEa9c0A-1","From":"marcandre.lureau@redhat.com","To":"qemu-devel@nongnu.org","Subject":"[PULL v2 34/36] ui/dbus: add chardev backend & interface","Date":"Tue, 21 Dec 2021 10:58:53 +0400","Message-Id":"<20211221065855.142578-35-marcandre.lureau@redhat.com>","In-Reply-To":"<20211221065855.142578-1-marcandre.lureau@redhat.com>","References":"<20211221065855.142578-1-marcandre.lureau@redhat.com>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.11","X-Mimecast-Spam-Score":"0","X-Mimecast-Originator":"redhat.com","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Received-SPF":"pass client-ip=170.10.133.124;\n envelope-from=marcandre.lureau@redhat.com;\n helo=us-smtp-delivery-124.mimecast.com","X-Spam_score_int":"-29","X-Spam_score":"-3.0","X-Spam_bar":"---","X-Spam_report":"(-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.203,\n DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001,\n SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no","X-Spam_action":"no action","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Cc":"peter.maydell@linaro.org, richard.henderson@linaro.org, =?utf-8?q?Marc-A?=\n\t=?utf-8?q?ndr=C3=A9_Lureau?= ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n "},"content":"From: Marc-André Lureau \n\nAdd a new chardev backend which allows D-Bus client to handle the\nchardev stream & events.\n\nSigned-off-by: Marc-André Lureau \nAcked-by: Gerd Hoffmann \n---\n qapi/char.json | 27 ++++\n include/chardev/char-socket.h | 2 +\n include/qemu/dbus.h | 5 +\n ui/dbus.h | 44 +++++\n ui/dbus-chardev.c | 296 ++++++++++++++++++++++++++++++++++\n ui/dbus.c | 26 +++\n ui/dbus-display1.xml | 75 +++++++++\n ui/meson.build | 1 +\n 8 files changed, 476 insertions(+)\n create mode 100644 ui/dbus-chardev.c","diff":"diff --git a/qapi/char.json b/qapi/char.json\nindex f5133a5eeb37..7b421515751b 100644\n--- a/qapi/char.json\n+++ b/qapi/char.json\n@@ -358,6 +358,20 @@\n 'base': 'ChardevCommon',\n 'if': 'CONFIG_SPICE' }\n \n+##\n+# @ChardevDBus:\n+#\n+# Configuration info for DBus chardevs.\n+#\n+# @name: name of the channel (following docs/spice-port-fqdn.txt)\n+#\n+# Since: 7.0\n+##\n+{ 'struct': 'ChardevDBus',\n+ 'data': { 'name': 'str' },\n+ 'base': 'ChardevCommon',\n+ 'if': 'CONFIG_DBUS_DISPLAY' }\n+\n ##\n # @ChardevVC:\n #\n@@ -422,6 +436,7 @@\n # @spicevmc: Since 1.5\n # @spiceport: Since 1.5\n # @qemu-vdagent: Since 6.1\n+# @dbus: Since 7.0\n # @vc: v1.5\n # @ringbuf: Since 1.6\n # @memory: Since 1.5\n@@ -447,6 +462,7 @@\n { 'name': 'spicevmc', 'if': 'CONFIG_SPICE' },\n { 'name': 'spiceport', 'if': 'CONFIG_SPICE' },\n { 'name': 'qemu-vdagent', 'if': 'CONFIG_SPICE_PROTOCOL' },\n+ { 'name': 'dbus', 'if': 'CONFIG_DBUS_DISPLAY' },\n 'vc',\n 'ringbuf',\n # next one is just for compatibility\n@@ -535,6 +551,15 @@\n 'data': { 'data': 'ChardevQemuVDAgent' },\n 'if': 'CONFIG_SPICE_PROTOCOL' }\n \n+##\n+# @ChardevDBusWrapper:\n+#\n+# Since: 7.0\n+##\n+{ 'struct': 'ChardevDBusWrapper',\n+ 'data': { 'data': 'ChardevDBus' },\n+ 'if': 'CONFIG_DBUS_DISPLAY' }\n+\n ##\n # @ChardevVCWrapper:\n #\n@@ -582,6 +607,8 @@\n 'if': 'CONFIG_SPICE' },\n 'qemu-vdagent': { 'type': 'ChardevQemuVDAgentWrapper',\n 'if': 'CONFIG_SPICE_PROTOCOL' },\n+ 'dbus': { 'type': 'ChardevDBusWrapper',\n+ 'if': 'CONFIG_DBUS_DISPLAY' },\n 'vc': 'ChardevVCWrapper',\n 'ringbuf': 'ChardevRingbufWrapper',\n # next one is just for compatibility\ndiff --git a/include/chardev/char-socket.h b/include/chardev/char-socket.h\nindex 1a9274f2e3ac..6b6e2ceba1d7 100644\n--- a/include/chardev/char-socket.h\n+++ b/include/chardev/char-socket.h\n@@ -43,6 +43,8 @@ typedef enum {\n TCP_CHARDEV_STATE_CONNECTED,\n } TCPChardevState;\n \n+typedef ChardevClass SocketChardevClass;\n+\n struct SocketChardev {\n Chardev parent;\n QIOChannel *ioc; /* Client I/O channel */\ndiff --git a/include/qemu/dbus.h b/include/qemu/dbus.h\nindex c0cbb1ca44d3..08f00dfd5342 100644\n--- a/include/qemu/dbus.h\n+++ b/include/qemu/dbus.h\n@@ -12,6 +12,11 @@\n \n #include \n \n+#include \"qom/object.h\"\n+#include \"chardev/char.h\"\n+#include \"qemu/notify.h\"\n+#include \"qemu/typedefs.h\"\n+\n /* glib/gio 2.68 */\n #define DBUS_METHOD_INVOCATION_HANDLED TRUE\n #define DBUS_METHOD_INVOCATION_UNHANDLED FALSE\ndiff --git a/ui/dbus.h b/ui/dbus.h\nindex 3e89eafcab6e..64c77cab4441 100644\n--- a/ui/dbus.h\n+++ b/ui/dbus.h\n@@ -24,6 +24,7 @@\n #ifndef UI_DBUS_H_\n #define UI_DBUS_H_\n \n+#include \"chardev/char-socket.h\"\n #include \"qemu/dbus.h\"\n #include \"qom/object.h\"\n #include \"ui/console.h\"\n@@ -56,11 +57,15 @@ struct DBusDisplay {\n QemuDBusDisplay1Clipboard *clipboard;\n QemuDBusDisplay1Clipboard *clipboard_proxy;\n DBusClipboardRequest clipboard_request[QEMU_CLIPBOARD_SELECTION__COUNT];\n+\n+ Notifier notifier;\n };\n \n #define TYPE_DBUS_DISPLAY \"dbus-display\"\n OBJECT_DECLARE_SIMPLE_TYPE(DBusDisplay, DBUS_DISPLAY)\n \n+void dbus_display_notifier_add(Notifier *notifier);\n+\n #define DBUS_DISPLAY_TYPE_CONSOLE dbus_display_console_get_type()\n G_DECLARE_FINAL_TYPE(DBusDisplayConsole,\n dbus_display_console,\n@@ -95,6 +100,45 @@ dbus_display_listener_get_bus_name(DBusDisplayListener *ddl);\n extern const DisplayChangeListenerOps dbus_gl_dcl_ops;\n extern const DisplayChangeListenerOps dbus_dcl_ops;\n \n+#define TYPE_CHARDEV_DBUS \"chardev-dbus\"\n+\n+typedef struct DBusChardevClass {\n+ SocketChardevClass parent_class;\n+\n+ void (*parent_chr_be_event)(Chardev *s, QEMUChrEvent event);\n+} DBusChardevClass;\n+\n+DECLARE_CLASS_CHECKERS(DBusChardevClass, DBUS_CHARDEV,\n+ TYPE_CHARDEV_DBUS)\n+\n+typedef struct DBusChardev {\n+ SocketChardev parent;\n+\n+ bool exported;\n+ QemuDBusDisplay1Chardev *iface;\n+} DBusChardev;\n+\n+DECLARE_INSTANCE_CHECKER(DBusChardev, DBUS_CHARDEV, TYPE_CHARDEV_DBUS)\n+\n+#define CHARDEV_IS_DBUS(chr) \\\n+ object_dynamic_cast(OBJECT(chr), TYPE_CHARDEV_DBUS)\n+\n+typedef enum {\n+ DBUS_DISPLAY_CHARDEV_OPEN,\n+ DBUS_DISPLAY_CHARDEV_CLOSE,\n+} DBusDisplayEventType;\n+\n+typedef struct DBusDisplayEvent {\n+ DBusDisplayEventType type;\n+ union {\n+ DBusChardev *chardev;\n+ };\n+} DBusDisplayEvent;\n+\n+void dbus_display_notify(DBusDisplayEvent *event);\n+\n+void dbus_chardev_init(DBusDisplay *dpy);\n+\n void dbus_clipboard_init(DBusDisplay *dpy);\n \n #endif /* UI_DBUS_H_ */\ndiff --git a/ui/dbus-chardev.c b/ui/dbus-chardev.c\nnew file mode 100644\nindex 000000000000..940ef937cdf1\n--- /dev/null\n+++ b/ui/dbus-chardev.c\n@@ -0,0 +1,296 @@\n+/*\n+ * QEMU DBus display\n+ *\n+ * Copyright (c) 2021 Marc-André Lureau \n+ *\n+ * Permission is hereby granted, free of charge, to any person obtaining a copy\n+ * of this software and associated documentation files (the \"Software\"), to deal\n+ * in the Software without restriction, including without limitation the rights\n+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n+ * copies of the Software, and to permit persons to whom the Software is\n+ * furnished to do so, subject to the following conditions:\n+ *\n+ * The above copyright notice and this permission notice shall be included in\n+ * all copies or substantial portions of the Software.\n+ *\n+ * THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL\n+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n+ * THE SOFTWARE.\n+ */\n+#include \"qemu/osdep.h\"\n+#include \"trace.h\"\n+#include \"qapi/error.h\"\n+#include \"qemu/config-file.h\"\n+#include \"qemu/option.h\"\n+\n+#include \n+\n+#include \"dbus.h\"\n+\n+static char *\n+dbus_display_chardev_path(DBusChardev *chr)\n+{\n+ return g_strdup_printf(DBUS_DISPLAY1_ROOT \"/Chardev_%s\",\n+ CHARDEV(chr)->label);\n+}\n+\n+static void\n+dbus_display_chardev_export(DBusDisplay *dpy, DBusChardev *chr)\n+{\n+ g_autoptr(GDBusObjectSkeleton) sk = NULL;\n+ g_autofree char *path = dbus_display_chardev_path(chr);\n+\n+ if (chr->exported) {\n+ return;\n+ }\n+\n+ sk = g_dbus_object_skeleton_new(path);\n+ g_dbus_object_skeleton_add_interface(\n+ sk, G_DBUS_INTERFACE_SKELETON(chr->iface));\n+ g_dbus_object_manager_server_export(dpy->server, sk);\n+ chr->exported = true;\n+}\n+\n+static void\n+dbus_display_chardev_unexport(DBusDisplay *dpy, DBusChardev *chr)\n+{\n+ g_autofree char *path = dbus_display_chardev_path(chr);\n+\n+ if (!chr->exported) {\n+ return;\n+ }\n+\n+ g_dbus_object_manager_server_unexport(dpy->server, path);\n+ chr->exported = false;\n+}\n+\n+static int\n+dbus_display_chardev_foreach(Object *obj, void *data)\n+{\n+ DBusDisplay *dpy = DBUS_DISPLAY(data);\n+\n+ if (!CHARDEV_IS_DBUS(obj)) {\n+ return 0;\n+ }\n+\n+ dbus_display_chardev_export(dpy, DBUS_CHARDEV(obj));\n+\n+ return 0;\n+}\n+\n+static void\n+dbus_display_on_notify(Notifier *notifier, void *data)\n+{\n+ DBusDisplay *dpy = container_of(notifier, DBusDisplay, notifier);\n+ DBusDisplayEvent *event = data;\n+\n+ switch (event->type) {\n+ case DBUS_DISPLAY_CHARDEV_OPEN:\n+ dbus_display_chardev_export(dpy, event->chardev);\n+ break;\n+ case DBUS_DISPLAY_CHARDEV_CLOSE:\n+ dbus_display_chardev_unexport(dpy, event->chardev);\n+ break;\n+ }\n+}\n+\n+void\n+dbus_chardev_init(DBusDisplay *dpy)\n+{\n+ dpy->notifier.notify = dbus_display_on_notify;\n+ dbus_display_notifier_add(&dpy->notifier);\n+\n+ object_child_foreach(container_get(object_get_root(), \"/chardevs\"),\n+ dbus_display_chardev_foreach, dpy);\n+}\n+\n+static gboolean\n+dbus_chr_register(\n+ DBusChardev *dc,\n+ GDBusMethodInvocation *invocation,\n+ GUnixFDList *fd_list,\n+ GVariant *arg_stream,\n+ QemuDBusDisplay1Chardev *object)\n+{\n+ g_autoptr(GError) err = NULL;\n+ int fd;\n+\n+ fd = g_unix_fd_list_get(fd_list, g_variant_get_handle(arg_stream), &err);\n+ if (err) {\n+ g_dbus_method_invocation_return_error(\n+ invocation,\n+ DBUS_DISPLAY_ERROR,\n+ DBUS_DISPLAY_ERROR_FAILED,\n+ \"Couldn't get peer FD: %s\", err->message);\n+ return DBUS_METHOD_INVOCATION_HANDLED;\n+ }\n+\n+ if (qemu_chr_add_client(CHARDEV(dc), fd) < 0) {\n+ g_dbus_method_invocation_return_error(invocation,\n+ DBUS_DISPLAY_ERROR,\n+ DBUS_DISPLAY_ERROR_FAILED,\n+ \"Couldn't register FD!\");\n+ close(fd);\n+ return DBUS_METHOD_INVOCATION_HANDLED;\n+ }\n+\n+ g_object_set(dc->iface,\n+ \"owner\", g_dbus_method_invocation_get_sender(invocation),\n+ NULL);\n+\n+ qemu_dbus_display1_chardev_complete_register(object, invocation, NULL);\n+ return DBUS_METHOD_INVOCATION_HANDLED;\n+}\n+\n+static gboolean\n+dbus_chr_send_break(\n+ DBusChardev *dc,\n+ GDBusMethodInvocation *invocation,\n+ QemuDBusDisplay1Chardev *object)\n+{\n+ qemu_chr_be_event(CHARDEV(dc), CHR_EVENT_BREAK);\n+\n+ qemu_dbus_display1_chardev_complete_send_break(object, invocation);\n+ return DBUS_METHOD_INVOCATION_HANDLED;\n+}\n+\n+static void\n+dbus_chr_open(Chardev *chr, ChardevBackend *backend,\n+ bool *be_opened, Error **errp)\n+{\n+ ERRP_GUARD();\n+\n+ DBusChardev *dc = DBUS_CHARDEV(chr);\n+ DBusDisplayEvent event = {\n+ .type = DBUS_DISPLAY_CHARDEV_OPEN,\n+ .chardev = dc,\n+ };\n+ g_autoptr(ChardevBackend) be = NULL;\n+ g_autoptr(QemuOpts) opts = NULL;\n+\n+ dc->iface = qemu_dbus_display1_chardev_skeleton_new();\n+ g_object_set(dc->iface, \"name\", backend->u.dbus.data->name, NULL);\n+ g_object_connect(dc->iface,\n+ \"swapped-signal::handle-register\",\n+ dbus_chr_register, dc,\n+ \"swapped-signal::handle-send-break\",\n+ dbus_chr_send_break, dc,\n+ NULL);\n+\n+ dbus_display_notify(&event);\n+\n+ be = g_new0(ChardevBackend, 1);\n+ opts = qemu_opts_create(qemu_find_opts(\"chardev\"), NULL, 0, &error_abort);\n+ qemu_opt_set(opts, \"server\", \"on\", &error_abort);\n+ qemu_opt_set(opts, \"wait\", \"off\", &error_abort);\n+ CHARDEV_CLASS(object_class_by_name(TYPE_CHARDEV_SOCKET))->parse(\n+ opts, be, errp);\n+ if (*errp) {\n+ return;\n+ }\n+ CHARDEV_CLASS(object_class_by_name(TYPE_CHARDEV_SOCKET))->open(\n+ chr, be, be_opened, errp);\n+}\n+\n+static void\n+dbus_chr_set_fe_open(Chardev *chr, int fe_open)\n+{\n+ DBusChardev *dc = DBUS_CHARDEV(chr);\n+\n+ g_object_set(dc->iface, \"feopened\", fe_open, NULL);\n+}\n+\n+static void\n+dbus_chr_set_echo(Chardev *chr, bool echo)\n+{\n+ DBusChardev *dc = DBUS_CHARDEV(chr);\n+\n+ g_object_set(dc->iface, \"echo\", echo, NULL);\n+}\n+\n+static void\n+dbus_chr_be_event(Chardev *chr, QEMUChrEvent event)\n+{\n+ DBusChardev *dc = DBUS_CHARDEV(chr);\n+ DBusChardevClass *klass = DBUS_CHARDEV_GET_CLASS(chr);\n+\n+ switch (event) {\n+ case CHR_EVENT_CLOSED:\n+ if (dc->iface) {\n+ /* on finalize, iface is set to NULL */\n+ g_object_set(dc->iface, \"owner\", \"\", NULL);\n+ }\n+ break;\n+ default:\n+ break;\n+ };\n+\n+ klass->parent_chr_be_event(chr, event);\n+}\n+\n+static void\n+dbus_chr_parse(QemuOpts *opts, ChardevBackend *backend,\n+ Error **errp)\n+{\n+ const char *name = qemu_opt_get(opts, \"name\");\n+ ChardevDBus *dbus;\n+\n+ if (name == NULL) {\n+ error_setg(errp, \"chardev: dbus: no name given\");\n+ return;\n+ }\n+\n+ backend->type = CHARDEV_BACKEND_KIND_DBUS;\n+ dbus = backend->u.dbus.data = g_new0(ChardevDBus, 1);\n+ qemu_chr_parse_common(opts, qapi_ChardevDBus_base(dbus));\n+ dbus->name = g_strdup(name);\n+}\n+\n+static void\n+char_dbus_class_init(ObjectClass *oc, void *data)\n+{\n+ DBusChardevClass *klass = DBUS_CHARDEV_CLASS(oc);\n+ ChardevClass *cc = CHARDEV_CLASS(oc);\n+\n+ cc->parse = dbus_chr_parse;\n+ cc->open = dbus_chr_open;\n+ cc->chr_set_fe_open = dbus_chr_set_fe_open;\n+ cc->chr_set_echo = dbus_chr_set_echo;\n+ klass->parent_chr_be_event = cc->chr_be_event;\n+ cc->chr_be_event = dbus_chr_be_event;\n+}\n+\n+static void\n+char_dbus_finalize(Object *obj)\n+{\n+ DBusChardev *dc = DBUS_CHARDEV(obj);\n+ DBusDisplayEvent event = {\n+ .type = DBUS_DISPLAY_CHARDEV_CLOSE,\n+ .chardev = dc,\n+ };\n+\n+ dbus_display_notify(&event);\n+ g_clear_object(&dc->iface);\n+}\n+\n+static const TypeInfo char_dbus_type_info = {\n+ .name = TYPE_CHARDEV_DBUS,\n+ .parent = TYPE_CHARDEV_SOCKET,\n+ .class_size = sizeof(DBusChardevClass),\n+ .instance_size = sizeof(DBusChardev),\n+ .instance_finalize = char_dbus_finalize,\n+ .class_init = char_dbus_class_init,\n+};\n+module_obj(TYPE_CHARDEV_DBUS);\n+\n+static void\n+register_types(void)\n+{\n+ type_register_static(&char_dbus_type_info);\n+}\n+\n+type_init(register_types);\ndiff --git a/ui/dbus.c b/ui/dbus.c\nindex 4f0bc293aaa0..41f1716f255a 100644\n--- a/ui/dbus.c\n+++ b/ui/dbus.c\n@@ -55,6 +55,27 @@ static const DisplayGLCtxOps dbus_gl_ops = {\n .dpy_gl_ctx_make_current = qemu_egl_make_context_current,\n };\n \n+static NotifierList dbus_display_notifiers =\n+ NOTIFIER_LIST_INITIALIZER(dbus_display_notifiers);\n+\n+void\n+dbus_display_notifier_add(Notifier *notifier)\n+{\n+ notifier_list_add(&dbus_display_notifiers, notifier);\n+}\n+\n+static void\n+dbus_display_notifier_remove(Notifier *notifier)\n+{\n+ notifier_remove(notifier);\n+}\n+\n+void\n+dbus_display_notify(DBusDisplayEvent *event)\n+{\n+ notifier_list_notify(&dbus_display_notifiers, event);\n+}\n+\n static void\n dbus_display_init(Object *o)\n {\n@@ -73,6 +94,7 @@ dbus_display_init(Object *o)\n g_dbus_object_manager_server_export(dd->server, vm);\n \n dbus_clipboard_init(dd);\n+ dbus_chardev_init(dd);\n }\n \n static void\n@@ -80,6 +102,10 @@ dbus_display_finalize(Object *o)\n {\n DBusDisplay *dd = DBUS_DISPLAY(o);\n \n+ if (dd->notifier.notify) {\n+ dbus_display_notifier_remove(&dd->notifier);\n+ }\n+\n qemu_clipboard_peer_unregister(&dd->clipboard_peer);\n g_clear_object(&dd->clipboard);\n \ndiff --git a/ui/dbus-display1.xml b/ui/dbus-display1.xml\nindex 767562ad1ea3..c3b2293376d7 100644\n--- a/ui/dbus-display1.xml\n+++ b/ui/dbus-display1.xml\n@@ -683,4 +683,79 @@\n \n \n \n+\n+ \n+ \n+ \n+ \n+ \n+ \n+\n+ \n+ \n+\n+ \n+ \n+\n+ \n+ \n+\n+ \n+ \n+\n+ \n+ \n+ \n \ndiff --git a/ui/meson.build b/ui/meson.build\nindex 8982ab63c4df..64286ba1503a 100644\n--- a/ui/meson.build\n+++ b/ui/meson.build\n@@ -82,6 +82,7 @@ if dbus_display\n '--generate-c-code', '@BASENAME@'])\n dbus_ss.add(when: [gio, pixman, opengl, 'CONFIG_GIO'],\n if_true: [files(\n+ 'dbus-chardev.c',\n 'dbus-clipboard.c',\n 'dbus-console.c',\n 'dbus-error.c',\n","prefixes":["PULL","v2","34/36"]}