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

add qemu_machine_feature_enabled sub

Browse Source 
This sub compare current machine type to a specific version,
and return 1 if machinetype is bigger or equal to version

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
This commit is contained in:
Alexandre Derumier 2015-03-16 05:57:41 +01:00 committed by Dietmar Maurer
parent ced6ed823a
commit 23f73120b7
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
PVE/QemuServer.pm
View File

@ -2651,6 +2651,7 @@ sub config_to_command {
my $q35 = machine_type_is_q35($conf); my $q35 = machine_type_is_q35($conf);
my $hotplug_features = parse_hotplug_features(defined($conf->{hotplug}) ? $conf->{hotplug} : '1'); my $hotplug_features = parse_hotplug_features(defined($conf->{hotplug}) ? $conf->{hotplug} : '1');
my $machine_type = $forcemachine || $conf->{machine};
push @$cmd, '/usr/bin/kvm'; push @$cmd, '/usr/bin/kvm';
@ -2881,7 +2882,6 @@ sub config_to_command {
die "No accelerator found!\n" if !$cpuinfo->{hvm}; die "No accelerator found!\n" if !$cpuinfo->{hvm};
} }
my $machine_type = $forcemachine || $conf->{machine};
if ($machine_type) { if ($machine_type) {
push @$machineFlags, "type=${machine_type}"; push @$machineFlags, "type=${machine_type}";
} }
@ -6117,6 +6117,28 @@ sub get_current_qemu_machine {
return $current || $default || 'pc'; return $current || $default || 'pc';
} }
sub qemu_machine_feature_enabled {
my ($machine, $kvmver, $version_major, $version_minor) = @_;
my $current_major;
my $current_minor;
if ($machine && $machine =~ m/^(pc(-i440fx|-q35)?-(\d+)\.(\d+))/) {
$current_major = $3;
$current_minor = $4;
} elsif ($kvmver =~ m/^(\d+)\.(\d+)/) {
$current_major = $1;
$current_minor = $2;
}
return 1 if $current_major >= $version_major && $current_minor >= $version_minor;
}
sub lspci { sub lspci {
my $devices = {}; my $devices = {};