[pve-devel] [PATCH 1/4] remove old not working machine parameter

Stefan Priebe s.priebe at profihost.ag
Sun May 26 22:55:03 CEST 2013


Signed-off-by: Stefan Priebe <s.priebe at profihost.ag>
---
 PVE/QemuServer.pm |   10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index f90d56e..47da506 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -425,7 +425,6 @@ EODESCR
 
 # what about other qemu settings ?
 #cpu => 'string',
-#machine => 'string',
 #fda => 'file',
 #fdb => 'file',
 #mtdblock => 'file',
@@ -2222,7 +2221,6 @@ sub config_to_command {
 
     my $cmd = [];
     my $globalFlags = [];
-    my $machineFlags = [];
     my $rtcFlags = [];
     my $devices = [];
     my $pciaddr = '';
@@ -2377,11 +2375,7 @@ sub config_to_command {
 
     push @$rtcFlags, 'driftfix=slew' if $tdf;
 
-    if ($nokvm) {
-	push @$machineFlags, 'accel=tcg';
-    } else {
-	die "No accelerator found!\n" if !$cpuinfo->{hvm};
-    }
+    die "No accelerator found!\n" if !$cpuinfo->{hvm};
 
     if ($conf->{startdate}) {
 	push @$rtcFlags, "base=$conf->{startdate}";
@@ -2518,8 +2512,6 @@ sub config_to_command {
     push @$cmd, @$devices;
     push @$cmd, '-rtc', join(',', @$rtcFlags) 
 	if scalar(@$rtcFlags);
-    push @$cmd, '-machine', join(',', @$machineFlags) 
-	if scalar(@$machineFlags);
     push @$cmd, '-global', join(',', @$globalFlags)
 	if scalar(@$globalFlags);
 
-- 
1.7.10.4




More information about the pve-devel mailing list