From 42dbd2ee3014f5f01588a8129ee8394f7a412476 Mon Sep 17 00:00:00 2001 From: Alexandre Derumier Date: Fri, 6 Nov 2015 10:27:04 +0100 Subject: [PATCH] add qemu_machine_pxe return machinename with .pxe suffix if a nic with pxe romfile exist Signed-off-by: Alexandre Derumier --- PVE/QemuMigrate.pm | 10 +--------- PVE/QemuServer.pm | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm index ffa7a0b7..7ae3880a 100644 --- 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 8b6da2fc..0aa1ff47 100644 --- 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 = {};