From nobody Tue May 14 15:51:57 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=1648150000; cv=none; d=zohomail.com; s=zohoarc; b=CJYn/NWRq2XmTE5XJ/BMrjlk0rW0pdXpkMkMOCWndp2u/YNqJEqzJoQIBCtNsCILnrlXIpSp5LxhAqYMfnE9YJ9X8ekjkBg8EJCcLWAiaThFCMPiWr+l75TzpfQR5cdlrXe6chFTvM5DVnvNwgjl0IXl4qDwQ6wHSPF8XUbNlHg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648150000; 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=noebzK+bHfpalEaqio04VXZ4TsA+8yTFhftdj9GS5wY=; b=K8TjWSLzOpuX2W0m2XnPNvwSMiPwdtWmY65cfnNRf6LNLTkEUdpf/enVybygiD5c/B7Yp8lTHynRnJzbQN8HQCOQZU5aoNwD832Gq1NdO1/sAnAU6+IYBqn8k1wBgSwExYbzqfVwcYMFYmxFPaL5PoGMGqRrR6lbBAGzgYmHiVA= 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 1648150000880743.9623248587271; Thu, 24 Mar 2022 12:26:40 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-180-qZII3NeENBCDrscKTKaK5A-1; Thu, 24 Mar 2022 15:26:36 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E94B6954707; Thu, 24 Mar 2022 19:26:32 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id C97DEC27D8A; Thu, 24 Mar 2022 19:26:32 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 860F5194035B; Thu, 24 Mar 2022 19:26:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id A1BA41940341 for ; Thu, 24 Mar 2022 19:26:25 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 3A8889D46; Thu, 24 Mar 2022 19:26:25 +0000 (UTC) Received: from himantopus.redhat.com (unknown [10.22.18.107]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E8F317AE2; Thu, 24 Mar 2022 19:26:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1648149999; 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=noebzK+bHfpalEaqio04VXZ4TsA+8yTFhftdj9GS5wY=; b=FYjGnm7QZIdtMaQ5USCVDDMMapLIWzpqOf7svFKOM5Fb0YDC33rFwGlzKpsPXFcDvaCBCu 0e1Up1W2YBW+WZyHCTNs+qSXm6U+uibU92ODd9e5vL3idCZPqtS/clIrI7NyzUShIIy2rs ZuIiP0QhIT6h/4Wd75UHwuAw7rQ56Ms= X-MC-Unique: qZII3NeENBCDrscKTKaK5A-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Jonathon Jongsma To: libvir-list@redhat.com Subject: [libvirt PATCH v2 1/4] qemu: add capability for qemu-vdagent chardev Date: Thu, 24 Mar 2022 14:25:41 -0500 Message-Id: <20220324192544.2095897-2-jjongsma@redhat.com> In-Reply-To: <20220324192544.2095897-1-jjongsma@redhat.com> References: <20220324192544.2095897-1-jjongsma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: marcandre.lureau@redhat.com Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1648150002814100003 Content-Type: text/plain; charset="utf-8"; x-default="true" Detect whether qemu supports the qemu-vdagent character device. This enables support for copy/paste with VNC graphics. Signed-off-by: Jonathon Jongsma Reviewed-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 + tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 + 6 files changed, 7 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 6b4ed08499..f31e7395c3 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -669,6 +669,7 @@ VIR_ENUM_IMPL(virQEMUCaps, /* 425 */ "blockdev.nbd.tls-hostname", /* QEMU_CAPS_BLOCKDEV_NBD_TLS_H= OSTNAME */ "memory-backend-file.prealloc-threads", /* QEMU_CAPS_MEMORY_= BACKEND_PREALLOC_THREADS */ + "chardev.qemu-vdagent", /* QEMU_CAPS_CHARDEV_QEMU_VDAGENT */ ); =20 =20 @@ -1629,6 +1630,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSc= hemaQueries[] =3D { { "set-numa-node/arg-type/+hmat-lb", QEMU_CAPS_NUMA_HMAT }, { "object-add/arg-type/+sev-guest/kernel-hashes", QEMU_CAPS_SEV_GUEST_= KERNEL_HASHES }, { "calc-dirty-rate/arg-type/mode", QEMU_CAPS_DIRTYRATE_MODE }, + { "chardev-add/arg-type/backend/+qemu-vdagent", QEMU_CAPS_CHARDEV_QEMU= _VDAGENT }, }; =20 typedef struct _virQEMUCapsObjectTypeProps virQEMUCapsObjectTypeProps; diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 948029d60d..f5a9609b8c 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -644,6 +644,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ /* 425 */ QEMU_CAPS_BLOCKDEV_NBD_TLS_HOSTNAME, /* tls hostname can be overriden = for NBD clients */ QEMU_CAPS_MEMORY_BACKEND_PREALLOC_THREADS, /* -object memory-backend-*= .prealloc-threads */ + QEMU_CAPS_CHARDEV_QEMU_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 0b58210335..fceb7dbea6 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -240,6 +240,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 d08b2c0213..6a5c39a0de 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 cdf72b9ebf..6f4fa26808 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -242,6 +242,7 @@ + 6002000 0 43100244 diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.0.0.x86_64.xml index 5227e3ee0b..8219347f2a 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -245,6 +245,7 @@ + 6002050 0 43100243 --=20 2.35.1 From nobody Tue May 14 15:51:58 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=1648149998; cv=none; d=zohomail.com; s=zohoarc; b=hKCQS+o0mlf+J16frwiWBBXt8/28otlEiMILyh8qLU+P3GuV7S4I0AHwWANWmFdmzZAaEAtEXUSv8rinbiNlJmwZkCDTwlLNrB/Qo9iJooVpXL74zBBhHKs/GL9jVhPBjVzEnvg5+NwPA0Dw+BCyBclN39txjtJQ9UIyJr2fqcA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648149998; 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=yB/jHsYR01u7KvNV+HzpAPfvjLEfxE6reL+EIYzZVP8=; b=OdiIF412cepwBRa8o18aXOVKmDu2WWxavDSm15aI2D/qhTlRQAoZfKqHUipC9LPotasY9qJFaQE4cx9j+lTvkJVF+pHm35jsTPzq7zzJKjDoxl1BoJ9r4shVVNDBzY529YZrzuX8wpLKhV0pkU+vmMfdAKHewTostzNCzZR+SVM= 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 1648149998848818.963996256315; Thu, 24 Mar 2022 12:26:38 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-552-FoaJSjk3PweaUzeqwQpX6g-1; Thu, 24 Mar 2022 15:26:36 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B27F7811E78; Thu, 24 Mar 2022 19:26:32 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9CD052166B4C; Thu, 24 Mar 2022 19:26:32 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 617D0194034B; Thu, 24 Mar 2022 19:26:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id A25EA194034B for ; Thu, 24 Mar 2022 19:26:25 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 839839D4C; Thu, 24 Mar 2022 19:26:25 +0000 (UTC) Received: from himantopus.redhat.com (unknown [10.22.18.107]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4E4E99D47; Thu, 24 Mar 2022 19:26:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1648149997; 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=yB/jHsYR01u7KvNV+HzpAPfvjLEfxE6reL+EIYzZVP8=; b=bvvmncbzI3NhRmDNLmaSxds8QdAem3Thaoe6YUq52BzLdKecQPuHwzEgUG7SVOft2Z9Edy Ln6Xu6JKceLrqnIpx17i4wyqYZ1607q3XVOCQKkNHvHQimyYbnHDxSVtJ+SbmKtq/Dlp7O oAiW6HO1SSEUrujVpbP0bEz6DqQbCOY= X-MC-Unique: FoaJSjk3PweaUzeqwQpX6g-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Jonathon Jongsma To: libvir-list@redhat.com Subject: [libvirt PATCH v2 2/4] Rename virDomainGraphicsSpiceMouseMode to virDomainMouseMode Date: Thu, 24 Mar 2022 14:25:42 -0500 Message-Id: <20220324192544.2095897-3-jjongsma@redhat.com> In-Reply-To: <20220324192544.2095897-1-jjongsma@redhat.com> References: <20220324192544.2095897-1-jjongsma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: marcandre.lureau@redhat.com Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1648150000855100001 Content-Type: text/plain; charset="utf-8"; x-default="true" This enumeration will be useful for vnc with the upcoming qemu-vdagent device so make the name more generic. Signed-off-by: Jonathon Jongsma Reviewed-by: Marc-Andr=C3=A9 Lureau --- src/conf/domain_conf.c | 8 ++++---- src/conf/domain_conf.h | 14 +++++++------- src/libvirt_private.syms | 4 ++-- src/libxl/libxl_conf.c | 8 ++++---- src/libxl/xen_xl.c | 16 +++++++--------- src/qemu/qemu_command.c | 10 +++++----- 6 files changed, 29 insertions(+), 31 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 731139f80f..6f9954638c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -995,8 +995,8 @@ VIR_ENUM_IMPL(virDomainGraphicsSpiceZlibCompression, "always", ); =20 -VIR_ENUM_IMPL(virDomainGraphicsSpiceMouseMode, - VIR_DOMAIN_GRAPHICS_SPICE_MOUSE_MODE_LAST, +VIR_ENUM_IMPL(virDomainMouseMode, + VIR_DOMAIN_MOUSE_MODE_LAST, "default", "server", "client", @@ -12727,7 +12727,7 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphics= Def *def, =20 if ((cur =3D virXPathNode("./mouse", ctxt))) { if (virXMLPropEnum(cur, "mode", - virDomainGraphicsSpiceMouseModeTypeFromString, + virDomainMouseModeTypeFromString, VIR_XML_PROP_REQUIRED | VIR_XML_PROP_NONZERO, &def->data.spice.mousemode) < 0) return -1; @@ -26616,7 +26616,7 @@ virDomainGraphicsDefFormat(virBuffer *buf, virDomainGraphicsSpiceStreamingModeTypeToStr= ing(def->data.spice.streaming)); if (def->data.spice.mousemode) virBufferAsprintf(buf, "\n", - virDomainGraphicsSpiceMouseModeTypeToString(= def->data.spice.mousemode)); + virDomainMouseModeTypeToString(def->data.spi= ce.mousemode)); if (def->data.spice.copypaste) virBufferAsprintf(buf, "\n", virTristateBoolTypeToString(def->data.spice.= copypaste)); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 49c964e6e1..2b00099431 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1844,12 +1844,12 @@ typedef enum { } virDomainGraphicsSpiceZlibCompression; =20 typedef enum { - VIR_DOMAIN_GRAPHICS_SPICE_MOUSE_MODE_DEFAULT =3D 0, - VIR_DOMAIN_GRAPHICS_SPICE_MOUSE_MODE_SERVER, - VIR_DOMAIN_GRAPHICS_SPICE_MOUSE_MODE_CLIENT, + VIR_DOMAIN_MOUSE_MODE_DEFAULT =3D 0, + VIR_DOMAIN_MOUSE_MODE_SERVER, + VIR_DOMAIN_MOUSE_MODE_CLIENT, =20 - VIR_DOMAIN_GRAPHICS_SPICE_MOUSE_MODE_LAST -} virDomainGraphicsSpiceMouseMode; + VIR_DOMAIN_MOUSE_MODE_LAST +} virDomainMouseMode; =20 typedef enum { VIR_DOMAIN_GRAPHICS_SPICE_STREAMING_MODE_DEFAULT =3D 0, @@ -1927,7 +1927,7 @@ struct _virDomainGraphicsDef { int tlsPort; bool portReserved; bool tlsPortReserved; - virDomainGraphicsSpiceMouseMode mousemode; + virDomainMouseMode mousemode; char *keymap; virDomainGraphicsAuthDef auth; bool autoport; @@ -3990,7 +3990,7 @@ VIR_ENUM_DECL(virDomainGraphicsSpiceImageCompression); VIR_ENUM_DECL(virDomainGraphicsSpiceJpegCompression); VIR_ENUM_DECL(virDomainGraphicsSpiceZlibCompression); VIR_ENUM_DECL(virDomainGraphicsSpiceStreamingMode); -VIR_ENUM_DECL(virDomainGraphicsSpiceMouseMode); +VIR_ENUM_DECL(virDomainMouseMode); VIR_ENUM_DECL(virDomainGraphicsVNCSharePolicy); VIR_ENUM_DECL(virDomainHyperv); VIR_ENUM_DECL(virDomainKVM); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 03697d81a8..400adf14b5 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -444,8 +444,6 @@ virDomainGraphicsSpiceImageCompressionTypeFromString; virDomainGraphicsSpiceImageCompressionTypeToString; virDomainGraphicsSpiceJpegCompressionTypeFromString; virDomainGraphicsSpiceJpegCompressionTypeToString; -virDomainGraphicsSpiceMouseModeTypeFromString; -virDomainGraphicsSpiceMouseModeTypeToString; virDomainGraphicsSpiceStreamingModeTypeFromString; virDomainGraphicsSpiceStreamingModeTypeToString; virDomainGraphicsSpiceZlibCompressionTypeFromString; @@ -519,6 +517,8 @@ virDomainMemoryModelTypeToString; virDomainMemoryRemove; virDomainMemorySourceTypeFromString; virDomainMemorySourceTypeToString; +virDomainMouseModeTypeFromString; +virDomainMouseModeTypeToString; virDomainNetAllocateActualDevice; virDomainNetAppendIPAddress; virDomainNetARPInterfaces; diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index a0fc51c74a..0b4662e6dc 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1645,14 +1645,14 @@ libxlMakeBuildInfoVfb(virPortAllocatorRange *graphi= csports, =20 switch (l_vfb->data.spice.mousemode) { /* client mouse mode is default in xl.cfg */ - case VIR_DOMAIN_GRAPHICS_SPICE_MOUSE_MODE_DEFAULT: - case VIR_DOMAIN_GRAPHICS_SPICE_MOUSE_MODE_CLIENT: + case VIR_DOMAIN_MOUSE_MODE_DEFAULT: + case VIR_DOMAIN_MOUSE_MODE_CLIENT: libxl_defbool_set(&b_info->u.hvm.spice.agent_mouse, true); break; - case VIR_DOMAIN_GRAPHICS_SPICE_MOUSE_MODE_SERVER: + case VIR_DOMAIN_MOUSE_MODE_SERVER: libxl_defbool_set(&b_info->u.hvm.spice.agent_mouse, false); break; - case VIR_DOMAIN_GRAPHICS_SPICE_MOUSE_MODE_LAST: + case VIR_DOMAIN_MOUSE_MODE_LAST: break; } =20 diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c index 87194ccbd1..6b7f638783 100644 --- a/src/libxl/xen_xl.c +++ b/src/libxl/xen_xl.c @@ -361,11 +361,9 @@ xenParseXLSpice(virConf *conf, virDomainDef *def) &val, 0) < 0) goto cleanup; if (val) { - graphics->data.spice.mousemode =3D - VIR_DOMAIN_GRAPHICS_SPICE_MOUSE_MODE_CLIENT; + graphics->data.spice.mousemode =3D VIR_DOMAIN_MOUSE_MODE_C= LIENT; } else { - graphics->data.spice.mousemode =3D - VIR_DOMAIN_GRAPHICS_SPICE_MOUSE_MODE_SERVER; + graphics->data.spice.mousemode =3D VIR_DOMAIN_MOUSE_MODE_S= ERVER; } =20 if (xenConfigGetBool(conf, "spice_clipboard_sharing", &val, 0)= < 0) @@ -1691,11 +1689,11 @@ xenFormatXLSpice(virConf *conf, virDomainDef *def) =20 if (graphics->data.spice.mousemode) { switch (graphics->data.spice.mousemode) { - case VIR_DOMAIN_GRAPHICS_SPICE_MOUSE_MODE_SERVER: + case VIR_DOMAIN_MOUSE_MODE_SERVER: if (xenConfigSetInt(conf, "spiceagent_mouse", 0) < 0) return -1; break; - case VIR_DOMAIN_GRAPHICS_SPICE_MOUSE_MODE_CLIENT: + case VIR_DOMAIN_MOUSE_MODE_CLIENT: if (xenConfigSetInt(conf, "spiceagent_mouse", 1) < 0) return -1; /* @@ -1705,11 +1703,11 @@ xenFormatXLSpice(virConf *conf, virDomainDef *def) if (xenConfigSetInt(conf, "spicevdagent", 1) < 0) return -1; break; - case VIR_DOMAIN_GRAPHICS_SPICE_MOUSE_MODE_DEFAULT: + case VIR_DOMAIN_MOUSE_MODE_DEFAULT: break; - case VIR_DOMAIN_GRAPHICS_SPICE_MOUSE_MODE_LAST: + case VIR_DOMAIN_MOUSE_MODE_LAST: default: - virReportEnumRangeError(virDomainGraphicsSpiceMouseMod= e, + virReportEnumRangeError(virDomainMouseMode, graphics->data.spice.mousemode= ); return -1; } diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 8246ab515a..7834aece35 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8377,17 +8377,17 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConf= ig *cfg, =20 if (graphics->data.spice.mousemode) { switch (graphics->data.spice.mousemode) { - case VIR_DOMAIN_GRAPHICS_SPICE_MOUSE_MODE_SERVER: + case VIR_DOMAIN_MOUSE_MODE_SERVER: virBufferAddLit(&opt, "agent-mouse=3Doff,"); break; - case VIR_DOMAIN_GRAPHICS_SPICE_MOUSE_MODE_CLIENT: + case VIR_DOMAIN_MOUSE_MODE_CLIENT: virBufferAddLit(&opt, "agent-mouse=3Don,"); break; - case VIR_DOMAIN_GRAPHICS_SPICE_MOUSE_MODE_DEFAULT: + case VIR_DOMAIN_MOUSE_MODE_DEFAULT: break; - case VIR_DOMAIN_GRAPHICS_SPICE_MOUSE_MODE_LAST: + case VIR_DOMAIN_MOUSE_MODE_LAST: default: - virReportEnumRangeError(virDomainGraphicsSpiceMouseMode, + virReportEnumRangeError(virDomainMouseMode, graphics->data.spice.mousemode); return -1; } --=20 2.35.1 From nobody Tue May 14 15:51:58 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=1648150001; cv=none; d=zohomail.com; s=zohoarc; b=cxjcmdOmuKqadF+mDSH303qyaJGyJplFLKV7yTSZ5RJ2Ql3L5XrkkdBHEquiygx02Zs4kqof4coUvgn3ZdzH6my2ILts8xA51VRT4pKM07Y2NYldre5gSXJrtuVQUDGwl5o21qtekGBGsTQZN30o6CjDc8PFB2uxrAC7T9XMnic= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648150001; 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=1YiVTBIDGaFjiMWumZyFBM2eiui7+Qa8Ala6xyqZqVQ=; b=kfniV4JjlWx2gMu8+WSR0irbNQ32Ew5dnb+h03aFNg/KABjyvb0sqzEgNVs2x+rKrwMCkAiix+l97oD6YccVZQ3ENuGMtiVBGMNVxZ7BBJ4fwLzDWGKQAWixspgxzmscMzwceOgOmLdNLeVCDRzqP6OTinXbS3xSZF8zbYkXyTo= 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 1648150001766542.7767617027212; Thu, 24 Mar 2022 12:26:41 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-625-dJCwOs51OkKerDB4IObTlg-1; Thu, 24 Mar 2022 15:26:37 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BF72F3801EF6; Thu, 24 Mar 2022 19:26:33 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id A3AF71457F12; Thu, 24 Mar 2022 19:26:33 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 0D1F4194036E; Thu, 24 Mar 2022 19:26:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id EB5D91940341 for ; Thu, 24 Mar 2022 19:26:25 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id CC8449D46; Thu, 24 Mar 2022 19:26:25 +0000 (UTC) Received: from himantopus.redhat.com (unknown [10.22.18.107]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 973CC9D47; Thu, 24 Mar 2022 19:26:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1648150000; 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=1YiVTBIDGaFjiMWumZyFBM2eiui7+Qa8Ala6xyqZqVQ=; b=AMRZ3pxuvpfmJZ27C00Xb+09UyGxxyqZ/4RoGwDKtSbWDu02PTzMLuDO6vcaacEXjkeF/T 7T5qVsFWyoa4YZxcw2ErMJUV/hlloPO6ZK4sBhf1AQItTlYTqaCZaOI2Pd1MbLLmHHACQ0 W2ohGhMvrh5/hZrRq2nkm2X+b/04KTM= X-MC-Unique: dJCwOs51OkKerDB4IObTlg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Jonathon Jongsma To: libvir-list@redhat.com Subject: [libvirt PATCH v2 3/4] conf: add qemu-vdagent channel Date: Thu, 24 Mar 2022 14:25:43 -0500 Message-Id: <20220324192544.2095897-4-jjongsma@redhat.com> In-Reply-To: <20220324192544.2095897-1-jjongsma@redhat.com> References: <20220324192544.2095897-1-jjongsma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: marcandre.lureau@redhat.com Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1648150002843100004 Content-Type: text/plain; charset="utf-8"; x-default="true" Add the ability to configure a qemu-vdagent in guest domains. This device is similar to the spice vdagent channel except that qemu handles the spice-vdagent protocol messages itself rather than routing them over a spice protocol channel. The qemu-vdagent device has two notable configuration options which determine whether qemu will handle particular vdagent features: 'clipboard' and 'mouse'. The 'clipboard' option allows qemu to synchronize its internal clipboard manager with the guest clipboard, which enables client<->guest clipboard synchronization for non-spice guests such as vnc. The 'mouse' option allows absolute mouse positioning to be sent over the vdagent channel rather than using a usb or virtio tablet device. Sample configuration: Signed-off-by: Jonathon Jongsma Reviewed-by: Marc-Andr=C3=A9 Lureau --- docs/formatdomain.rst | 23 ++++++++++++ src/conf/domain_conf.c | 62 ++++++++++++++++++++++++++++++- src/conf/domain_conf.h | 20 ++++++---- src/conf/domain_validate.c | 1 + src/conf/schemas/domaincommon.rng | 51 ++++++++++++++++--------- src/qemu/qemu_command.c | 3 ++ src/qemu/qemu_monitor_json.c | 1 + src/qemu/qemu_process.c | 1 + src/qemu/qemu_validate.c | 1 + src/security/security_apparmor.c | 2 + src/security/security_dac.c | 2 + tests/testutilsqemu.c | 1 + 12 files changed, 140 insertions(+), 28 deletions(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index e492532004..75339c2fda 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -6662,6 +6662,29 @@ types have different ``target`` attributes. ``name=3D'com.redhat.spice.0'``. The optional ``address`` element can t= ie the channel to a particular ``type=3D'virtio-serial'`` controller. :since:`= Since 0.8.8` +``qemu-vdagent`` + Paravirtualized qemu vdagent channel. This channel implements the SPICE + vdagent protocol, but is handled internally by qemu and therefore does = not + require a SPICE graphics device. Like the spicevmc channel, the ``targe= t`` + element must be present, with attribute ``type=3D'virtio'``; an optional + attribute ``name`` controls how the guest will have access to the chann= el, + and defaults to ``name=3D'com.redhat.spice.0'``. The optional ``address= `` + element can tie the channel to a particular ``type=3D'virtio-serial'`` + controller. Certain vdagent protocol features can by enabled or disabled + using the ``source`` element. + + Copy & Paste functionality is set by the ``clipboard`` element. It is + disabled by default, and can be enabled by setting the ``copypaste`` + property to ``yes``. This allows the guest's clipboard to be synchroniz= ed + with the qemu clipboard manager. This can enable copy and paste between= a + guest and a client when using a VNC `graphics device <#elementsGraphics= >`__ + (when using a VNC client that supports the copy/paste feature) or other + graphics types that support the qemu clipboard manager. + + Mouse mode is set by the ``mouse`` element, setting its ``mode`` attrib= ute + to one of ``server`` or ``client``. If no mode is specified, the qemu + default will be used (client mode). + :since:`Since 8.2.0` =20 :anchor:`` =20 diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6f9954638c..3b97de89f4 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -713,6 +713,7 @@ VIR_ENUM_IMPL(virDomainChr, "spicevmc", "spiceport", "nmdm", + "qemu-vdagent", ); =20 VIR_ENUM_IMPL(virDomainChrTcpProtocol, @@ -2698,6 +2699,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_QEMU_VDAGENT: case VIR_DOMAIN_CHR_TYPE_LAST: return NULL; } @@ -2807,6 +2809,11 @@ virDomainChrSourceDefCopy(virDomainChrSourceDef *des= t, dest->data.spiceport.channel =3D g_strdup(src->data.spiceport.chan= nel); break; =20 + case VIR_DOMAIN_CHR_TYPE_QEMU_VDAGENT: + dest->data.qemuVdagent.clipboard =3D src->data.qemuVdagent.clipboa= rd; + dest->data.qemuVdagent.mouse =3D src->data.qemuVdagent.mouse; + break; + case VIR_DOMAIN_CHR_TYPE_NULL: case VIR_DOMAIN_CHR_TYPE_VC: case VIR_DOMAIN_CHR_TYPE_STDIO: @@ -2888,6 +2895,10 @@ 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_QEMU_VDAGENT: + return src->data.qemuVdagent.clipboard =3D=3D tgt->data.qemuVdagen= t.clipboard && + src->data.qemuVdagent.mouse =3D=3D tgt->data.qemuVdagent.mouse; + case VIR_DOMAIN_CHR_TYPE_NULL: case VIR_DOMAIN_CHR_TYPE_VC: case VIR_DOMAIN_CHR_TYPE_STDIO: @@ -11244,6 +11255,33 @@ virDomainChrSourceDefParseLog(virDomainChrSourceDe= f *def, } =20 =20 +static int +virDomainChrSourceDefParseQemuVdagent(virDomainChrSourceDef *def, + xmlNodePtr source, + xmlXPathContextPtr ctxt) +{ + xmlNodePtr cur; + VIR_XPATH_NODE_AUTORESTORE(ctxt) + + ctxt->node =3D source; + if ((cur =3D virXPathNode("./clipboard", ctxt))) { + if (virXMLPropTristateBool(cur, "copypaste", + VIR_XML_PROP_REQUIRED, + &def->data.qemuVdagent.clipboard) < 0) + return -1; + } + if ((cur =3D virXPathNode("./mouse", ctxt))) { + if (virXMLPropEnum(cur, "mode", + virDomainMouseModeTypeFromString, + VIR_XML_PROP_REQUIRED | VIR_XML_PROP_NONZERO, + &def->data.qemuVdagent.mouse) < 0) + return -1; + } + + return 0; +} + + /* Parse the source half of the XML definition for a character device, * where node is the first element of node->children of the parent * element. def->type must already be valid. @@ -11325,6 +11363,12 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDe= f *def, def->data.nmdm.slave =3D virXMLPropString(sources[0], "slave"); break; =20 + case VIR_DOMAIN_CHR_TYPE_QEMU_VDAGENT: + if (virDomainChrSourceDefParseQemuVdagent(def, sources[0], ctx= t) < 0) + goto error; + + break; + case VIR_DOMAIN_CHR_TYPE_LAST: case VIR_DOMAIN_CHR_TYPE_NULL: case VIR_DOMAIN_CHR_TYPE_VC: @@ -24996,6 +25040,22 @@ virDomainChrSourceDefFormat(virBuffer *buf, /* nada */ break; =20 + case VIR_DOMAIN_CHR_TYPE_QEMU_VDAGENT: + if (def->data.qemuVdagent.mouse !=3D VIR_DOMAIN_MOUSE_MODE_DEFAULT= || + def->data.qemuVdagent.clipboard !=3D VIR_TRISTATE_BOOL_ABSENT)= { + virBufferAddLit(buf, "\n"); + virBufferAdjustIndent(buf, 2); + if (def->data.qemuVdagent.clipboard !=3D VIR_TRISTATE_BOOL_ABS= ENT) + virBufferEscapeString(buf, "\= n", + virTristateBoolTypeToString(def->dat= a.qemuVdagent.clipboard)); + if (def->data.qemuVdagent.mouse !=3D VIR_DOMAIN_MOUSE_MODE_DEF= AULT) + virBufferEscapeString(buf, "\n", + virDomainMouseModeTypeToString(def->= data.qemuVdagent.mouse)); + virBufferAdjustIndent(buf, -2); + virBufferAddLit(buf, "\n"); + } + break; + case VIR_DOMAIN_CHR_TYPE_PTY: case VIR_DOMAIN_CHR_TYPE_DEV: case VIR_DOMAIN_CHR_TYPE_FILE: @@ -25081,7 +25141,6 @@ virDomainChrSourceDefFormat(virBuffer *buf, virBufferEscapeString(buf, "\n", def->data.spiceport.channel); break; - } =20 if (def->logfile) { @@ -25211,7 +25270,6 @@ virDomainChrTargetDefFormat(virBuffer *buf, return 0; } =20 - static int virDomainChrDefFormat(virBuffer *buf, virDomainChrDef *def, diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 2b00099431..484fc08f81 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1239,6 +1239,7 @@ typedef enum { VIR_DOMAIN_CHR_TYPE_SPICEVMC, VIR_DOMAIN_CHR_TYPE_SPICEPORT, VIR_DOMAIN_CHR_TYPE_NMDM, + VIR_DOMAIN_CHR_TYPE_QEMU_VDAGENT, =20 VIR_DOMAIN_CHR_TYPE_LAST } virDomainChrType; @@ -1266,6 +1267,13 @@ struct _virDomainChrSourceReconnectDef { unsigned int timeout; }; =20 +typedef enum { + VIR_DOMAIN_MOUSE_MODE_DEFAULT =3D 0, + VIR_DOMAIN_MOUSE_MODE_SERVER, + VIR_DOMAIN_MOUSE_MODE_CLIENT, + + VIR_DOMAIN_MOUSE_MODE_LAST +} virDomainMouseMode; =20 /* The host side information for a character device. */ struct _virDomainChrSourceDef { @@ -1307,6 +1315,10 @@ struct _virDomainChrSourceDef { struct { char *channel; } spiceport; + struct { + virDomainMouseMode mouse; + virTristateBool clipboard; + } qemuVdagent; } data; char *logfile; virTristateSwitch logappend; @@ -1843,14 +1855,6 @@ typedef enum { VIR_DOMAIN_GRAPHICS_SPICE_ZLIB_COMPRESSION_LAST } virDomainGraphicsSpiceZlibCompression; =20 -typedef enum { - VIR_DOMAIN_MOUSE_MODE_DEFAULT =3D 0, - VIR_DOMAIN_MOUSE_MODE_SERVER, - VIR_DOMAIN_MOUSE_MODE_CLIENT, - - VIR_DOMAIN_MOUSE_MODE_LAST -} virDomainMouseMode; - typedef enum { VIR_DOMAIN_GRAPHICS_SPICE_STREAMING_MODE_DEFAULT =3D 0, VIR_DOMAIN_GRAPHICS_SPICE_STREAMING_MODE_FILTER, diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index d6869e8fd8..c0eb2490a8 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -849,6 +849,7 @@ virDomainChrSourceDefValidate(const virDomainChrSourceD= ef *src_def, case VIR_DOMAIN_CHR_TYPE_VC: case VIR_DOMAIN_CHR_TYPE_STDIO: case VIR_DOMAIN_CHR_TYPE_SPICEVMC: + case VIR_DOMAIN_CHR_TYPE_QEMU_VDAGENT: case VIR_DOMAIN_CHR_TYPE_LAST: break; =20 diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincom= mon.rng index 34bccee2f5..60aad8cabe 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -3965,23 +3965,10 @@ - - - - - - + - - - - server - client - - - - + @@ -4070,6 +4057,25 @@ =20 + + + + + + + + + + + + + server + client + + + + + @@ -4470,6 +4476,7 @@ spicevmc spiceport nmdm + qemu-vdagent =20 @@ -4555,9 +4562,17 @@ - - - + + + + + + + + + + + diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 7834aece35..1eef9fb6d0 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1390,6 +1390,7 @@ qemuBuildChardevStr(const virDomainChrSourceDef *dev, break; =20 case VIR_DOMAIN_CHR_TYPE_NMDM: + case VIR_DOMAIN_CHR_TYPE_QEMU_VDAGENT: case VIR_DOMAIN_CHR_TYPE_LAST: default: break; @@ -1473,6 +1474,7 @@ qemuBuildChardevCommand(virCommand *cmd, case VIR_DOMAIN_CHR_TYPE_UDP: case VIR_DOMAIN_CHR_TYPE_SPICEVMC: case VIR_DOMAIN_CHR_TYPE_SPICEPORT: + case VIR_DOMAIN_CHR_TYPE_QEMU_VDAGENT: break; =20 case VIR_DOMAIN_CHR_TYPE_NMDM: @@ -8613,6 +8615,7 @@ qemuInterfaceVhostuserConnect(virCommand *cmd, case VIR_DOMAIN_CHR_TYPE_SPICEVMC: case VIR_DOMAIN_CHR_TYPE_SPICEPORT: case VIR_DOMAIN_CHR_TYPE_NMDM: + case VIR_DOMAIN_CHR_TYPE_QEMU_VDAGENT: 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 d5622bd6d9..1ac5377449 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -6818,6 +6818,7 @@ qemuMonitorJSONAttachCharDevGetProps(const char *chrI= D, case VIR_DOMAIN_CHR_TYPE_PIPE: case VIR_DOMAIN_CHR_TYPE_STDIO: case VIR_DOMAIN_CHR_TYPE_NMDM: + case VIR_DOMAIN_CHR_TYPE_QEMU_VDAGENT: virReportError(VIR_ERR_OPERATION_FAILED, _("Hotplug unsupported for char device type '%s'"), virDomainChrTypeToString(chr->type)); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 1ed60917ea..423a10738d 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -6834,6 +6834,7 @@ qemuProcessPrepareHostBackendChardevOne(virDomainDevi= ceDef *dev, case VIR_DOMAIN_CHR_TYPE_TCP: case VIR_DOMAIN_CHR_TYPE_SPICEVMC: case VIR_DOMAIN_CHR_TYPE_SPICEPORT: + case VIR_DOMAIN_CHR_TYPE_QEMU_VDAGENT: break; =20 case VIR_DOMAIN_CHR_TYPE_FILE: { diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index e0708b8a76..5ad3d914dc 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -1991,6 +1991,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_QEMU_VDAGENT: case VIR_DOMAIN_CHR_TYPE_LAST: break; } diff --git a/src/security/security_apparmor.c b/src/security/security_appar= mor.c index 8f7acba980..55c0193940 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -1021,6 +1021,7 @@ AppArmorSetChardevLabel(virSecurityManager *mgr, case VIR_DOMAIN_CHR_TYPE_TCP: case VIR_DOMAIN_CHR_TYPE_SPICEVMC: case VIR_DOMAIN_CHR_TYPE_NMDM: + case VIR_DOMAIN_CHR_TYPE_QEMU_VDAGENT: case VIR_DOMAIN_CHR_TYPE_LAST: ret =3D 0; break; @@ -1083,6 +1084,7 @@ AppArmorSetNetdevLabel(virSecurityManager *mgr, case VIR_DOMAIN_CHR_TYPE_TCP: case VIR_DOMAIN_CHR_TYPE_SPICEVMC: case VIR_DOMAIN_CHR_TYPE_NMDM: + case VIR_DOMAIN_CHR_TYPE_QEMU_VDAGENT: case VIR_DOMAIN_CHR_TYPE_LAST: ret =3D 0; break; diff --git a/src/security/security_dac.c b/src/security/security_dac.c index e9e316551e..5b840f4225 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_QEMU_VDAGENT: 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_QEMU_VDAGENT: case VIR_DOMAIN_CHR_TYPE_LAST: break; } diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index fe8908f533..10fdeacaa2 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -1042,6 +1042,7 @@ testQemuPrepareHostBackendChardevOne(virDomainDeviceD= ef *dev, case VIR_DOMAIN_CHR_TYPE_TCP: case VIR_DOMAIN_CHR_TYPE_SPICEVMC: case VIR_DOMAIN_CHR_TYPE_SPICEPORT: + case VIR_DOMAIN_CHR_TYPE_QEMU_VDAGENT: break; =20 case VIR_DOMAIN_CHR_TYPE_FILE: --=20 2.35.1 From nobody Tue May 14 15:51:58 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=1648150001; cv=none; d=zohomail.com; s=zohoarc; b=B3lde9RynUTt7K8Y7wQkGBI7uiMxu+T4CP6OibfGQ16M1WQ3FjsqHX98YuxY2o4blbTmxQaKzWJR0gX71AMJ2WdRy12dIuGz2cXdfVQEwGnMLbaga12yDlxUId9WBltNJUIzt2PfqJ6s9/rERtYt52W0F9Ay+7/DPnEE4OqZi9Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648150001; 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=HmRWT9b9PvycrQ5UXVjVhRGsXaPXl11qLP9z3T/7QP0=; b=H7p+znI+gwJ89cUt/mhOXWWs1qE6gSpTaLeyXtNh5gJ8raDGHqVlKZGm5DBkvxGA/kSJOwb2mhj+E0uoqR8MwnHNdlp+Nt/27q106iUYJ9ILP5wDttvKzDYaGR9wB1UL2j1qEAqskeZWuSpR2mpHv4Lo2kTXmvsZIhCd+vfY9Cw= 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 1648150001523526.8108763311914; Thu, 24 Mar 2022 12:26:41 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-675-Ik1lAEbAM4ih47lIJ3A2fg-1; Thu, 24 Mar 2022 15:26:37 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 719523800E8A; Thu, 24 Mar 2022 19:26:34 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5828A401E89; Thu, 24 Mar 2022 19:26:34 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 62BD81940376; Thu, 24 Mar 2022 19:26:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 4B4181940341 for ; Thu, 24 Mar 2022 19:26:26 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 17D1C9D46; Thu, 24 Mar 2022 19:26:26 +0000 (UTC) Received: from himantopus.redhat.com (unknown [10.22.18.107]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E077D9D47; Thu, 24 Mar 2022 19:26:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1648150000; 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=HmRWT9b9PvycrQ5UXVjVhRGsXaPXl11qLP9z3T/7QP0=; b=d979tP0qgMjdfS76XVgldeJtim35o+GoG+IqcpN1oic+Hw0aU9lK47BOUvvwEj8J1EggFm TCSsS2WT5H4bgVs6PK4pVTfOLnr0QQpneLPp1c1AndlBeEcjahgRfQLOnivYiqsmDfcvMj cMEYnyC+nu+MPptz2Y+OcIOrFcgGPao= X-MC-Unique: Ik1lAEbAM4ih47lIJ3A2fg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Jonathon Jongsma To: libvir-list@redhat.com Subject: [libvirt PATCH v2 4/4] qemu: add support for qemu-vdagent channel Date: Thu, 24 Mar 2022 14:25:44 -0500 Message-Id: <20220324192544.2095897-5-jjongsma@redhat.com> In-Reply-To: <20220324192544.2095897-1-jjongsma@redhat.com> References: <20220324192544.2095897-1-jjongsma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: marcandre.lureau@redhat.com Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 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-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1648150002847100005 Content-Type: text/plain; charset="utf-8"; x-default="true" Implement the qemu-vdagent channel introduced in the previous commit. Signed-off-by: Jonathon Jongsma Reviewed-by: Marc-Andr=C3=A9 Lureau --- src/qemu/qemu_command.c | 21 ++++++- src/qemu/qemu_monitor_json.c | 28 ++++++++- src/qemu/qemu_validate.c | 10 +++- ...l-qemu-vdagent-features.x86_64-latest.args | 41 +++++++++++++ .../channel-qemu-vdagent-features.xml | 37 ++++++++++++ .../channel-qemu-vdagent.x86_64-latest.args | 41 +++++++++++++ .../qemuxml2argvdata/channel-qemu-vdagent.xml | 37 ++++++++++++ tests/qemuxml2argvtest.c | 2 + ...el-qemu-vdagent-features.x86_64-latest.xml | 58 +++++++++++++++++++ .../channel-qemu-vdagent.x86_64-latest.xml | 58 +++++++++++++++++++ tests/qemuxml2xmltest.c | 2 + 11 files changed, 332 insertions(+), 3 deletions(-) create mode 100644 tests/qemuxml2argvdata/channel-qemu-vdagent-features.x8= 6_64-latest.args create mode 100644 tests/qemuxml2argvdata/channel-qemu-vdagent-features.xml create mode 100644 tests/qemuxml2argvdata/channel-qemu-vdagent.x86_64-late= st.args create mode 100644 tests/qemuxml2argvdata/channel-qemu-vdagent.xml create mode 100644 tests/qemuxml2xmloutdata/channel-qemu-vdagent-features.= x86_64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/channel-qemu-vdagent.x86_64-la= test.xml diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 1eef9fb6d0..67921229dd 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1389,8 +1389,27 @@ qemuBuildChardevStr(const virDomainChrSourceDef *dev, dev->data.spiceport.channel); break; =20 - case VIR_DOMAIN_CHR_TYPE_NMDM: case VIR_DOMAIN_CHR_TYPE_QEMU_VDAGENT: + virBufferAsprintf(&buf, "qemu-vdagent,id=3D%s,name=3Dvdagent", + charAlias); + if (dev->data.qemuVdagent.clipboard !=3D VIR_TRISTATE_BOOL_ABSENT) + virBufferAsprintf(&buf, ",clipboard=3D%s", + virTristateSwitchTypeToString(dev->data.qemu= Vdagent.clipboard)); + switch (dev->data.qemuVdagent.mouse) { + case VIR_DOMAIN_MOUSE_MODE_CLIENT: + virBufferAddLit(&buf, ",mouse=3Don"); + break; + case VIR_DOMAIN_MOUSE_MODE_SERVER: + virBufferAddLit(&buf, ",mouse=3Doff"); + break; + case VIR_DOMAIN_MOUSE_MODE_DEFAULT: + case VIR_DOMAIN_MOUSE_MODE_LAST: + default: + break; + } + break; + + case VIR_DOMAIN_CHR_TYPE_NMDM: case VIR_DOMAIN_CHR_TYPE_LAST: default: break; diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 1ac5377449..c7e18073c2 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -6814,11 +6814,37 @@ qemuMonitorJSONAttachCharDevGetProps(const char *ch= rID, =20 break; =20 + case VIR_DOMAIN_CHR_TYPE_QEMU_VDAGENT: { + virTristateBool mouse =3D VIR_TRISTATE_BOOL_ABSENT; + switch (chr->data.qemuVdagent.mouse) { + case VIR_DOMAIN_MOUSE_MODE_CLIENT: + mouse =3D VIR_TRISTATE_BOOL_YES; + break; + case VIR_DOMAIN_MOUSE_MODE_SERVER: + mouse =3D VIR_TRISTATE_BOOL_NO; + break; + case VIR_DOMAIN_MOUSE_MODE_DEFAULT: + break; + case VIR_DOMAIN_MOUSE_MODE_LAST: + default: + virReportEnumRangeError(virDomainMouseMode, + chr->data.qemuVdagent.mouse); + return NULL; + } + backendType =3D "qemu-vdagent"; + + if (virJSONValueObjectAdd(&backendData, + "T:clipboard", chr->data.qemuVdagent.cli= pboard, + "T:mouse", mouse, + NULL) < 0) + return NULL; + break; + } + case VIR_DOMAIN_CHR_TYPE_SPICEPORT: case VIR_DOMAIN_CHR_TYPE_PIPE: case VIR_DOMAIN_CHR_TYPE_STDIO: case VIR_DOMAIN_CHR_TYPE_NMDM: - case VIR_DOMAIN_CHR_TYPE_QEMU_VDAGENT: virReportError(VIR_ERR_OPERATION_FAILED, _("Hotplug unsupported for char device type '%s'"), virDomainChrTypeToString(chr->type)); diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 5ad3d914dc..2b60e63a2b 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -1981,6 +1981,15 @@ qemuValidateDomainChrSourceDef(const virDomainChrSou= rceDef *def, } break; =20 + case VIR_DOMAIN_CHR_TYPE_QEMU_VDAGENT: + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_QEMU_VDAGENT)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("chardev '%s' not supported in this QEMU bina= ry"), + virDomainChrTypeToString(def->type)); + return -1; + } + break; + case VIR_DOMAIN_CHR_TYPE_NULL: case VIR_DOMAIN_CHR_TYPE_VC: case VIR_DOMAIN_CHR_TYPE_PTY: @@ -1991,7 +2000,6 @@ 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_QEMU_VDAGENT: case VIR_DOMAIN_CHR_TYPE_LAST: break; } diff --git a/tests/qemuxml2argvdata/channel-qemu-vdagent-features.x86_64-la= test.args b/tests/qemuxml2argvdata/channel-qemu-vdagent-features.x86_64-lat= est.args new file mode 100644 index 0000000000..651246bdfd --- /dev/null +++ b/tests/qemuxml2argvdata/channel-qemu-vdagent-features.x86_64-latest.ar= gs @@ -0,0 +1,41 @@ +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-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ +-accel tcg \ +-cpu qemu64 \ +-m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0"= ,"addr":"0xa"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-chardev qemu-vdagent,id=3Dcharchannel0,name=3Dvdagent,clipboard=3Don,mous= e=3Don \ +-device '{"driver":"virtserialport","bus":"virtio-serial1.0","nr":3,"chard= ev":"charchannel0","id":"channel0","name":"com.redhat.spice.0"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-vnc 127.0.0.1:3,audiodev=3Daudio1 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/channel-qemu-vdagent-features.xml b/tes= ts/qemuxml2argvdata/channel-qemu-vdagent-features.xml new file mode 100644 index 0000000000..2d8afe3d33 --- /dev/null +++ b/tests/qemuxml2argvdata/channel-qemu-vdagent-features.xml @@ -0,0 +1,37 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219136 + 1 + + hvm + + + + destroy + restart + destroy + + /usr/bin/qemu-system-x86_64 + + + +
+ + + + +
+ + + + +
+ + + + + + + + diff --git a/tests/qemuxml2argvdata/channel-qemu-vdagent.x86_64-latest.args= b/tests/qemuxml2argvdata/channel-qemu-vdagent.x86_64-latest.args new file mode 100644 index 0000000000..0f49b48ca8 --- /dev/null +++ b/tests/qemuxml2argvdata/channel-qemu-vdagent.x86_64-latest.args @@ -0,0 +1,41 @@ +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-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tm= p/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram \ +-accel tcg \ +-cpu qemu64 \ +-m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0"= ,"addr":"0xa"}' \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-chardev qemu-vdagent,id=3Dcharchannel0,name=3Dvdagent,clipboard=3Doff,mou= se=3Doff \ +-device '{"driver":"virtserialport","bus":"virtio-serial1.0","nr":3,"chard= ev":"charchannel0","id":"channel0","name":"com.redhat.spice.0"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-vnc 127.0.0.1:3,audiodev=3Daudio1 \ +-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/channel-qemu-vdagent.xml b/tests/qemuxm= l2argvdata/channel-qemu-vdagent.xml new file mode 100644 index 0000000000..91a62888df --- /dev/null +++ b/tests/qemuxml2argvdata/channel-qemu-vdagent.xml @@ -0,0 +1,37 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219136 + 1 + + hvm + + + + destroy + restart + destroy + + /usr/bin/qemu-system-x86_64 + + + +
+ + + + +
+ + + + +
+ + + + + + + + diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index e7fecb24d3..a20dec1d25 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1726,6 +1726,8 @@ mymain(void) DO_TEST("channel-spicevmc", QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_CIRRUS_VGA); + DO_TEST_CAPS_LATEST("channel-qemu-vdagent"); + DO_TEST_CAPS_LATEST("channel-qemu-vdagent-features"); DO_TEST("channel-virtio-default", QEMU_CAPS_SPICE); DO_TEST_NOCAPS("channel-virtio-unix"); diff --git a/tests/qemuxml2xmloutdata/channel-qemu-vdagent-features.x86_64-= latest.xml b/tests/qemuxml2xmloutdata/channel-qemu-vdagent-features.x86_64-= latest.xml new file mode 100644 index 0000000000..66a9135fc7 --- /dev/null +++ b/tests/qemuxml2xmloutdata/channel-qemu-vdagent-features.x86_64-latest.= xml @@ -0,0 +1,58 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219136 + 219136 + 1 + + hvm + + + + qemu64 + + + destroy + restart + destroy + + /usr/bin/qemu-system-x86_64 + + + + +
+ + +
+ + +
+ + +
+ + + + + + + + +
+ + + + + + +