proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-08-13 13:10:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

use qemu-system-aarch64 for arm machines

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2018-11-12 14:10:37 +01:00 committed by Thomas Lamprecht
parent 96ed3574d4
commit 6908fd9bf4
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
PVE/QemuServer.pm
View File

@ -2838,7 +2838,7 @@ sub check_cmdline {
my @param = split(/\0/, $line); my @param = split(/\0/, $line);
my $cmd = $param[0]; my $cmd = $param[0];
return if !$cmd || ($cmd !~ m|kvm$| && $cmd !~ m|qemu-system-x86_64$|); return if !$cmd || ($cmd !~ m|kvm$| && $cmd !~ m@(?:^|/)qemu-system-[^/]+$@);
for (my $i = 0; $i < scalar (@param); $i++) { for (my $i = 0; $i < scalar (@param); $i++) {
my $p = $param[$i]; my $p = $param[$i];
@ -3292,6 +3292,19 @@ sub get_ovmf_files($) {
return @$ovmf; return @$ovmf;
} }
my $Arch2Qemu = {
aarch64 => '/usr/bin/qemu-system-aarch64',
x86_64 => '/usr/bin/qemu-system-x86_64',
};
sub get_command_for_arch($) {
my ($arch) = @_;
return '/usr/bin/kvm' if is_native($arch);
my $cmd = $Arch2Qemu->{$arch}
or die "don't know how to emulate architecture '$arch'\n";
return $cmd;
}
sub config_to_command { sub config_to_command {
my ($storecfg, $vmid, $conf, $defaults, $forcemachine) = @_; my ($storecfg, $vmid, $conf, $defaults, $forcemachine) = @_;
@ -3335,7 +3348,7 @@ sub config_to_command {
my $cpuunits = defined($conf->{cpuunits}) ? my $cpuunits = defined($conf->{cpuunits}) ?
$conf->{cpuunits} : $defaults->{cpuunits}; $conf->{cpuunits} : $defaults->{cpuunits};
push @$cmd, '/usr/bin/kvm'; push @$cmd, get_command_for_arch($arch);
push @$cmd, '-id', $vmid; push @$cmd, '-id', $vmid;