From nobody Mon May 6 15:35:28 2024 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=1636109553; cv=none; d=zohomail.com; s=zohoarc; b=iaV3QU2yk1hVRWn71kPZOr3jPschol5l7Ev14A8VLPgtbzJCk+OErv9pBJG8ohG7b+mmjlEds24zew809OMvpeA5F8m7K7gi91utNM0/8brbckjgY4lVwlv/WXTVnITQ9z4igDFzgsbm67/UBKXbJWG+1iDP50l29mrxVibgoq0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636109553; 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=YztUtRWzfDobE5Ymqgl2Budt98NQe2zpzHQci0vv2PU=; b=MogBOid22w7YCI9LAv2wqmjzeQpkAbSQwv09IgcbU4FMeognIEQeTl81AogUzCTMDHP+JP3CsP1dTckH/Qs5X88Vnjx0T4sOt4aE2iDav7ZLI+yKuWKaxiUSZmWKmLUPp2i+aaTqm54fxX0Vhnth9BZJmcjAjujKSN3587Vc80s= 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 1636109553156828.4112223799877; Fri, 5 Nov 2021 03:52:33 -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-130-SWeZ7ZmTPW-n4yT5i9Y6Kw-1; Fri, 05 Nov 2021 06:52:03 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DDF24EC1A0; Fri, 5 Nov 2021 10:51:56 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BE60B5DD68; Fri, 5 Nov 2021 10:51:56 +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 F38644E58F; Fri, 5 Nov 2021 10:51:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1A5ApskN001595 for ; Fri, 5 Nov 2021 06:51:54 -0400 Received: by smtp.corp.redhat.com (Postfix) id 67CBF101E692; Fri, 5 Nov 2021 10:51:54 +0000 (UTC) Received: from localhost (unknown [10.39.208.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 109B510246F4; Fri, 5 Nov 2021 10:51:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636109552; 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=YztUtRWzfDobE5Ymqgl2Budt98NQe2zpzHQci0vv2PU=; b=QjS7ZsDyL9668BdN6BFNHkkj1DbVqMpAtdv1J3Zaz3lh8PVh7Fkj9D1Gfm84TG09fGB5Yd Yvf5vp4kG8XOV9E/jCQPQJpyWGyyjz7giPW87mdPD2nQ8mqY9ltFy3obuLR5oWdXKGrdLA jGl4XzhArrUCYws6O6Waf9Ut4AwjPm4= X-MC-Unique: SWeZ7ZmTPW-n4yT5i9Y6Kw-1 From: marcandre.lureau@redhat.com To: libvir-list@redhat.com Subject: [libvirt PATCH 1/9] qemu: start the D-Bus daemon as needed Date: Fri, 5 Nov 2021 14:51:11 +0400 Message-Id: <20211105105119.117552-2-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.84 on 10.5.11.22 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.14 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: 1636109553761100001 From: Marc-Andr=C3=A9 Lureau The daemon is started on daemon in external devices and hotplug code. Add a mechanism to start it before qemu, if qemu itself needs it. (it is already stopped in qemuProcessStop) Signed-off-by: Marc-Andr=C3=A9 Lureau --- src/qemu/qemu_domain.h | 1 + src/qemu/qemu_process.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 6728ab047ed0..575fb8393b83 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -237,6 +237,7 @@ struct _qemuDomainObjPrivate { /* running backup job */ virDomainBackupDef *backup; =20 + bool dbusDaemonWanted; bool dbusDaemonRunning; =20 /* list of Ids to migrate */ diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index d5f8a47ac293..4ca9b100a802 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7284,6 +7284,10 @@ qemuProcessLaunch(virConnectPtr conn, &nnicindexes, &nicindexes, 0))) goto cleanup; =20 + if (QEMU_DOMAIN_PRIVATE(vm)->dbusDaemonWanted && + qemuDBusStart(driver, vm) < 0) + goto cleanup; + if (incoming && incoming->fd !=3D -1) virCommandPassFD(cmd, incoming->fd, 0); =20 --=20 2.33.0.721.g106298f7f9 From nobody Mon May 6 15:35:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1636109553; cv=none; d=zohomail.com; s=zohoarc; b=YKKGE2VHIBOubohVe0UtyAmLIDl0ku1cjtZPpjTsX2xfd+TxfuLE+KODgDufuPV4BuW3aAolZQuY7bAw91sbTDBKLcpKU7FO7+gihhWsHpy4+VCqbiZXn+D3tkMkS12fpTN7o+Fvx7eJlwV+QUHE4OJ6g7qjAtaJJJ77auUF2o8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636109553; 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=8pXkpZ1ru1L10wHmwvXLCKwsD89oa6fXmwwGqMwp0gk=; b=SsNg1l4Z0uVEPYwwIWc+29XldqurWRFtn+vU51pE7nQrdU4ZHck5VJeoEVcLbx7tHf0jA0jFKmkQZCGUuotvLpesBQRUGIg7IBYt4d0hywN0B66lcsRuXpxnsQRATaHaOwkjD5JquFVImAE7D+9mzElftyIrJnsqj0JHA1D0ZKM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1636109553284654.026590598097; Fri, 5 Nov 2021 03:52:33 -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-333-lwIWNPQSPw-jxT2cHC78yg-1; Fri, 05 Nov 2021 06:52:28 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EA85F18A072B; Fri, 5 Nov 2021 10:52:23 +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 C7B22708E2; Fri, 5 Nov 2021 10:52:23 +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 95BB31806D03; Fri, 5 Nov 2021 10:52:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1A5AqMhi001746 for ; Fri, 5 Nov 2021 06:52:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8FDF760C81; Fri, 5 Nov 2021 10:52:22 +0000 (UTC) Received: from localhost (unknown [10.39.208.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id F1C2760BF1; Fri, 5 Nov 2021 10:51:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636109552; 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=8pXkpZ1ru1L10wHmwvXLCKwsD89oa6fXmwwGqMwp0gk=; b=ROer5oOGpTPd9AH3CeYDqirfWYxOi+vML31d1mfV5Q1JmG12PUYx6UxtHSGsQkFUlQUzpl oGiK0DFi4q++bIMzXB9vOkeGZU3kjp9Eiuf6ksbZhbaelkCK66JxeG9XX47a+HRJL7HuPa aIHn553EFT74Aen99Itnq2TIfueddo4= X-MC-Unique: lwIWNPQSPw-jxT2cHC78yg-1 From: marcandre.lureau@redhat.com To: libvir-list@redhat.com Subject: [libvirt PATCH 2/9] qemu: add chardev-vdagent capability check Date: Fri, 5 Nov 2021 14:51:12 +0400 Message-Id: <20211105105119.117552-3-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.12 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.13 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: 1636110454580100001 From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau --- src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 + 5 files changed, 6 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index e4fdd9a1ebe9..b5e893f66656 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -651,6 +651,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "device.json", /* QEMU_CAPS_DEVICE_JSON */ "query-dirty-rate", /* QEMU_CAPS_QUERY_DIRTY_RATE */ "rbd-encryption", /* QEMU_CAPS_RBD_ENCRYPTION */ + "chardev-vdagent", /* QEMU_CAPS_CHARDEV_VDAGENT */ ); =20 =20 @@ -1569,6 +1570,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSc= hemaQueries[] =3D { { "query-named-block-nodes/arg-type/flat", QEMU_CAPS_QMP_QUERY_NAMED_B= LOCK_NODES_FLAT }, { "screendump/arg-type/device", QEMU_CAPS_SCREENDUMP_DEVICE }, { "set-numa-node/arg-type/+hmat-lb", QEMU_CAPS_NUMA_HMAT }, + { "chardev-add/arg-type/backend/+qemu-vdagent", QEMU_CAPS_CHARDEV_VDAG= ENT }, }; =20 typedef struct _virQEMUCapsObjectTypeProps virQEMUCapsObjectTypeProps; diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 61bdbdb2ac2b..493a1eb1a283 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -631,6 +631,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ QEMU_CAPS_DEVICE_JSON, /* -device accepts JSON */ QEMU_CAPS_QUERY_DIRTY_RATE, /* accepts query-dirty-rate */ QEMU_CAPS_RBD_ENCRYPTION, /* Ceph RBD encryption support */ + QEMU_CAPS_CHARDEV_VDAGENT, /* -chardev qemu-vdagent */ =20 QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.1.0.x86_64.xml index 1f4f49eb34ad..75cf496e7712 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -239,6 +239,7 @@ + 6001000 0 43100243 diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.2.0.aarch64.xml index 9662214cd882..032776706d7e 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -204,6 +204,7 @@ + 6001050 0 61700244 diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.2.0.x86_64.xml index 39179916c5d3..145137ddfa08 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -240,6 +240,7 @@ + 6001050 0 43100244 --=20 2.33.0.721.g106298f7f9 From nobody Mon May 6 15:35:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1636109592; cv=none; d=zohomail.com; s=zohoarc; b=PN42OPY6iS+uDrODxPH5T6iNapZYNbsOhWyAVPepnGN476BWcy1QD3ZP8dOFmEqePdpx/jDLD8eM58CBc3uWbzrnQ7l7QpcVYo93dfpiBlFGauqBeoKHWSwteQfHWfKUqMQ6ekORtN7r7BgdLCZtqHRJCR2qLYdzE3D0BPVo4uo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636109592; 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=bmTHKYZdjDTNgUYxqqeAqKpxpmH//BdXKWsNglm2zMo=; b=f0oKI9JzUbql7U25jKcUquClJx5fKlzQLZ6YWipclpdwYYjstpJ6T/9X438u2v5qKzPpLPbMVNtMft3J8mcvMdK0ks73EbvCzztJyUgCpqR0p2m8mg3jiExSqSXNTkzuZxmNUQl2Qg6Oe3mHPRYOCiBgN+Q/x5OpZPK4UvTAt+8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1636109592838915.6076185435975; Fri, 5 Nov 2021 03:53:12 -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-139-wW4Z2QbGPwmn8byNFet5tQ-1; Fri, 05 Nov 2021 06:53:10 -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 6C32C879A03; Fri, 5 Nov 2021 10:53:05 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CC0D65D740; Fri, 5 Nov 2021 10:53:04 +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 865B84E590; Fri, 5 Nov 2021 10:53:04 +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 1A5Ar34w001853 for ; Fri, 5 Nov 2021 06:53:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id 09F6E1B5C2; Fri, 5 Nov 2021 10:53:03 +0000 (UTC) Received: from localhost (unknown [10.39.208.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8E4265BAFB; Fri, 5 Nov 2021 10:52:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636109591; 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=bmTHKYZdjDTNgUYxqqeAqKpxpmH//BdXKWsNglm2zMo=; b=Uj+rXJSk7mwLeN4kRI70ltkRPF2obvjgAnsjAMkK443gwpfd0mNDWcZbnH7dSwomdStRxb 9so9L9qsFOsmzoE0sonsm+XMiZVvFHN4kj4lHhZx0V2x+AB7FNqRf2uAteEeWoGxiqGFC5 ZyFPfwXkKyQGSR8nbHahCfq7tkLa3VE= X-MC-Unique: wW4Z2QbGPwmn8byNFet5tQ-1 From: marcandre.lureau@redhat.com To: libvir-list@redhat.com Subject: [libvirt PATCH 3/9] qemu: add -display dbus capability check (to update to 6.3) Date: Fri, 5 Nov 2021 14:51:13 +0400 Message-Id: <20211105105119.117552-4-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.13 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: 1636109594136100001 From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau --- src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies | 10 +++++++++- tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 + 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index b5e893f66656..c1579a2bf4b3 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -652,6 +652,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "query-dirty-rate", /* QEMU_CAPS_QUERY_DIRTY_RATE */ "rbd-encryption", /* QEMU_CAPS_RBD_ENCRYPTION */ "chardev-vdagent", /* QEMU_CAPS_CHARDEV_VDAGENT */ + "display-dbus", /* QEMU_CAPS_DISPLAY_DBUS */ ); =20 =20 @@ -1571,6 +1572,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSc= hemaQueries[] =3D { { "screendump/arg-type/device", QEMU_CAPS_SCREENDUMP_DEVICE }, { "set-numa-node/arg-type/+hmat-lb", QEMU_CAPS_NUMA_HMAT }, { "chardev-add/arg-type/backend/+qemu-vdagent", QEMU_CAPS_CHARDEV_VDAG= ENT }, + { "query-display-options/ret-type/+dbus", QEMU_CAPS_DISPLAY_DBUS }, }; =20 typedef struct _virQEMUCapsObjectTypeProps virQEMUCapsObjectTypeProps; diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 493a1eb1a283..b15139537841 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -632,6 +632,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ QEMU_CAPS_QUERY_DIRTY_RATE, /* accepts query-dirty-rate */ QEMU_CAPS_RBD_ENCRYPTION, /* Ceph RBD encryption support */ QEMU_CAPS_CHARDEV_VDAGENT, /* -chardev qemu-vdagent */ + QEMU_CAPS_DISPLAY_DBUS, /* -display dbus */ =20 QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies b/tests/q= emucapabilitiesdata/caps_6.2.0.x86_64.replies index 69d3b1b12a6e..e823ad1188b8 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies @@ -5000,6 +5000,10 @@ { "case": "spice-app", "type": "0" + }, + { + "case": "dbus", + "type": "0" } ], "members": [ @@ -11456,6 +11460,9 @@ }, { "name": "spice-app" + }, + { + "name": "dbus" } ], "meta-type": "enum", @@ -11465,7 +11472,8 @@ "sdl", "egl-headless", "curses", - "spice-app" + "spice-app", + "dbus" ] }, { diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.2.0.x86_64.xml index 145137ddfa08..8001ddde8887 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -241,6 +241,7 @@ + 6001050 0 43100244 --=20 2.33.0.721.g106298f7f9 From nobody Mon May 6 15:35:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1636109600; cv=none; d=zohomail.com; s=zohoarc; b=ibvhm2CSnazNctJXKLaQ6kG7m11olVAgn7coSUQRITqdEz/Z6JLs373MzchGn2hBKvAsA/iiKIjHCpX6FycY+GFFOR5sJITAwoWOVt7FCpri8Lq0grEp+vGSnX9hNR0+szsiQxflYaDSAxxMhh53Ia7Og1zsC1E/prTWTVQagp4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636109600; 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=SSkTA28cjgy+40toFf5GSCmDUD+1Zmr+ZxZyTV29HgY=; b=kBeU5HnnIcXZoHD9SlQPY1xQUPKg0aT/AKESaJLKdY1aXK0wTf9+OHAln54Afl6nAWKD66W3o5CDzjkDZ+xiXHVm3qWZV7ieA6c1soLhszR6VNN+wK9kk65eG63VDhJPfMbA511vJ+QhjJWKoC5Rm6cxndAZdtFIT+jT0DJHfzM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1636109600143609.6585166303398; Fri, 5 Nov 2021 03:53:20 -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-37-DLP9nuKkNMaIVg7hOlAJxg-1; Fri, 05 Nov 2021 06:53:17 -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 4162210A8E00; Fri, 5 Nov 2021 10:53:12 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1B04E5D740; Fri, 5 Nov 2021 10:53:12 +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 9A7194EA2A; Fri, 5 Nov 2021 10:53:11 +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 1A5ArA8e001876 for ; Fri, 5 Nov 2021 06:53:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1B9285D6B1; Fri, 5 Nov 2021 10:53:10 +0000 (UTC) Received: from localhost (unknown [10.39.208.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id B75F356A80; Fri, 5 Nov 2021 10:53:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636109599; 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=SSkTA28cjgy+40toFf5GSCmDUD+1Zmr+ZxZyTV29HgY=; b=iuKnwdigl96gDHh/3JF4W1ErEVzILxlUCpTtzSkDOd5uBiFCsppshSV1ZJyHR4/VfFBJN3 PUQdfrtwXeyRWgQfR+CnyoZfNy+4wMUCaHui6mgLIBx96f9Z4nZVR5bWhR5hL3SvvbkIsp coN+nJn6GWh0MymYaWZhOdEeRtV2XMI= X-MC-Unique: DLP9nuKkNMaIVg7hOlAJxg-1 From: marcandre.lureau@redhat.com To: libvir-list@redhat.com Subject: [libvirt PATCH 4/9] qemu: add -display dbus support Date: Fri, 5 Nov 2021 14:51:14 +0400 Message-Id: <20211105105119.117552-5-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: 1636109600493100001 From: Marc-Andr=C3=A9 Lureau Without any extra option, libvirt will start and tell QEMU to connect to the private VM bus. Instead, a D-Bus "address" to connect to can be specified. Or the p2p mode enabled. D-Bus display best works with GL & a rendernode, which can be specified with child element. Signed-off-by: Marc-Andr=C3=A9 Lureau --- docs/schemas/basictypes.rng | 7 ++ docs/schemas/domaincommon.rng | 33 ++++++++++ src/conf/domain_conf.c | 65 ++++++++++++++++++- src/conf/domain_conf.h | 7 ++ src/libxl/libxl_conf.c | 1 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_command.c | 57 ++++++++++++++-- src/qemu/qemu_domain.c | 1 + src/qemu/qemu_driver.c | 10 ++- src/qemu/qemu_hotplug.c | 1 + src/qemu/qemu_process.c | 11 +++- src/qemu/qemu_validate.c | 1 + src/vmx/vmx.c | 1 + .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_6.2.0.x86_64.xml | 1 + .../graphics-dbus-address.args | 31 +++++++++ .../graphics-dbus-address.xml | 34 ++++++++++ tests/qemuxml2argvdata/graphics-dbus-p2p.args | 31 +++++++++ tests/qemuxml2argvdata/graphics-dbus-p2p.xml | 36 ++++++++++ tests/qemuxml2argvdata/graphics-dbus.args | 31 +++++++++ tests/qemuxml2argvdata/graphics-dbus.xml | 34 ++++++++++ tests/qemuxml2argvtest.c | 7 ++ .../graphics-dbus-address.xml | 39 +++++++++++ .../qemuxml2xmloutdata/graphics-dbus-p2p.xml | 39 +++++++++++ tests/qemuxml2xmloutdata/graphics-dbus.xml | 39 +++++++++++ tests/qemuxml2xmltest.c | 10 +++ 27 files changed, 523 insertions(+), 8 deletions(-) create mode 100644 tests/qemuxml2argvdata/graphics-dbus-address.args create mode 100644 tests/qemuxml2argvdata/graphics-dbus-address.xml create mode 100644 tests/qemuxml2argvdata/graphics-dbus-p2p.args create mode 100644 tests/qemuxml2argvdata/graphics-dbus-p2p.xml create mode 100644 tests/qemuxml2argvdata/graphics-dbus.args create mode 100644 tests/qemuxml2argvdata/graphics-dbus.xml create mode 100644 tests/qemuxml2xmloutdata/graphics-dbus-address.xml create mode 100644 tests/qemuxml2xmloutdata/graphics-dbus-p2p.xml create mode 100644 tests/qemuxml2xmloutdata/graphics-dbus.xml diff --git a/docs/schemas/basictypes.rng b/docs/schemas/basictypes.rng index a221ff6295c0..ae4d5682229c 100644 --- a/docs/schemas/basictypes.rng +++ b/docs/schemas/basictypes.rng @@ -220,6 +220,13 @@ =20 + + + + .+ + + + diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index f01b7a64704b..1dba199db7ec 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -3996,6 +3996,39 @@ + + + dbus + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + rdp diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index da0c64b46009..8a2f3c4115e0 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -911,6 +911,7 @@ VIR_ENUM_IMPL(virDomainGraphics, "desktop", "spice", "egl-headless", + "dbus", ); =20 VIR_ENUM_IMPL(virDomainGraphicsListen, @@ -1891,6 +1892,11 @@ void virDomainGraphicsDefFree(virDomainGraphicsDef *= def) g_free(def->data.egl_headless.rendernode); break; =20 + case VIR_DOMAIN_GRAPHICS_TYPE_DBUS: + g_free(def->data.dbus.address); + g_free(def->data.dbus.rendernode); + break; + case VIR_DOMAIN_GRAPHICS_TYPE_LAST: break; } @@ -12896,6 +12902,38 @@ virDomainGraphicsDefParseXMLEGLHeadless(virDomainG= raphicsDef *def, } =20 =20 +static int +virDomainGraphicsDefParseXMLDBus(virDomainGraphicsDef *def, + xmlNodePtr node, + xmlXPathContextPtr ctxt) +{ + VIR_XPATH_NODE_AUTORESTORE(ctxt) + xmlNodePtr cur; + virTristateBool p2p; + + if (virXMLPropTristateBool(node, "p2p", VIR_XML_PROP_NONE, + &p2p) < 0) + return -1; + def->data.dbus.p2p =3D p2p =3D=3D VIR_TRISTATE_BOOL_YES; + + def->data.dbus.address =3D virXMLPropString(node, "address"); + + ctxt->node =3D node; + + if ((cur =3D virXPathNode("./gl", ctxt))) { + def->data.dbus.rendernode =3D virXMLPropString(cur, + "rendernode"); + + if (virXMLPropTristateBool(cur, "enable", + VIR_XML_PROP_REQUIRED, + &def->data.dbus.gl) < 0) + return -1; + } + + return 0; +} + + virDomainGraphicsDef * virDomainGraphicsDefNew(virDomainXMLOption *xmlopt) { @@ -12970,6 +13008,10 @@ virDomainGraphicsDefParseXML(virDomainXMLOption *x= mlopt, case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS: virDomainGraphicsDefParseXMLEGLHeadless(def, node, ctxt); break; + case VIR_DOMAIN_GRAPHICS_TYPE_DBUS: + if (virDomainGraphicsDefParseXMLDBus(def, node, ctxt) < 0) + goto error; + break; case VIR_DOMAIN_GRAPHICS_TYPE_LAST: break; } @@ -26661,6 +26703,15 @@ virDomainGraphicsDefFormat(virBuffer *buf, def->data.egl_headless.rendernode); virBufferAddLit(buf, "/>\n"); break; + case VIR_DOMAIN_GRAPHICS_TYPE_DBUS: + if (def->data.dbus.p2p) + virBufferAddLit(buf, " p2p=3D'yes'"); + if (def->data.dbus.address) + virBufferAsprintf(buf, " address=3D'%s'", + def->data.dbus.address); + if (!def->data.dbus.rendernode) + break; + break; case VIR_DOMAIN_GRAPHICS_TYPE_LAST: break; } @@ -31231,6 +31282,11 @@ virDomainGraphicsDefHasOpenGL(const virDomainDef *= def) case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS: return true; =20 + case VIR_DOMAIN_GRAPHICS_TYPE_DBUS: + if (graphics->data.dbus.gl =3D=3D VIR_TRISTATE_BOOL_YES) + return true; + + continue; case VIR_DOMAIN_GRAPHICS_TYPE_LAST: break; } @@ -31246,7 +31302,8 @@ virDomainGraphicsSupportsRenderNode(const virDomain= GraphicsDef *graphics) bool ret =3D false; =20 if (graphics->type =3D=3D VIR_DOMAIN_GRAPHICS_TYPE_SPICE || - graphics->type =3D=3D VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS) + graphics->type =3D=3D VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS || + graphics->type =3D=3D VIR_DOMAIN_GRAPHICS_TYPE_DBUS) ret =3D true; =20 return ret; @@ -31265,6 +31322,9 @@ virDomainGraphicsGetRenderNode(const virDomainGraph= icsDef *graphics) case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS: ret =3D graphics->data.egl_headless.rendernode; break; + case VIR_DOMAIN_GRAPHICS_TYPE_DBUS: + ret =3D graphics->data.dbus.rendernode; + break; case VIR_DOMAIN_GRAPHICS_TYPE_SDL: case VIR_DOMAIN_GRAPHICS_TYPE_VNC: case VIR_DOMAIN_GRAPHICS_TYPE_RDP: @@ -31286,6 +31346,9 @@ virDomainGraphicsNeedsAutoRenderNode(const virDomai= nGraphicsDef *graphics) if (graphics->type =3D=3D VIR_DOMAIN_GRAPHICS_TYPE_SPICE && graphics->data.spice.gl !=3D VIR_TRISTATE_BOOL_YES) return false; + if (graphics->type =3D=3D VIR_DOMAIN_GRAPHICS_TYPE_DBUS && + graphics->data.dbus.gl !=3D VIR_TRISTATE_BOOL_YES) + return false; =20 if (virDomainGraphicsGetRenderNode(graphics)) return false; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index ab9a7d66f86d..42fe583418a6 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1733,6 +1733,7 @@ typedef enum { VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP, VIR_DOMAIN_GRAPHICS_TYPE_SPICE, VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS, + VIR_DOMAIN_GRAPHICS_TYPE_DBUS, =20 VIR_DOMAIN_GRAPHICS_TYPE_LAST } virDomainGraphicsType; @@ -1916,6 +1917,12 @@ struct _virDomainGraphicsDef { struct { char *rendernode; } egl_headless; + struct { + bool p2p; + char *address; + char *rendernode; + virTristateBool gl; + } dbus; } data; /* nListens, listens, and *port are only useful if type is vnc, * rdp, or spice. They've been extracted from the union only to diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 9f0739e1faff..b19009f270aa 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1551,6 +1551,7 @@ libxlMakeVfb(virPortAllocatorRange *graphicsports, case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: case VIR_DOMAIN_GRAPHICS_TYPE_SPICE: case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS: + case VIR_DOMAIN_GRAPHICS_TYPE_DBUS: case VIR_DOMAIN_GRAPHICS_TYPE_LAST: break; } diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index c1579a2bf4b3..2c3a81eda245 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -6021,6 +6021,8 @@ virQEMUCapsFillDomainDeviceGraphicsCaps(virQEMUCaps *= qemuCaps, VIR_DOMAIN_CAPS_ENUM_SET(dev->type, VIR_DOMAIN_GRAPHICS_TYPE_SPICE= ); if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_EGL_HEADLESS)) VIR_DOMAIN_CAPS_ENUM_SET(dev->type, VIR_DOMAIN_GRAPHICS_TYPE_EGL_H= EADLESS); + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DISPLAY_DBUS)) + VIR_DOMAIN_CAPS_ENUM_SET(dev->type, VIR_DOMAIN_GRAPHICS_TYPE_DBUS); } =20 =20 diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 483041f584d8..1960861015c6 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8601,7 +8601,46 @@ qemuBuildGraphicsEGLHeadlessCommandLine(virQEMUDrive= rConfig *cfg G_GNUC_UNUSED, =20 =20 static int -qemuBuildGraphicsCommandLine(virQEMUDriverConfig *cfg, +qemuBuildGraphicsDBusCommandLine(virQEMUDriver *driver, + virDomainObj *vm, + virCommand *cmd, + virDomainGraphicsDef *graphics) +{ + g_auto(virBuffer) opt =3D VIR_BUFFER_INITIALIZER; + + if (!graphics->data.dbus.p2p && !graphics->data.dbus.address) { + graphics->data.dbus.address =3D qemuDBusGetAddress(driver, vm); + QEMU_DOMAIN_PRIVATE(vm)->dbusDaemonWanted =3D true; + } + + virBufferAddLit(&opt, "dbus"); + + if (graphics->data.dbus.p2p) { + virBufferAddLit(&opt, ",p2p=3Don"); + } else { + virBufferAddLit(&opt, ",addr=3D"); + virQEMUBuildBufferEscapeComma(&opt, graphics->data.dbus.address); + } + if (graphics->data.dbus.gl !=3D VIR_TRISTATE_BOOL_ABSENT) + virBufferAsprintf(&opt, ",gl=3D%s", + virTristateSwitchTypeToString(graphics->data.dbu= s.gl)); + if (graphics->data.dbus.rendernode) { + virBufferAddLit(&opt, ",rendernode=3D"); + virQEMUBuildBufferEscapeComma(&opt, + graphics->data.dbus.rendernode); + } + + virCommandAddArg(cmd, "-display"); + virCommandAddArgBuffer(cmd, &opt); + + return 0; +} + + +static int +qemuBuildGraphicsCommandLine(virQEMUDriver *driver, + virDomainObj *vm, + virQEMUDriverConfig *cfg, virCommand *cmd, virDomainDef *def, virQEMUCaps *qemuCaps) @@ -8635,6 +8674,12 @@ qemuBuildGraphicsCommandLine(virQEMUDriverConfig *cf= g, graphics) < 0) return -1; =20 + break; + case VIR_DOMAIN_GRAPHICS_TYPE_DBUS: + if (qemuBuildGraphicsDBusCommandLine(driver, vm, cmd, + graphics) < 0) + return -1; + break; case VIR_DOMAIN_GRAPHICS_TYPE_RDP: case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: @@ -10363,6 +10408,7 @@ qemuBuildCommandLineValidate(virQEMUDriver *driver, int vnc =3D 0; int spice =3D 0; int egl_headless =3D 0; + int dbus =3D 0; =20 if (!driver->privileged) { /* If we have no cgroups then we can have no tunings that @@ -10407,6 +10453,9 @@ qemuBuildCommandLineValidate(virQEMUDriver *driver, case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS: ++egl_headless; break; + case VIR_DOMAIN_GRAPHICS_TYPE_DBUS: + ++dbus; + break; case VIR_DOMAIN_GRAPHICS_TYPE_RDP: case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: case VIR_DOMAIN_GRAPHICS_TYPE_LAST: @@ -10414,10 +10463,10 @@ qemuBuildCommandLineValidate(virQEMUDriver *drive= r, } } =20 - if (sdl > 1 || vnc > 1 || spice > 1 || egl_headless > 1) { + if (sdl > 1 || vnc > 1 || spice > 1 || egl_headless > 1 || dbus > 1) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("only 1 graphics device of each type " - "(sdl, vnc, spice, headless) is supported")); + "(sdl, vnc, spice, headless, dbus) is supported")= ); return -1; } =20 @@ -10789,7 +10838,7 @@ qemuBuildCommandLine(virQEMUDriver *driver, if (qemuBuildAudioCommandLine(cmd, def, qemuCaps) < 0) return NULL; =20 - if (qemuBuildGraphicsCommandLine(cfg, cmd, def, qemuCaps) < 0) + if (qemuBuildGraphicsCommandLine(driver, vm, cfg, cmd, def, qemuCaps) = < 0) return NULL; =20 if (qemuBuildVideoCommandLine(cmd, def, qemuCaps) < 0) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index fb203bc83085..b027443ca346 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3453,6 +3453,7 @@ qemuDomainDefSuggestDefaultAudioBackend(virQEMUDriver= *driver, case VIR_DOMAIN_GRAPHICS_TYPE_RDP: case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS: + case VIR_DOMAIN_GRAPHICS_TYPE_DBUS: break; case VIR_DOMAIN_GRAPHICS_TYPE_LAST: default: diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 7d13ae9754b4..d7cf7d43b267 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15741,12 +15741,15 @@ qemuDomainOpenGraphics(virDomainPtr dom, case VIR_DOMAIN_GRAPHICS_TYPE_SPICE: protocol =3D "spice"; break; + case VIR_DOMAIN_GRAPHICS_TYPE_DBUS: + protocol =3D "@dbus-display"; + break; case VIR_DOMAIN_GRAPHICS_TYPE_SDL: case VIR_DOMAIN_GRAPHICS_TYPE_RDP: case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Can only open VNC or SPICE graphics backends, no= t %s"), + _("Can only open VNC, SPICE or D-Bus p2p graphics b= ackends, not %s"), virDomainGraphicsTypeToString(vm->def->graphics[idx= ]->type)); goto endjob; case VIR_DOMAIN_GRAPHICS_TYPE_LAST: @@ -15810,12 +15813,15 @@ qemuDomainOpenGraphicsFD(virDomainPtr dom, case VIR_DOMAIN_GRAPHICS_TYPE_SPICE: protocol =3D "spice"; break; + case VIR_DOMAIN_GRAPHICS_TYPE_DBUS: + protocol =3D "@dbus-display"; + break; case VIR_DOMAIN_GRAPHICS_TYPE_SDL: case VIR_DOMAIN_GRAPHICS_TYPE_RDP: case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Can only open VNC or SPICE graphics backends, no= t %s"), + _("Can only open VNC, SPICE or D-Bus p2p graphics b= ackends, not %s"), virDomainGraphicsTypeToString(vm->def->graphics[idx= ]->type)); goto cleanup; case VIR_DOMAIN_GRAPHICS_TYPE_LAST: diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 328b06245f42..6037b4b92c34 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -4451,6 +4451,7 @@ qemuDomainChangeGraphics(virQEMUDriver *driver, case VIR_DOMAIN_GRAPHICS_TYPE_RDP: case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS: + case VIR_DOMAIN_GRAPHICS_TYPE_DBUS: virReportError(VIR_ERR_INTERNAL_ERROR, _("unable to change config on '%s' graphics type"),= type); break; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 4ca9b100a802..2a413d602a10 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4784,6 +4784,7 @@ qemuProcessGraphicsReservePorts(virDomainGraphicsDef = *graphics, case VIR_DOMAIN_GRAPHICS_TYPE_RDP: case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS: + case VIR_DOMAIN_GRAPHICS_TYPE_DBUS: case VIR_DOMAIN_GRAPHICS_TYPE_LAST: break; } @@ -4823,6 +4824,7 @@ qemuProcessGraphicsAllocatePorts(virQEMUDriver *drive= r, case VIR_DOMAIN_GRAPHICS_TYPE_RDP: case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS: + case VIR_DOMAIN_GRAPHICS_TYPE_DBUS: case VIR_DOMAIN_GRAPHICS_TYPE_LAST: break; } @@ -4979,6 +4981,7 @@ qemuProcessGraphicsSetupListen(virQEMUDriver *driver, case VIR_DOMAIN_GRAPHICS_TYPE_RDP: case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS: + case VIR_DOMAIN_GRAPHICS_TYPE_DBUS: case VIR_DOMAIN_GRAPHICS_TYPE_LAST: break; } @@ -5047,11 +5050,16 @@ qemuProcessGraphicsSetupRenderNode(virDomainGraphic= sDef *graphics, return 0; =20 rendernode =3D &graphics->data.spice.rendernode; - } else { + } else if (graphics->type =3D=3D VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS= ) { if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_EGL_HEADLESS_RENDERNODE)) return 0; =20 rendernode =3D &graphics->data.egl_headless.rendernode; + } else if (graphics->type =3D=3D VIR_DOMAIN_GRAPHICS_TYPE_DBUS) { + rendernode =3D &graphics->data.dbus.rendernode; + } else { + g_warn_if_reached(); + return -1; } =20 if (!(*rendernode =3D virHostGetDRMRenderNode())) @@ -5284,6 +5292,7 @@ qemuProcessStartValidateGraphics(virDomainObj *vm) case VIR_DOMAIN_GRAPHICS_TYPE_RDP: case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS: + case VIR_DOMAIN_GRAPHICS_TYPE_DBUS: case VIR_DOMAIN_GRAPHICS_TYPE_LAST: break; } diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 397eea5edeaa..23c7e9f94cd0 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -4168,6 +4168,7 @@ qemuValidateDomainDeviceDefGraphics(const virDomainGr= aphicsDef *graphics, case VIR_DOMAIN_GRAPHICS_TYPE_SDL: case VIR_DOMAIN_GRAPHICS_TYPE_RDP: case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: + case VIR_DOMAIN_GRAPHICS_TYPE_DBUS: case VIR_DOMAIN_GRAPHICS_TYPE_LAST: break; } diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index d3540acd84a8..2c48bbc5e812 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -3446,6 +3446,7 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOp= tion *xmlopt, virDomainDef case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: case VIR_DOMAIN_GRAPHICS_TYPE_SPICE: case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS: + case VIR_DOMAIN_GRAPHICS_TYPE_DBUS: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported graphics type '%s'"), virDomainGraphicsTypeToString(def->graphics[i]-= >type)); diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domainc= apsdata/qemu_6.2.0-q35.x86_64.xml index df8bdae10227..ce3577f582d4 100644 --- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml +++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml @@ -154,6 +154,7 @@ vnc spice egl-headless + dbus