public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH guest-common 2/2] mapping: pci: optionally return the config in 'find_on_current_node'
Date: Mon, 18 Mar 2024 12:18:29 +0100	[thread overview]
Message-ID: <20240318111836.1947580-3-d.csapak@proxmox.com> (raw)
In-Reply-To: <20240318111836.1947580-1-d.csapak@proxmox.com>

this is useful to get to the config without having to parse it again

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 src/PVE/Mapping/PCI.pm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/PVE/Mapping/PCI.pm b/src/PVE/Mapping/PCI.pm
index 0866175..9d8a4a7 100644
--- a/src/PVE/Mapping/PCI.pm
+++ b/src/PVE/Mapping/PCI.pm
@@ -219,10 +219,11 @@ sub find_on_current_node {
 sub get_node_mapping {
     my ($cfg, $id, $nodename) = @_;
 
-    return undef if !defined($cfg->{ids}->{$id});
+    my $map_config = $cfg->{ids}->{$id};
+    return undef if !defined($map_config);
 
     my $res = [];
-    for my $map ($cfg->{ids}->{$id}->{map}->@*) {
+    for my $map ($map_config->{map}->@*) {
 	my $entry = eval { parse_property_string($map_fmt, $map) };
 	warn $@ if $@;
 	if ($entry && $entry->{node} eq $nodename) {
@@ -230,7 +231,7 @@ sub get_node_mapping {
 	}
     }
 
-    return $res;
+    return wantarray ? ($res, $map_config) : $res;
 }
 
 PVE::Mapping::PCI->register();
-- 
2.39.2





  parent reply	other threads:[~2024-03-18 11:19 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-18 11:18 [pve-devel] [PATCH guest-common/qemu-server/manager/docs] enable experimental support for pci live migration Dominik Csapak
2024-03-18 11:18 ` [pve-devel] [PATCH guest-common 1/2] mapping: pci: add 'live-migration-capable' flag to mappings Dominik Csapak
2024-03-22 13:37   ` Fiona Ebner
2024-04-02  9:30     ` Dominik Csapak
2024-04-10 10:09       ` Fiona Ebner
2024-03-18 11:18 ` Dominik Csapak [this message]
2024-03-22 13:38   ` [pve-devel] [PATCH guest-common 2/2] mapping: pci: optionally return the config in 'find_on_current_node' Fiona Ebner
2024-04-02  9:32     ` Dominik Csapak
2024-03-18 11:18 ` [pve-devel] [PATCH qemu-server 1/4] usb: fix undef error on string match Dominik Csapak
2024-03-22 13:36   ` Fiona Ebner
2024-03-18 11:18 ` [pve-devel] [PATCH qemu-server 2/4] pci: set 'enable-migration' to on for live-migration marked mapped devices Dominik Csapak
2024-03-18 11:18 ` [pve-devel] [PATCH qemu-server 3/4] check_local_resources: add more info per mapped device Dominik Csapak
2024-03-22 13:37   ` Fiona Ebner
2024-04-02  9:35     ` Dominik Csapak
2024-03-18 11:18 ` [pve-devel] [PATCH qemu-server 4/4] api: enable live migration for marked mapped pci devices Dominik Csapak
2024-03-22 13:37   ` Fiona Ebner
2024-04-02  9:36     ` Dominik Csapak
2024-03-18 11:18 ` [pve-devel] [PATCH docs 1/2] qm: resource mapping: add description for `mdev` option Dominik Csapak
2024-03-18 11:18 ` [pve-devel] [PATCH docs 2/2] qm: resource mapping: document `live-migration-capable` setting Dominik Csapak
2024-03-18 11:18 ` [pve-devel] [PATCH manager 1/1] ui: allow configuring and live migration of mapped pci resources Dominik Csapak

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240318111836.1947580-3-d.csapak@proxmox.com \
    --to=d.csapak@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal