From nobody Tue Feb 10 14:33:28 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1638455148; cv=none; d=zohomail.com; s=zohoarc; b=NsnUKQlOLxRYHBl59aX9li/Cfr2T2C5+6NCT0kx/I55yqX0kMahuunpmjutYasrfzR6UTQKt5oeEPJFbGXUh9DHmymzlSUQcMVVhS64cnCoJKQB6KxjzTc1T+tL8tNrNiJajDMYvAZFa8JRqhn6rTU4iPNvoOYtFqPUUV7Ds+98= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1638455148; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ToiJJ6b2kehqIDYMJbQHvrn+M7vMQxrzNsJqniJRxAQ=; b=eg5Rb5HnkUs9+k+YAUYXIQOwm/qiTCZcd7tA+PGYDIS3o/ggQnX8LVOqr7ZFvnAuN2KIzenBwOEcpJhKEC+sOaJwl04gus5qf6L1Sujt5G9cgdT7d3goHuHHuqH0Ukknz1tADqBZRspx8sV0nM1gHH0mO92GVICPsz/dFUyJRRE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1638455148595873.1087986369228; Thu, 2 Dec 2021 06:25:48 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-392-_ICw_ehbMMmHgyTy4dDxUQ-1; Thu, 02 Dec 2021 09:25:45 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3BF989115D; Thu, 2 Dec 2021 14:25:40 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1835A5F4E1; Thu, 2 Dec 2021 14:25:40 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id DDFA41806D2B; Thu, 2 Dec 2021 14:25:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1B2EPcqw027759 for ; Thu, 2 Dec 2021 09:25:38 -0500 Received: by smtp.corp.redhat.com (Postfix) id 5C0EF6060F; Thu, 2 Dec 2021 14:25:38 +0000 (UTC) Received: from localhost (unknown [10.2.14.11]) by smtp.corp.redhat.com (Postfix) with ESMTP id F1AEC694BF; Thu, 2 Dec 2021 14:25:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1638455147; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ToiJJ6b2kehqIDYMJbQHvrn+M7vMQxrzNsJqniJRxAQ=; b=VfpI3nweSBJdhZBqjukZkkvEvCM+A4E8qZMQXq+qnyQ+PMoalULZ6QQxKqmwAtJjQBQOm2 4a96VU7IwUxzD2xabdEi14BANQQENbSp+csCCquDh1+qBeIqQkuhGos8hFvGF6L7/3EsL2 bxlO/xDMU+vL76GzKds53YUbPOuqyf4= X-MC-Unique: _ICw_ehbMMmHgyTy4dDxUQ-1 From: marcandre.lureau@redhat.com To: libvir-list@redhat.com Subject: [libvirt PATCH v2 13/15] qemu: add -chardev dbus support Date: Thu, 2 Dec 2021 18:24:09 +0400 Message-Id: <20211202142411.1718032-14-marcandre.lureau@redhat.com> In-Reply-To: <20211202142411.1718032-1-marcandre.lureau@redhat.com> References: <20211202142411.1718032-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: mprivozn@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1638455150134100003 From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau --- src/qemu/qemu_command.c | 8 +++++ src/qemu/qemu_monitor_json.c | 9 ++++++ .../graphics-dbus-chardev.args | 32 +++++++++++++++++++ tests/qemuxml2argvtest.c | 4 +++ 4 files changed, 53 insertions(+) create mode 100644 tests/qemuxml2argvdata/graphics-dbus-chardev.args diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 308ccbf72a1a..582f41ada9ee 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5298,6 +5298,14 @@ qemuBuildChrChardevStr(virLogManager *logManager, break; =20 case VIR_DOMAIN_CHR_TYPE_DBUS: + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DISPLAY_DBUS)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("D-Bus chardev is not supported")); + } + virBufferAsprintf(&buf, "dbus,id=3D%s,name=3D%s", charAlias, + dev->data.dbus.channel); + break; + case VIR_DOMAIN_CHR_TYPE_NMDM: case VIR_DOMAIN_CHR_TYPE_LAST: default: diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index c0906fe70f8f..ada987d0a4d5 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -6773,6 +6773,15 @@ qemuMonitorJSONAttachCharDevGetProps(const char *chr= ID, break; =20 case VIR_DOMAIN_CHR_TYPE_DBUS: + backendType =3D "dbus"; + + if (virJSONValueObjectAdd(&backendData, + "s:name", chr->data.dbus.channel, + NULL) < 0) + return NULL; + + break; + case VIR_DOMAIN_CHR_TYPE_SPICEPORT: case VIR_DOMAIN_CHR_TYPE_PIPE: case VIR_DOMAIN_CHR_TYPE_STDIO: diff --git a/tests/qemuxml2argvdata/graphics-dbus-chardev.args b/tests/qemu= xml2argvdata/graphics-dbus-chardev.args new file mode 100644 index 000000000000..98debbbfa775 --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-dbus-chardev.args @@ -0,0 +1,32 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-i386 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ +-machine pc,usb=3Doff,dump-guest-core=3Doff \ +-accel tcg \ +-m 214 \ +-realtime mlock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-usb \ +-chardev dbus,id=3Dcharserial0,name=3Dorg.qemu.console.serial.0 \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-display dbus,p2p=3Don \ +-device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index fc8f11d268d0..aed30080b7a5 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1525,6 +1525,10 @@ mymain(void) QEMU_CAPS_DEVICE_CIRRUS_VGA, QEMU_CAPS_DISPLAY_DBUS, QEMU_CAPS_CHARDEV_VDAGENT); + DO_TEST("graphics-dbus-chardev", + QEMU_CAPS_DEVICE_ISA_SERIAL, + QEMU_CAPS_DEVICE_CIRRUS_VGA, + QEMU_CAPS_DISPLAY_DBUS); =20 DO_TEST_NOCAPS("input-usbmouse"); DO_TEST_NOCAPS("input-usbtablet"); --=20 2.34.1.8.g35151cf07204