From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Wed, 12 Jul 2017 09:16:17 +0000 (+0200)
Subject: use machine version in vga default type selection
X-Git-Url: https://git.proxmox.com/?p=qemu-server.git;a=commitdiff_plain;h=f39957acea9f3ff9b9bcd8102f4b605d4934be15

use machine version in vga default type selection

If we get an VM machine older than 2.9 we use the old selection
expression for the VGA type. This allows to live migrate VMs to PVE
5.0.
Also once kvm gets updated to 2.9 in PVE 4.4 newly started VMs will
use "std" as default VGA instead of cirrus.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index d76af66..c091685 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -2880,7 +2880,11 @@ sub config_to_command {
     $vga = 'qxl' if $qxlnum;
 
     if (!$vga) {
-	$vga = $winversion >= 6 ? 'std' : 'cirrus';
+	if (qemu_machine_feature_enabled($machine_type, $kvmver, 2, 9)) {
+	    $vga = (!$winversion || $winversion >= 6) ? 'std' : 'cirrus';
+	} else {
+	    $vga = ($winversion >= 6) ? 'std' : 'cirrus';
+	}
     }
 
     # enable absolute mouse coordinates (needed by vnc)