From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pve-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id E20111FF173 for <inbox@lore.proxmox.com>; Mon, 10 Feb 2025 16:38:59 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6A3B011B4B; Mon, 10 Feb 2025 16:38:28 +0100 (CET) From: Filip Schauer <f.schauer@proxmox.com> To: pve-devel@lists.proxmox.com Date: Mon, 10 Feb 2025 16:37:32 +0100 Message-Id: <20250210153734.103381-10-f.schauer@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250210153734.103381-1-f.schauer@proxmox.com> References: <20250210153734.103381-1-f.schauer@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.022 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 v3 09/11] add helpers for VirtIO RNG command line arguments X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/> List-Post: <mailto:pve-devel@lists.proxmox.com> List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe> Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com> Signed-off-by: Filip Schauer <f.schauer@proxmox.com> --- PVE/QemuServer.pm | 18 +++++------------- PVE/QemuServer/RNG.pm | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 13 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 09d2b3a8..70518924 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -60,7 +60,7 @@ use PVE::QemuServer::MetaInfo; use PVE::QemuServer::Monitor qw(mon_cmd); use PVE::QemuServer::PCI qw(print_pci_addr print_pcie_addr print_pcie_root_port parse_hostpci); use PVE::QemuServer::QMPHelpers qw(qemu_deviceadd qemu_devicedel qemu_objectadd qemu_objectdel); -use PVE::QemuServer::RNG qw(check_rng_source parse_rng); +use PVE::QemuServer::RNG qw(parse_rng print_rng_device_commandline print_rng_object_commandline); use PVE::QemuServer::USB; my $have_sdn; @@ -3685,18 +3685,10 @@ sub config_to_command { my $rng = $conf->{rng0} ? parse_rng($conf->{rng0}) : undef; if ($rng && $version_guard->(4, 1, 2)) { - check_rng_source($rng->{source}); - - my $max_bytes = $rng->{max_bytes} // $rng_fmt->{max_bytes}->{default}; - my $period = $rng->{period} // $rng_fmt->{period}->{default}; - my $limiter_str = ""; - if ($max_bytes) { - $limiter_str = ",max-bytes=$max_bytes,period=$period"; - } - - my $rng_addr = print_pci_addr("rng0", $bridges, $arch, $machine_type); - push @$devices, '-object', "rng-random,filename=$rng->{source},id=rng0"; - push @$devices, '-device', "virtio-rng-pci,rng=rng0$limiter_str$rng_addr"; + my $rng_object = print_rng_object_commandline('rng0', $rng); + my $rng_device = print_rng_device_commandline('rng0', $rng, $bridges, $arch, $machine_type); + push @$devices, '-object', $rng_object; + push @$devices, '-device', $rng_device; } my $spice_port; diff --git a/PVE/QemuServer/RNG.pm b/PVE/QemuServer/RNG.pm index 22d1e9cc..ae5b2530 100644 --- a/PVE/QemuServer/RNG.pm +++ b/PVE/QemuServer/RNG.pm @@ -13,6 +13,8 @@ use base 'Exporter'; our @EXPORT_OK = qw( parse_rng check_rng_source +print_rng_device_commandline +print_rng_object_commandline ); my $rng_fmt = { @@ -83,4 +85,44 @@ sub check_rng_source { } } +sub get_rng_source_path { + my ($rng) = @_; + + my $source = $rng->{source}; + + if (defined($source)) { + return $source; + } + + return; +} + +sub print_rng_device_commandline { + my ($id, $rng, $bridges, $arch, $machine) = @_; + + die "no rng device specified\n" if !$rng; + + my $max_bytes = $rng->{max_bytes} // $rng_fmt->{max_bytes}->{default}; + my $period = $rng->{period} // $rng_fmt->{period}->{default}; + my $limiter_str = ""; + if ($max_bytes) { + $limiter_str = ",max-bytes=$max_bytes,period=$period"; + } + + my $rng_addr = print_pci_addr($id, $bridges, $arch, $machine); + + return "virtio-rng-pci,rng=$id$limiter_str$rng_addr"; +} + +sub print_rng_object_commandline { + my ($id, $rng) = @_; + + die "no rng device specified\n" if !$rng; + + my $source_path = get_rng_source_path($rng); + check_rng_source($source_path); + + return "rng-random,filename=$source_path,id=$id"; +} + 1; -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel