From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id DFC769120B for ; Wed, 7 Sep 2022 11:26:08 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DDA7F2BF for ; Wed, 7 Sep 2022 11:26:08 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 7 Sep 2022 11:26:07 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id BFF3143E4C for ; Wed, 7 Sep 2022 11:18:36 +0200 (CEST) From: Markus Frank To: pve-devel@lists.proxmox.com Date: Wed, 7 Sep 2022 11:17:58 +0200 Message-Id: <20220907091802.24188-1-m.frank@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.055 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH qemu-server 1/5] enable clipboard parameter in vga_fmt X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Sep 2022 09:26:08 -0000 added Options to use the qemu vdagent implementation to enable the noVNC clipboard. When enabled with SPICE the spice-vdagent gets replaced with the qemu implementation. This patch does not solve #1406, but does allow copy and paste with a running X-session, when spice-vdagent is installed. Signed-off-by: Markus Frank --- The alternative to replacing spicevmc would be to only allow noVNC clipboard if no SPICE is running, because qemu cannot use the same virtserialport twice. This alternative would also disable the ability to use the noVNC clipboard with VirtIO/VirGL. PVE/QemuServer.pm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index c706653..636de2f 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -190,6 +190,12 @@ my $vga_fmt = { minimum => 4, maximum => 512, }, + clipboard => { + description => "enable clipboard (requires spice-vdagent)", + type => 'boolean', + optional => 1, + default => 0 + } }; my $ivshmem_fmt = { @@ -3836,6 +3842,12 @@ sub config_to_command { } } + if ($vga->{clipboard} && $vga->{type} =~ /^std|^cirrus|^vmware/) { + push @$devices, '-chardev', 'qemu-vdagent,id=vdagent,name=vdagent,clipboard=on'; + push @$devices, '-device', 'virtio-serial-pci'; + push @$devices, '-device', 'virtserialport,chardev=vdagent,name=com.redhat.spice.0'; + } + my $rng = $conf->{rng0} ? parse_rng($conf->{rng0}) : undef; if ($rng && $version_guard->(4, 1, 2)) { check_rng_source($rng->{source}); @@ -3880,7 +3892,11 @@ sub config_to_command { die "failed to get an ip address of type $pfamily for 'localhost'\n" if !@nodeaddrs; push @$devices, '-device', "virtio-serial,id=spice$pciaddr"; - push @$devices, '-chardev', "spicevmc,id=vdagent,name=vdagent"; + if ($vga->{clipboard}) { + push @$devices, '-chardev', 'qemu-vdagent,id=vdagent,name=vdagent,clipboard=on'; + } else { + push @$devices, '-chardev', "spicevmc,id=vdagent,name=vdagent"; + } push @$devices, '-device', "virtserialport,chardev=vdagent,name=com.redhat.spice.0"; my $localhost = PVE::Network::addr_to_ip($nodeaddrs[0]->{addr}); -- 2.30.2