[pve-devel] r5551 - qemu-server/pve2/PVE

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-02-16 10:59:11 +0100 (Wed, 16 Feb 2011)
New Revision: 5551

Modified:
   qemu-server/pve2/PVE/QemuServer.pm
Log:
always pass -id parameter (used by vnc auth)


Modified: qemu-server/pve2/PVE/QemuServer.pm
===================================================================
--- qemu-server/pve2/PVE/QemuServer.pm	2011-02-16 09:58:32 UTC (rev 5550)
+++ qemu-server/pve2/PVE/QemuServer.pm	2011-02-16 09:59:11 UTC (rev 5551)
@@ -1606,7 +1606,7 @@
 
     }
 
-    my $cpuinfo = PVE::ProcFSTools::get_cpu_info();
+    my $cpuinfo = PVE::ProcFSTools::read_cpuinfo();
     my $cpucount = $cpuinfo->{cpus} || 1;
     my $ctime = gettimeofday;
 
@@ -1693,6 +1693,8 @@
 
     push @$cmd, '/usr/bin/kvm';
 
+    push @$cmd, '-id', $vmid;
+
     my $use_virtio = 0;
 
     my $socket = monitor_socket ($vmid);
@@ -1895,8 +1897,6 @@
     # hack: virtio with fairsched is unreliable, so we do not use fairsched
     # when the VM uses virtio devices.
     if (!$use_virtio && $have_ovz) { 
-
-	push @$cmd, '-id', $vmid;
      
 	my $cpuunits = defined ($conf->{cpuunits}) ? 
 	    $conf->{cpuunits} : $defaults->{cpuunits};