add qemu_machine_pxe

return machinename with .pxe suffix if a nic with pxe romfile exist

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>

diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm
index ffa7a0b7dc29fae0fbc46f17a95ff9ae75636c3b..7ae3880adc09e628a9f1deacc1e6dad157f70513 100644 (file)
--- a/PVE/QemuMigrate.pm
+++ b/PVE/QemuMigrate.pm
@@ -141,16 +141,8 @@ sub prepare {
     if (my $pid = PVE::QemuServer::check_running($vmid)) {
        die "cant migrate running VM without --online\n" if !$online;
        $running = $pid;
-       $self->{forcemachine} = PVE::QemuServer::get_current_qemu_machine($vmid);
-
-       foreach my $opt (keys %$conf) {
-           next if $opt !~ m/^net(\d+)$/;
-           my $net = PVE::QemuServer::parse_net($conf->{$opt});
-           next if !$net;
-           my $romfile = PVE::QemuServer::vm_mon_cmd_nocheck($vmid, 'qom-get', path => $opt, property => 'romfile');
-           $self->{forcemachine} .= '.pxe' if $romfile =~ m/pxe/;
-           last;
-       }
+
+       $self->{forcemachine} = PVE::QemuServer::qemu_machine_pxe($vmid, $conf);
 
     }
 

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 8b6da2fcc108c981be84901f114f7a180f177e97..0aa1ff4763fa81f67a52d5efa4cfa8f69a0884ee 100644 (file)
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -6365,6 +6365,22 @@ sub qemu_machine_feature_enabled {
 
 }
 
+sub qemu_machine_pxe {
+    my ($vmid, $conf, $machine) = @_;
+
+    $machine =  PVE::QemuServer::get_current_qemu_machine($vmid) if !$machine;
+
+    foreach my $opt (keys %$conf) {
+       next if $opt !~ m/^net(\d+)$/;
+       my $net = PVE::QemuServer::parse_net($conf->{$opt});
+       next if !$net;
+       my $romfile = PVE::QemuServer::vm_mon_cmd_nocheck($vmid, 'qom-get', path => $opt, property => 'romfile');
+       return $machine.".pxe" if $romfile =~ m/pxe/;
+       last;
+    }
+
+}
+
 sub lspci {
 
     my $devices = {};