From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [45.144.208.40]) by lore.proxmox.com (Postfix) with ESMTPS id 7055A1FF0B2 for ; Tue, 08 Sep 2026 15:57:45 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 0B142215E4; Tue, 08 Sep 2026 15:57:36 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Subject: [PATCH qemu-server v3 4/8] code cleanup: hot-plug: simplify getting bridge for device Date: Tue, 8 Sep 2026 15:52:04 +0200 Message-ID: <20260908135729.3869365-5-d.csapak@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260908135729.3869365-1-d.csapak@proxmox.com> References: <20260908135729.3869365-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.513 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: 574E6AV5TIUZIKD2U4GOIBCMYO7RCR62 X-Message-ID-Hash: 574E6AV5TIUZIKD2U4GOIBCMYO7RCR62 X-MailFrom: d.csapak@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Instead of routing through `print_pci_addr` and checking which bridges are needed, simply expose a new function that does exactly return which `bus` (which translates to a bridge) is used for the device. Signed-off-by: Dominik Csapak --- src/PVE/QemuServer.pm | 10 +--------- src/PVE/QemuServer/PCI.pm | 11 +++++++++++ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm index 8c8d3df8..ce3eea4d 100644 --- a/src/PVE/QemuServer.pm +++ b/src/PVE/QemuServer.pm @@ -4218,15 +4218,7 @@ sub qemu_deletescsihw { sub qemu_add_pci_bridge { my ($storecfg, $conf, $vmid, $device, $arch, $machine_type) = @_; - my $bridges = {}; - - my $bridgeid; - - print_pci_addr($device, $bridges, $arch); - - while (my ($k, $v) = each %$bridges) { - $bridgeid = $k; - } + my $bridgeid = PVE::QemuServer::PCI::get_pci_bridge_for_device($device); return 1 if !defined($bridgeid) || $bridgeid < 1; my $bridge = "pci.$bridgeid"; diff --git a/src/PVE/QemuServer/PCI.pm b/src/PVE/QemuServer/PCI.pm index bae46cb7..8069f104 100644 --- a/src/PVE/QemuServer/PCI.pm +++ b/src/PVE/QemuServer/PCI.pm @@ -291,6 +291,17 @@ my $get_addr_mapping_from_id = sub { return { bus => $d->{bus}, addr => sprintf("0x%x", $d->{addr}) }; }; +sub get_pci_bridge_for_device { + my ($id) = @_; + + my $map = get_pci_addr_map(); + if (my $d = $get_addr_mapping_from_id->($map, $id)) { + return $d->{bus}; + } + + return; +} + sub print_pci_addr { my ($id, $bridges, $arch) = @_; -- 2.47.3