From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 3F7741FF183 for ; Wed, 16 Jul 2025 18:33:23 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EEC701742E; Wed, 16 Jul 2025 18:34:22 +0200 (CEST) To: pve-devel@lists.proxmox.com Date: Wed, 16 Jul 2025 18:34:09 +0200 In-Reply-To: <20250716163415.1837210-1-alexandre.derumier@groupe-cyllene.com> References: <20250716163415.1837210-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 v2 qemu-server 04/10] pci: add get_pci_addr Content-Type: multipart/mixed; boundary="===============1542041244845131909==" Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" --===============1542041244845131909== 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 CB69EC90D8 for ; Wed, 16 Jul 2025 18:34:20 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8A4E517379 for ; Wed, 16 Jul 2025 18:34:20 +0200 (CEST) Received: from bastiontest.odiso.net (unknown [185.151.190.228]) (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, 16 Jul 2025 18:34:19 +0200 (CEST) Received: from formationkvm1.odiso.net (unknown [10.11.201.57]) by bastiontest.odiso.net (Postfix) with ESMTP id F41F3862E45; Wed, 16 Jul 2025 18:34:17 +0200 (CEST) Received: by formationkvm1.odiso.net (Postfix, from userid 0) id EFC5F11F6B1F; Wed, 16 Jul 2025 18:34:17 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Subject: [PATCH v2 qemu-server 04/10] pci: add get_pci_addr Date: Wed, 16 Jul 2025 18:34:09 +0200 Message-Id: <20250716163415.1837210-5-alexandre.derumier@groupe-cyllene.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250716163415.1837210-1-alexandre.derumier@groupe-cyllene.com> References: <20250716163415.1837210-1-alexandre.derumier@groupe-cyllene.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.103 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.001 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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 return a hash with pci bus && pci address Signed-off-by: Alexandre Derumier --- src/PVE/QemuServer/PCI.pm | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/PVE/QemuServer/PCI.pm b/src/PVE/QemuServer/PCI.pm index e7a9a610..94fd10bd 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,12 +289,12 @@ 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) = @_; die "aarch64 cannot use IDE devices\n" if $arch eq 'aarch64' && $id =~ /^ide/; - my $res = ''; + my $res = {}; my $map = get_pci_addr_map(); if (my $d = $get_addr_mapping_from_id->($map, $id)) { @@ -301,13 +302,23 @@ sub print_pci_addr { # virt machine has an initial pcie.0. The other pci bridges that get added are called pci.N. my $busname = $arch eq 'aarch64' && $d->{bus} eq 0 ? 'pcie' : 'pci'; - $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 --===============1542041244845131909== 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 --===============1542041244845131909==--