From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id B066F1FF183 for ; Wed, 2 Jul 2025 16:49:22 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 474661DDC2; Wed, 2 Jul 2025 16:49:42 +0200 (CEST) To: pve-devel@lists.proxmox.com Date: Wed, 2 Jul 2025 16:48:54 +0200 In-Reply-To: <20250702144900.3963405-1-alexandre.derumier@groupe-cyllene.com> References: <20250702144900.3963405-1-alexandre.derumier@groupe-cyllene.com> MIME-Version: 1.0 Message-ID: List-Id: Proxmox VE development discussion List-Post: From: Alexandre Derumier via pve-devel Precedence: list Cc: Alexandre Derumier X-Mailman-Version: 2.1.29 X-BeenThere: pve-devel@lists.proxmox.com List-Subscribe: , List-Unsubscribe: , List-Archive: Reply-To: Proxmox VE development discussion List-Help: Subject: [pve-devel] [PATCH qemu-server 04/10] pci: add get_pci_addr Content-Type: multipart/mixed; boundary="===============1309074862944871226==" Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" --===============1309074862944871226== Content-Type: message/rfc822 Content-Disposition: inline Return-Path: X-Original-To: pve-devel@lists.proxmox.com Delivered-To: pve-devel@lists.proxmox.com 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 609A8D3CA5 for ; Wed, 2 Jul 2025 16:49:40 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 426F91D9A9 for ; Wed, 2 Jul 2025 16:49:10 +0200 (CEST) Received: from bastiontest.odiso.net (unknown [IPv6:2a0a:1580:2000:6700::14]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 2 Jul 2025 16:49:08 +0200 (CEST) Received: from formationkvm1.odiso.net (unknown [10.11.201.57]) by bastiontest.odiso.net (Postfix) with ESMTP id 60AA6862E44; Wed, 2 Jul 2025 16:49:01 +0200 (CEST) Received: by formationkvm1.odiso.net (Postfix, from userid 0) id 597C1112B925; Wed, 2 Jul 2025 16:49:01 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Subject: [PATCH qemu-server 04/10] pci: add get_pci_addr Date: Wed, 2 Jul 2025 16:48:54 +0200 Message-Id: <20250702144900.3963405-5-alexandre.derumier@groupe-cyllene.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250702144900.3963405-1-alexandre.derumier@groupe-cyllene.com> References: <20250702144900.3963405-1-alexandre.derumier@groupe-cyllene.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.107 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_NONE 0.1 DMARC none policy HEADER_FROM_DIFFERENT_DOMAINS 0.017 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_NONE 0.25 DKIM has Failed or SPF has failed on the message and the domain has no DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [pci.pm] return a hash with pci bus && pci address Signed-off-by: Alexandre Derumier --- src/PVE/QemuServer/PCI.pm | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/PVE/QemuServer/PCI.pm b/src/PVE/QemuServer/PCI.pm index ddf2f028..7952dc61 100644 --- a/src/PVE/QemuServer/PCI.pm +++ b/src/PVE/QemuServer/PCI.pm @@ -16,6 +16,7 @@ use PVE::QemuServer::Machine; use base 'Exporter'; our @EXPORT_OK = qw( + get_pci_addr print_pci_addr print_pcie_addr print_pcie_root_port @@ -288,27 +289,38 @@ my $get_addr_mapping_from_id = sub { return { bus => $d->{bus}, addr => sprintf("0x%x", $d->{addr}) }; }; -sub print_pci_addr { +sub get_pci_addr { my ($id, $bridges, $arch) = @_; - my $res = ''; + my $res = {}; # using same bus slots on all HW, so we need to check special cases here: my $busname = 'pci'; if ($arch eq 'aarch64') { - die "aarch64 cannot use IDE devices\n" if $id =~ /^ide/; - $busname = 'pcie'; + die "aarch64 cannot use IDE devices\n" if $id =~ /^ide/; + $busname = 'pcie'; } my $map = get_pci_addr_map(); if (my $d = $get_addr_mapping_from_id->($map, $id)) { - $res = ",bus=$busname.$d->{bus},addr=$d->{addr}"; + $res = { bus => "$busname.$d->{bus}", addr => $d->{addr} }; $bridges->{ $d->{bus} } = 1 if $bridges; } return $res; } + +sub print_pci_addr { + my ($id, $bridges, $arch) = @_; + + my $pci = get_pci_addr($id, $bridges, $arch); + my $res = ""; + $res.=",bus=$pci->{bus}" if $pci->{bus}; + $res.=",addr=$pci->{addr}" if $pci->{addr}; + return $res; +} + my $pcie_addr_map; sub get_pcie_addr_map { -- 2.39.5 --===============1309074862944871226== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel --===============1309074862944871226==--