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 057218A65D for ; Thu, 20 Oct 2022 13:15:24 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BF4F57054 for ; Thu, 20 Oct 2022 13:14:53 +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 ; Thu, 20 Oct 2022 13:14:53 +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 CDE6444ABC for ; Thu, 20 Oct 2022 13:14:52 +0200 (CEST) From: Markus Frank To: pve-devel@lists.proxmox.com Date: Thu, 20 Oct 2022 13:14:39 +0200 Message-Id: <20221020111443.158234-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.052 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 Subject: [pve-devel] [PATCH qemu-server v2 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: Thu, 20 Oct 2022 11:15:24 -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 --- v2: added pci address to virtio-serial-pci With this Patch you have the ability to choose which clipboard-implementation to use when using Spice. The alternative 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 | 19 ++++++++++++++++++- PVE/QemuServer/PCI.pm | 3 ++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index c706653..333afc2 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,13 @@ sub config_to_command { } } + if ($vga->{clipboard} && $vga->{type} =~ /^std|^cirrus|^vmware/) { + push @$devices, '-chardev', 'qemu-vdagent,id=vdagent,name=vdagent,clipboard=on'; + my $pciaddr = print_pci_addr("clipboard", $bridges, $arch, $machine_type); + push @$devices, '-device', "virtio-serial-pci$pciaddr"; + 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 +3893,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}); diff --git a/PVE/QemuServer/PCI.pm b/PVE/QemuServer/PCI.pm index 3d0e70e..7ddabe0 100644 --- a/PVE/QemuServer/PCI.pm +++ b/PVE/QemuServer/PCI.pm @@ -138,7 +138,8 @@ sub get_pci_addr_map { scsihw1 => { bus => 0, addr => 6 }, ahci0 => { bus => 0, addr => 7 }, qga0 => { bus => 0, addr => 8 }, - spice => { bus => 0, addr => 9 }, + spice => { bus => 0, addr => 9, conflict_ok => qw(clipboard) }, + clipboard => { bus => 0, addr => 9, conflict_ok => qw(spice) }, # clipboard is used if spice is not running virtio0 => { bus => 0, addr => 10 }, virtio1 => { bus => 0, addr => 11 }, virtio2 => { bus => 0, addr => 12 }, -- 2.30.2