[PATCH manager] 8to9: adapt to changed signature of get_vm_machine()

[PATCH manager] 8to9: adapt to changed signature of get_vm_machine()

[Fiona Ebner]

The signature change in qemu-server does not lead to any breakage,
because the function still looks at $conf->{arch}. Still, it should be
adapted.

Reported-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---

Dependency bump for qemu-server needed!

 PVE/CLI/pve8to9.pm | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/PVE/CLI/pve8to9.pm b/PVE/CLI/pve8to9.pm
index 0c4b2343..662ee943 100644
--- a/PVE/CLI/pve8to9.pm
+++ b/PVE/CLI/pve8to9.pm
@@ -931,7 +931,7 @@ my sub check_qemu_machine_versions {
         my $conf = PVE::QemuConfig->load_config($vmid);
 
         # first, actually configured machine version
-        my $machine_type = PVE::QemuServer::Machine::get_vm_machine($conf, undef, $conf->{arch});
+        my $machine_type = PVE::QemuServer::Machine::get_vm_machine($conf);
         if (
             PVE::QemuServer::Machine::extract_version($machine_type) # no version means latest
             && !PVE::QemuServer::Machine::is_machine_version_at_least($machine_type, @baseline)
@@ -942,9 +942,7 @@ my sub check_qemu_machine_versions {
         # second, if hibernated, running machine version
         if ($conf->{vmstate}) {
             my $machine_type = PVE::QemuServer::Machine::get_vm_machine(
-                $conf,
-                $conf->{runningmachine},
-                $conf->{arch},
+                $conf, $conf->{runningmachine},
             );
             if (
                 PVE::QemuServer::Machine::extract_version($machine_type) # no version means latest
@@ -964,7 +962,6 @@ my sub check_qemu_machine_versions {
                 my $machine_type = PVE::QemuServer::Machine::get_vm_machine(
                     $snap_conf,
                     $snap_conf->{runningmachine},
-                    $snap_conf->{arch},
                 );
                 if ( # no version means latest
                     PVE::QemuServer::Machine::extract_version($machine_type)
-- 
2.47.3

Re: [PATCH manager] 8to9: adapt to changed signature of get_vm_machine()

[Fiona Ebner]

Am 29.01.26 um 2:25 PM schrieb Fiona Ebner:
> The signature change in qemu-server does not lead to any breakage,
> because the function still looks at $conf->{arch}. Still, it should be
> adapted.
> 
> Reported-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
> Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
> ---
> 
> Dependency bump for qemu-server needed!

Ping. Still applies and the bump is already covered now :)

> 
>  PVE/CLI/pve8to9.pm | 7 ++-----
>  1 file changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/PVE/CLI/pve8to9.pm b/PVE/CLI/pve8to9.pm
> index 0c4b2343..662ee943 100644
> --- a/PVE/CLI/pve8to9.pm
> +++ b/PVE/CLI/pve8to9.pm
> @@ -931,7 +931,7 @@ my sub check_qemu_machine_versions {
>          my $conf = PVE::QemuConfig->load_config($vmid);
>  
>          # first, actually configured machine version
> -        my $machine_type = PVE::QemuServer::Machine::get_vm_machine($conf, undef, $conf->{arch});
> +        my $machine_type = PVE::QemuServer::Machine::get_vm_machine($conf);
>          if (
>              PVE::QemuServer::Machine::extract_version($machine_type) # no version means latest
>              && !PVE::QemuServer::Machine::is_machine_version_at_least($machine_type, @baseline)
> @@ -942,9 +942,7 @@ my sub check_qemu_machine_versions {
>          # second, if hibernated, running machine version
>          if ($conf->{vmstate}) {
>              my $machine_type = PVE::QemuServer::Machine::get_vm_machine(
> -                $conf,
> -                $conf->{runningmachine},
> -                $conf->{arch},
> +                $conf, $conf->{runningmachine},
>              );
>              if (
>                  PVE::QemuServer::Machine::extract_version($machine_type) # no version means latest
> @@ -964,7 +962,6 @@ my sub check_qemu_machine_versions {
>                  my $machine_type = PVE::QemuServer::Machine::get_vm_machine(
>                      $snap_conf,
>                      $snap_conf->{runningmachine},
> -                    $snap_conf->{arch},
>                  );
>                  if ( # no version means latest
>                      PVE::QemuServer::Machine::extract_version($machine_type)