From nobody Mon Feb 9 23:04:08 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=1636109646; cv=none; d=zohomail.com; s=zohoarc; b=gnAtUmpu1jM1qjGmRHLhUMhTbRFbuJUplC6ScQlTzJAhDsQ3El89nmjtDgJEWw4juYpluGwYSU89nxyppoOVz50YtUiiJV7Nxh5k5PoIryBEBvyyiXIvMFwRTNv2tJiXD7gfJ1B13Skt16GmfSHVeMZMkgMjT3va2XmwFkcU95k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636109646; 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=GcnvTQk8PCGIez6VNd4z4sjN/MdXqkA6d7aUcmeFrU8=; b=IZS4j/7S/savXPH7/5YKnbzKytTCZvIKD30c/w63kVdb9EYHHp4AsZB4BWmxvASddA6oSQ+2/hpxJcOXlJSRQK/Boy9EicgC2t3I+kJ0ai0RNLHU+6FrMAPpWZ09Izmp1L5rnl7U1bULYoYRS9WBt79s1mNy+c3xT93xXq7oBfI= 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 1636109646462602.4994359034959; Fri, 5 Nov 2021 03:54:06 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-603-CAVYcPaMPkmfgVho_lKC4Q-1; Fri, 05 Nov 2021 06:53:36 -0400 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 36CEF87D542; Fri, 5 Nov 2021 10:53:31 +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 EACFC5D740; Fri, 5 Nov 2021 10:53:30 +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 BD1A41832DD2; Fri, 5 Nov 2021 10:53:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1A5ArSqj002024 for ; Fri, 5 Nov 2021 06:53:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id 99DA55D6B1; Fri, 5 Nov 2021 10:53:28 +0000 (UTC) Received: from localhost (unknown [10.39.208.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id C53415F4F7; Fri, 5 Nov 2021 10:53:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636109645; 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=GcnvTQk8PCGIez6VNd4z4sjN/MdXqkA6d7aUcmeFrU8=; b=WHypGMsHz4pLtDYHQrX8mOHYB1SY6T3mFwdR/pIMiVmKZvMdL5pt3LhUXiZdF5NxwOYCVO SWZhlJWG1MU1du8KPnwrMyspvS05vGuZE6GqQc2/u9h+4BRRkfSZ4HJO3OVS6R3HzBokvF O5Y7pmhxBOu+80r+4ASZVbcOkP06HPg= X-MC-Unique: CAVYcPaMPkmfgVho_lKC4Q-1 From: marcandre.lureau@redhat.com To: libvir-list@redhat.com Subject: [libvirt PATCH 7/9] qemu: add -chardev dbus Date: Fri, 5 Nov 2021 14:51:17 +0400 Message-Id: <20211105105119.117552-8-marcandre.lureau@redhat.com> In-Reply-To: <20211105105119.117552-1-marcandre.lureau@redhat.com> References: <20211105105119.117552-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: =?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: 1636109648201100001 From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau --- docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 26 +++++++++++++ src/conf/domain_conf.h | 4 ++ src/conf/domain_validate.c | 32 +++++++++++----- src/qemu/qemu_command.c | 10 +++++ src/qemu/qemu_monitor_json.c | 1 + src/qemu/qemu_validate.c | 1 + src/security/security_dac.c | 2 + .../graphics-dbus-chardev.args | 33 ++++++++++++++++ .../graphics-dbus-chardev.xml | 38 +++++++++++++++++++ tests/qemuxml2argvtest.c | 4 ++ 11 files changed, 143 insertions(+), 9 deletions(-) create mode 100644 tests/qemuxml2argvdata/graphics-dbus-chardev.args create mode 100644 tests/qemuxml2argvdata/graphics-dbus-chardev.xml diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index a8777acf9ea8..2499b71c59dc 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -4506,6 +4506,7 @@ spicevmc spiceport nmdm + dbus =20 diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e249781ce027..1fbbcb33d0ca 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -701,6 +701,7 @@ VIR_ENUM_IMPL(virDomainChr, "spicevmc", "spiceport", "nmdm", + "dbus", ); =20 VIR_ENUM_IMPL(virDomainChrTcpProtocol, @@ -2681,6 +2682,7 @@ virDomainChrSourceDefGetPath(virDomainChrSourceDef *c= hr) case VIR_DOMAIN_CHR_TYPE_STDIO: case VIR_DOMAIN_CHR_TYPE_SPICEVMC: case VIR_DOMAIN_CHR_TYPE_SPICEPORT: + case VIR_DOMAIN_CHR_TYPE_DBUS: case VIR_DOMAIN_CHR_TYPE_LAST: return NULL; } @@ -2724,6 +2726,10 @@ virDomainChrSourceDefClear(virDomainChrSourceDef *de= f) case VIR_DOMAIN_CHR_TYPE_SPICEPORT: VIR_FREE(def->data.spiceport.channel); break; + + case VIR_DOMAIN_CHR_TYPE_DBUS: + VIR_FREE(def->data.dbus.channel); + break; } =20 VIR_FREE(def->logfile); @@ -2778,7 +2784,14 @@ virDomainChrSourceDefCopy(virDomainChrSourceDef *des= t, case VIR_DOMAIN_CHR_TYPE_NMDM: dest->data.nmdm.master =3D g_strdup(src->data.nmdm.master); dest->data.nmdm.slave =3D g_strdup(src->data.nmdm.slave); + break; + + case VIR_DOMAIN_CHR_TYPE_SPICEPORT: + dest->data.spiceport.channel =3D g_strdup(src->data.spiceport.chan= nel); + break; =20 + case VIR_DOMAIN_CHR_TYPE_DBUS: + dest->data.dbus.channel =3D g_strdup(src->data.dbus.channel); break; } =20 @@ -2860,6 +2873,11 @@ virDomainChrSourceDefIsEqual(const virDomainChrSourc= eDef *src, case VIR_DOMAIN_CHR_TYPE_SPICEVMC: return src->data.spicevmc =3D=3D tgt->data.spicevmc; =20 + case VIR_DOMAIN_CHR_TYPE_DBUS: + return STREQ_NULLABLE(src->data.dbus.channel, + tgt->data.dbus.channel); + break; + case VIR_DOMAIN_CHR_TYPE_NULL: case VIR_DOMAIN_CHR_TYPE_VC: case VIR_DOMAIN_CHR_TYPE_STDIO: @@ -11408,6 +11426,10 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDe= f *def, def->data.spiceport.channel =3D virXMLPropString(sources[0], "= channel"); break; =20 + case VIR_DOMAIN_CHR_TYPE_DBUS: + def->data.dbus.channel =3D virXMLPropString(sources[0], "chann= el"); + break; + case VIR_DOMAIN_CHR_TYPE_NMDM: def->data.nmdm.master =3D virXMLPropString(sources[0], "master= "); def->data.nmdm.slave =3D virXMLPropString(sources[0], "slave"); @@ -25262,6 +25284,10 @@ virDomainChrSourceDefFormat(virBuffer *buf, def->data.spiceport.channel); break; =20 + case VIR_DOMAIN_CHR_TYPE_DBUS: + virBufferEscapeString(buf, "\n", + def->data.dbus.channel); + break; } =20 if (def->logfile) { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index cc81dbd4a9db..f70aaa2c1d65 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1209,6 +1209,7 @@ typedef enum { VIR_DOMAIN_CHR_TYPE_SPICEVMC, VIR_DOMAIN_CHR_TYPE_SPICEPORT, VIR_DOMAIN_CHR_TYPE_NMDM, + VIR_DOMAIN_CHR_TYPE_DBUS, =20 VIR_DOMAIN_CHR_TYPE_LAST } virDomainChrType; @@ -1277,6 +1278,9 @@ struct _virDomainChrSourceDef { struct { char *channel; } spiceport; + struct { + char *channel; + } dbus; } data; char *logfile; virTristateSwitch logappend; diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index 80401cf8c737..176b7f675933 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -832,6 +832,24 @@ virDomainDiskDefValidate(const virDomainDef *def, #define SERIAL_CHANNEL_NAME_CHARS \ "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-." =20 + +static int +virDomainChrSourceDefValidateChannelName(const char *name) +{ + if (!name) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Missing source channel attribute for char device= ")); + return -1; + } + if (strspn(name, SERIAL_CHANNEL_NAME_CHARS) < strlen(name)) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("Invalid character in source channel for char dev= ice")); + return -1; + } + + return 0; +} + static int virDomainChrSourceDefValidate(const virDomainChrSourceDef *src_def, const virDomainChrDef *chr_def, @@ -917,17 +935,13 @@ virDomainChrSourceDefValidate(const virDomainChrSourc= eDef *src_def, break; =20 case VIR_DOMAIN_CHR_TYPE_SPICEPORT: - if (!src_def->data.spiceport.channel) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Missing source channel attribute for char de= vice")); + if (virDomainChrSourceDefValidateChannelName(src_def->data.spicepo= rt.channel) < 0) return -1; - } - if (strspn(src_def->data.spiceport.channel, - SERIAL_CHANNEL_NAME_CHARS) < strlen(src_def->data.spice= port.channel)) { - virReportError(VIR_ERR_INVALID_ARG, "%s", - _("Invalid character in source channel for char= device")); + break; + + case VIR_DOMAIN_CHR_TYPE_DBUS: + if (virDomainChrSourceDefValidateChannelName(src_def->data.dbus.ch= annel) < 0) return -1; - } break; } =20 diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 377e7e6f7623..c369e55969c2 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5290,6 +5290,15 @@ qemuBuildChrChardevStr(virLogManager *logManager, dev->data.spiceport.channel); 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; + default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unsupported chardev '%s'"), @@ -8754,6 +8763,7 @@ qemuInterfaceVhostuserConnect(virQEMUDriver *driver, case VIR_DOMAIN_CHR_TYPE_SPICEVMC: case VIR_DOMAIN_CHR_TYPE_SPICEPORT: case VIR_DOMAIN_CHR_TYPE_NMDM: + case VIR_DOMAIN_CHR_TYPE_DBUS: case VIR_DOMAIN_CHR_TYPE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("vhost-user type '%s' not supported"), diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 9186d59ca2e5..b9c8e3472ce9 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -6715,6 +6715,7 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, case VIR_DOMAIN_CHR_TYPE_PIPE: case VIR_DOMAIN_CHR_TYPE_STDIO: case VIR_DOMAIN_CHR_TYPE_NMDM: + case VIR_DOMAIN_CHR_TYPE_DBUS: case VIR_DOMAIN_CHR_TYPE_LAST: if (virDomainChrTypeToString(chr->type)) { virReportError(VIR_ERR_OPERATION_FAILED, diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 56949775a3e6..64fa0d5dd00b 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -1953,6 +1953,7 @@ qemuValidateDomainChrSourceDef(const virDomainChrSour= ceDef *def, case VIR_DOMAIN_CHR_TYPE_SPICEVMC: case VIR_DOMAIN_CHR_TYPE_SPICEPORT: case VIR_DOMAIN_CHR_TYPE_NMDM: + case VIR_DOMAIN_CHR_TYPE_DBUS: case VIR_DOMAIN_CHR_TYPE_LAST: break; } diff --git a/src/security/security_dac.c b/src/security/security_dac.c index 1733d63410b3..649d86049b61 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -1555,6 +1555,7 @@ virSecurityDACSetChardevLabelHelper(virSecurityManage= r *mgr, case VIR_DOMAIN_CHR_TYPE_TCP: case VIR_DOMAIN_CHR_TYPE_SPICEVMC: case VIR_DOMAIN_CHR_TYPE_NMDM: + case VIR_DOMAIN_CHR_TYPE_DBUS: case VIR_DOMAIN_CHR_TYPE_LAST: break; } @@ -1639,6 +1640,7 @@ virSecurityDACRestoreChardevLabelHelper(virSecurityMa= nager *mgr, case VIR_DOMAIN_CHR_TYPE_SPICEVMC: case VIR_DOMAIN_CHR_TYPE_SPICEPORT: case VIR_DOMAIN_CHR_TYPE_NMDM: + case VIR_DOMAIN_CHR_TYPE_DBUS: case VIR_DOMAIN_CHR_TYPE_LAST: break; } diff --git a/tests/qemuxml2argvdata/graphics-dbus-chardev.args b/tests/qemu= xml2argvdata/graphics-dbus-chardev.args new file mode 100644 index 000000000000..c2b3718d8315 --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-dbus-chardev.args @@ -0,0 +1,33 @@ +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,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-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 \ +-drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-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/qemuxml2argvdata/graphics-dbus-chardev.xml b/tests/qemux= ml2argvdata/graphics-dbus-chardev.xml new file mode 100644 index 000000000000..69925d4d0611 --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-dbus-chardev.xml @@ -0,0 +1,38 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219100 + 219100 + 1 + + hvm + + + + destroy + restart + destroy + + /usr/bin/qemu-system-i386 + + + + +
+ + + + + + + + + + + + + + + diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index e1f032fe8a79..828c0ed77cfe 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1530,6 +1530,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.33.0.721.g106298f7f9