[pve-devel] [PATCH qemu-server stable-4] use machine version in vga default type selection

Thomas Lamprecht t.lamprecht at proxmox.com
Wed Jul 12 11:16:17 CEST 2017


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 at proxmox.com>
---
 PVE/QemuServer.pm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 190a073..d46103a 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)
-- 
2.11.0





More information about the pve-devel mailing list