[pve-devel] [PATCH] remove openvz fairscheduler cpuunits

Alexandre Derumier aderumier at odiso.com
Mon May 25 13:49:00 CEST 2015


and add a note to implement cgroups

Signed-off-by: Alexandre Derumier <aderumier at odiso.com>
---
 PVE/QemuServer.pm | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 19fcf49..b105a7c 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -2612,16 +2612,12 @@ sub config_to_command {
 
     die "detected old qemu-kvm binary ($kvmver)\n" if $vernum < 15000;
 
-    my $have_ovz = -f '/proc/vz/vestat';
-
     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';
 
-    push @$cmd, '-id', $vmid;
-
     my $use_virtio = 0;
 
     my $qmpsocket = qmp_socket($vmid);
@@ -3148,19 +3144,10 @@ sub config_to_command {
 	}
     }
 
-    # hack: virtio with fairsched is unreliable, so we do not use fairsched
-    # when the VM uses virtio devices.
-    if (!$use_virtio && $have_ovz) {
-
-	my $cpuunits = defined($conf->{cpuunits}) ?
+    #implement me : cgroups
+    my $cpuunits = defined($conf->{cpuunits}) ?
 	    $conf->{cpuunits} : $defaults->{cpuunits};
 
-	push @$cmd, '-cpuunits', $cpuunits if $cpuunits;
-
-	# fixme: cpulimit is currently ignored
-	#push @$cmd, '-cpulimit', $conf->{cpulimit} if $conf->{cpulimit};
-    }
-
     # add custom args
     if ($conf->{args}) {
 	my $aa = PVE::Tools::split_args($conf->{args});
-- 
2.1.4



More information about the pve-devel mailing list