Re: [PATCH qemu-server v4 4/7] pci: factor 'prepare_pci_devices' out to PVE::QemuServer::PCI module

["Jakob Klocker" <j.klocker@proxmox.com>]

nit inline
On Tue Aug 25, 2026 at 3:54 PM CEST, Dominik Csapak wrote:
> no functional change intended.
>
> Note: $conf is unused in `prepare_pci_devices` for now, but will be used
> later.
>
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
>  src/PVE/QemuServer.pm     | 36 ++-------------------------------
>  src/PVE/QemuServer/PCI.pm | 42 +++++++++++++++++++++++++++++++++++++++
>  2 files changed, 44 insertions(+), 34 deletions(-)
>
> diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm
> index 9c4c13b9..3eeea871 100644
> --- a/src/PVE/QemuServer.pm
> +++ b/src/PVE/QemuServer.pm
> @@ -5697,40 +5697,8 @@ sub vm_start_nolock {
>  
>          push $cmd->@*, $state_cmdline->@*;
>  
> -        for my $device (values $pci_devices->%*) {
> -            next if $device->{mdev}; # we don't reserve for mdev devices
> -            push $pci_reserve_list->@*, map { $_->{id} } $device->{ids}->@*;
> -        }
> -
> -        # reserve all PCI IDs before actually doing anything with them
> -        PVE::QemuServer::PCI::reserve_pci_usage($pci_reserve_list, $vmid, $start_timeout);
> -
> -        my $uuid;
> -        for my $id (sort keys %$pci_devices) {
> -            my $d = $pci_devices->{$id};
> -            my ($index) = ($id =~ m/^hostpci(\d+)$/);
> -
> -            my $chosen_mdev;
> -            for my $dev ($d->{ids}->@*) {
> -                my $info =
> -                    eval { PVE::QemuServer::PCI::prepare_pci_device($vmid, $dev->{id}, $index, $d) };
> -                if ($d->{mdev} || $d->{nvidia}) {
> -                    warn $@ if $@;
> -                    $chosen_mdev = $info;
> -                    last if $chosen_mdev; # if successful, we're done
> -                } else {
> -                    die $@ if $@;
> -                }
> -            }
> -
> -            next if !$d->{mdev} && !$d->{nvidia};
> -            die "could not create mediated device\n" if !defined($chosen_mdev);
> -
> -            # nvidia vgpu needs a uuid as qemu parameter
> -            if (!defined($uuid) && $chosen_mdev->{vendor} =~ m/^(0x)?10de$/) {
> -                $uuid = PVE::QemuServer::PCI::Mdev::generate_mdev_uuid($vmid, $index);
> -            }
> -        }
> +        ($pci_reserve_list, my $uuid) =
> +            PVE::QemuServer::PCI::prepare_pci_devices($conf, $vmid, $pci_devices, $start_timeout);
>  
>          # uuid for nvidia vgpu
>          # prefer the smbios1 uuid if we have and need it
> diff --git a/src/PVE/QemuServer/PCI.pm b/src/PVE/QemuServer/PCI.pm
> index 0b67943c..f7167dcc 100644
> --- a/src/PVE/QemuServer/PCI.pm
> +++ b/src/PVE/QemuServer/PCI.pm
> @@ -704,6 +704,48 @@ sub print_hostpci_devices {
>      return ($kvm_off, $gpu_passthrough, $legacy_igd, $pci_devices);
>  }
>  
> +sub prepare_pci_devices {
> +    my ($conf, $vmid, $pci_devices, $start_timeout) = @_;
> +
> +    my $pci_reserve_list = [];
> +    my $uuid;
> +
> +    for my $device (values $pci_devices->%*) {
> +        next if $device->{mdev}; # we don't reserve for mdev devices
> +        push $pci_reserve_list->@*, map { $_->{id} } $device->{ids}->@*;
> +    }
> +
> +    # reserve all PCI IDs before actually doing anything with them
> +    reserve_pci_usage($pci_reserve_list, $vmid, $start_timeout);
> +
> +    for my $id (sort keys %$pci_devices) {
> +        my $d = $pci_devices->{$id};

Since this code is being moved anyway, it might be a good opportunity
to give $d a more descriptive name. Since $device is already in use,
maybe $pci_device?

> +        my ($index) = ($id =~ m/^hostpci(\d+)$/);
> +
> +        my $chosen_mdev;
> +        for my $dev ($d->{ids}->@*) {
> +            my $info = eval { prepare_pci_device($vmid, $dev->{id}, $index, $d) };
> +            if ($d->{mdev} || $d->{nvidia}) {
> +                warn $@ if $@;
> +                $chosen_mdev = $info;
> +                last if $chosen_mdev; # if successful, we're done
> +            } else {
> +                die $@ if $@;
> +            }
> +        }
> +
> +        next if !$d->{mdev} && !$d->{nvidia};
> +        die "could not create mediated device\n" if !defined($chosen_mdev);
> +
> +        # nvidia vgpu needs a uuid as qemu parameter
> +        if (!defined($uuid) && $chosen_mdev->{vendor} =~ m/^(0x)?10de$/) {
> +            $uuid = PVE::QemuServer::PCI::Mdev::generate_mdev_uuid($vmid, $index);
> +        }
> +    }
> +
> +    return ($pci_reserve_list, $uuid);
> +}
> +
>  sub prepare_pci_device {
>      my ($vmid, $pciid, $index, $device) = @_;
>