proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-07-09 15:50:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add qemu_machine_pxe

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

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
This commit is contained in:
Alexandre Derumier 2015-11-06 10:27:04 +01:00 committed by Dietmar Maurer
parent ffb88d68e8
commit 42dbd2ee30
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
PVE/QemuMigrate.pm
View File

@ -141,16 +141,8 @@ sub prepare {
if (my $pid = PVE::QemuServer::check_running($vmid)) { if (my $pid = PVE::QemuServer::check_running($vmid)) {
die "cant migrate running VM without --online\n" if !$online; die "cant migrate running VM without --online\n" if !$online;
$running = $pid; $running = $pid;
$self->{forcemachine} = PVE::QemuServer::get_current_qemu_machine($vmid);
foreach my $opt (keys %$conf) { $self->{forcemachine} = PVE::QemuServer::qemu_machine_pxe($vmid, $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;
}
} }

16
PVE/QemuServer.pm
View File

@ -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 { sub lspci {
my $devices = {}; my $devices = {};