From 23f73120b764c698cc2e82f1ccbec7130130f112 Mon Sep 17 00:00:00 2001 From: Alexandre Derumier Date: Mon, 16 Mar 2015 05:57:41 +0100 Subject: [PATCH] add qemu_machine_feature_enabled sub 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 --- PVE/QemuServer.pm | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 00cff672..db8572ba 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -2651,6 +2651,7 @@ sub config_to_command { my $q35 = machine_type_is_q35($conf); my $hotplug_features = parse_hotplug_features(defined($conf->{hotplug}) ? $conf->{hotplug} : '1'); + my $machine_type = $forcemachine || $conf->{machine}; push @$cmd, '/usr/bin/kvm'; @@ -2881,7 +2882,6 @@ sub config_to_command { die "No accelerator found!\n" if !$cpuinfo->{hvm}; } - my $machine_type = $forcemachine || $conf->{machine}; if ($machine_type) { push @$machineFlags, "type=${machine_type}"; } @@ -6117,6 +6117,28 @@ sub get_current_qemu_machine { 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 { my $devices = {};