[pve-devel] [PATCH common v3 2/3] add PVE/HardwareMap

Thomas Lamprecht t.lamprecht at proxmox.com
Wed Nov 9 09:46:45 CET 2022


high level comment: should this go into pve-guest-common instead?

Am 20/09/2022 um 14:50 schrieb Dominik Csapak:
> this adds functionality for the hardwaremap config (as json)
> the format of the config is like this:
> 
> {
>     usb => {
> 	name => {
> 	    nodename1 => { /* mapping object */ },
> 	    nodename2 => { /* mapping object */ }
> 	}
>     },
>     pci => {
> 	/* same as above */
>     },
>     digest => "<DIGEST-STRING>"
> }
> 
> a single mapping object contains some info about the device, e.g.
> for pci the (sub)vendor, sub(device), the mdev capability, path, etc.
> 
> for pci multifunction devices (e.g. 01:02 instead of 01:02.0), we use
> the values of the first function to identify it.
> 
> note that for multifunction devices, we require 'mdev' to be undef
> regardless what the first function is capable of, since
> we cannot use mediated devices with multifunction devices anyway.
> 
> it also adds some helpers for the api schema & asserting that the
> device mappings are valid (by checking the saved properties
> against the ones found on the current available devices)
> 
> we use a single cluster wide json here, because section config is too

"json file"

If it's json it should end with .json and I misread where you put it, please
don't pollute /etc/pve/nodes/ with some files, rather just use /etc/pve directly,
while that directory is a bit growing it's at least fitting the common file
location semantics for cluster-wide shared files.

I unpulled the cluster patch for registering the file for now.

> limited to properly represent the data we need and easily access the
> config of all nodes when we need it (e.g. in api calls regarding
> migration and configuration)
> 
> Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
> ---
>  src/Makefile           |   1 +
>  src/PVE/HardwareMap.pm | 367 +++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 368 insertions(+)
>  create mode 100644 src/PVE/HardwareMap.pm
> 
> diff --git a/src/Makefile b/src/Makefile
> index 13de6c6..8527704 100644
> --- a/src/Makefile
> +++ b/src/Makefile
> @@ -17,6 +17,7 @@ LIB_SOURCES = \
>  	Daemon.pm \
>  	Exception.pm \
>  	Format.pm \
> +	HardwareMap.pm \
>  	INotify.pm \
>  	JSONSchema.pm \
>  	LDAP.pm \
> diff --git a/src/PVE/HardwareMap.pm b/src/PVE/HardwareMap.pm
> new file mode 100644
> index 0000000..31841b4
> --- /dev/null
> +++ b/src/PVE/HardwareMap.pm
> @@ -0,0 +1,367 @@
> +package PVE::HardwareMap;
> +
> +use strict;
> +use warnings;
> +
> +use Digest::SHA;
> +use JSON;
> +use Storable qw(dclone);
> +
> +use PVE::Cluster qw(cfs_register_file cfs_read_file cfs_write_file cfs_lock_file);

are you really introducing a cyclic dependency from pve-common <-> pve-cluster, yeah no
NAK! tbh. it would think that long term Proxmox engineers know that this is a no-go if
just anyhow possible







More information about the pve-devel mailing list