From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH guest-common v2 2/5] mapping: pci: rework properties check
Date: Wed, 10 Apr 2024 13:03:41 +0200 [thread overview]
Message-ID: <20240410110401.2226201-3-d.csapak@proxmox.com> (raw)
In-Reply-To: <20240410110401.2226201-1-d.csapak@proxmox.com>
refactors the actual checking out to its own sub, so we can reuse it
later
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
src/PVE/Mapping/PCI.pm | 43 +++++++++++++++++++++++++-----------------
1 file changed, 26 insertions(+), 17 deletions(-)
diff --git a/src/PVE/Mapping/PCI.pm b/src/PVE/Mapping/PCI.pm
index 725e106..fcf07c0 100644
--- a/src/PVE/Mapping/PCI.pm
+++ b/src/PVE/Mapping/PCI.pm
@@ -129,6 +129,26 @@ sub options {
};
}
+my sub check_properties {
+ my ($correct, $configured, $path, $name) = @_;
+ for my $prop (sort keys %$correct) {
+ next if !defined($correct->{$prop}) && !defined($configured->{$prop});
+
+ die "no '$prop' for device '$path'\n"
+ if defined($correct->{$prop}) && !defined($configured->{$prop});
+ die "'$prop' configured but should not be\n"
+ if !defined($correct->{$prop}) && defined($configured->{$prop});
+
+ my $correct_prop = $correct->{$prop};
+ $correct_prop =~ s/0x//g;
+ my $configured_prop = $configured->{$prop};
+ $configured_prop =~ s/0x//g;
+
+ die "'$prop' does not match for '$name' ($correct_prop != $configured_prop)\n"
+ if $correct_prop ne $configured_prop;
+ }
+}
+
# checks if the given config is valid for the current node
sub assert_valid {
my ($name, $cfg) = @_;
@@ -150,30 +170,19 @@ sub assert_valid {
my $correct_props = {
id => "$info->{vendor}:$info->{device}",
- iommugroup => $info->{iommugroup},
};
+ # check iommu only on the first device
+ if ($idx == 0) {
+ $correct_props->{iommugroup} = $info->{iommugroup};
+ }
+
if (defined($info->{'subsystem_vendor'}) && defined($info->{'subsystem_device'})) {
$correct_props->{'subsystem-id'} = "$info->{'subsystem_vendor'}:$info->{'subsystem_device'}";
}
- for my $prop (sort keys %$correct_props) {
- next if $prop eq 'iommugroup' && $idx > 0; # check iommu only on the first device
-
- next if !defined($correct_props->{$prop}) && !defined($cfg->{$prop});
- die "no '$prop' for device '$path'\n"
- if defined($correct_props->{$prop}) && !defined($cfg->{$prop});
- die "'$prop' configured but should not be\n"
- if !defined($correct_props->{$prop}) && defined($cfg->{$prop});
+ check_properties($correct_props, $cfg, $path, $name);
- my $correct_prop = $correct_props->{$prop};
- $correct_prop =~ s/0x//g;
- my $configured_prop = $cfg->{$prop};
- $configured_prop =~ s/0x//g;
-
- die "'$prop' does not match for '$name' ($correct_prop != $configured_prop)\n"
- if $correct_prop ne $configured_prop;
- }
$idx++;
}
--
2.39.2
next prev parent reply other threads:[~2024-04-10 11:04 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-10 11:03 [pve-devel] [PATCH guest-common/qemu-server/manager/docs v2] implement experimental vgpu live migration Dominik Csapak
2024-04-10 11:03 ` [pve-devel] [PATCH guest-common v2 1/5] mapping: pci: fix missing description/default for mdev Dominik Csapak
2024-04-11 16:27 ` [pve-devel] applied: " Thomas Lamprecht
2024-04-10 11:03 ` Dominik Csapak [this message]
2024-04-11 16:49 ` [pve-devel] [PATCH guest-common v2 2/5] mapping: pci: rework properties check Thomas Lamprecht
2024-04-10 11:03 ` [pve-devel] [PATCH guest-common v2 3/5] mapping: pci: check the mdev configuration on the device too Dominik Csapak
2024-04-10 11:03 ` [pve-devel] [PATCH guest-common v2 4/5] mapping: pci: add 'live-migration-capable' flag to mappings Dominik Csapak
2024-04-10 11:03 ` [pve-devel] [PATCH guest-common v2 5/5] mapping: remove find_on_current_node Dominik Csapak
2024-04-10 11:03 ` [pve-devel] [PATCH qemu-server v2 01/10] usb: mapping: move implementation of find_on_current_node here Dominik Csapak
2024-04-10 11:03 ` [pve-devel] [PATCH qemu-server v2 02/10] pci: " Dominik Csapak
2024-04-10 11:03 ` [pve-devel] [PATCH qemu-server v2 03/10] pci: mapping: check mdev config against hardware Dominik Csapak
2024-04-10 11:03 ` [pve-devel] [PATCH qemu-server v2 04/10] stop cleanup: remove unnecessary tpmstate cleanup Dominik Csapak
2024-04-10 11:03 ` [pve-devel] [PATCH qemu-server v2 05/10] vm_stop_cleanup: add noerr parameter Dominik Csapak
2024-04-10 11:03 ` [pve-devel] [PATCH qemu-server v2 06/10] migrate: call vm_stop_cleanup after stopping in phase3_cleanup Dominik Csapak
2024-04-10 11:03 ` [pve-devel] [PATCH qemu-server v2 07/10] pci: set 'enable-migration' to on for live-migration marked mapped devices Dominik Csapak
2024-04-10 11:03 ` [pve-devel] [PATCH qemu-server v2 08/10] check_local_resources: add more info per mapped device and return as hash Dominik Csapak
2024-04-10 11:03 ` [pve-devel] [PATCH qemu-server v2 09/10] api: enable live migration for marked mapped pci devices Dominik Csapak
2024-04-10 11:03 ` [pve-devel] [PATCH qemu-server v2 10/10] api: include not mapped resources for running vms in migrate preconditions Dominik Csapak
2024-04-10 11:03 ` [pve-devel] [PATCH manager v2 1/5] mapping: pci: include mdev in config checks Dominik Csapak
2024-04-10 11:03 ` [pve-devel] [PATCH manager v2 2/5] bulk migrate: improve precondition checks Dominik Csapak
2024-04-10 11:03 ` [pve-devel] [PATCH manager v2 3/5] bulk migrate: include checks for live-migratable local resources Dominik Csapak
2024-04-10 11:03 ` [pve-devel] [PATCH manager v2 4/5] ui: adapt migration window to precondition api change Dominik Csapak
2024-04-10 11:03 ` [pve-devel] [PATCH manager v2 5/5] fix #5175: ui: allow configuring and live migration of mapped pci resources Dominik Csapak
2024-04-10 11:04 ` [pve-devel] [PATCH docs v2 1/2] qm: resource mapping: add description for `mdev` option Dominik Csapak
2024-04-10 11:04 ` [pve-devel] [PATCH docs v2 2/2] qm: resource mapping: document `live-migration-capable` setting 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=20240410110401.2226201-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