From 0e502466acb84aa05dead1cbe23e6debf58f4ff1 Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Mon, 12 Jan 2015 13:18:46 +0100 Subject: [PATCH] qxl: change the default value for vgamem_mb to 16 MiB The default value should be 16 MiB instead of 8 MiB. Only really old version of upstream QEMU used the 8 MiB as default for vga framebuffer. Without this change if you update your libvirt where we introduced the "vgamem" attribute for QXL video device the value will be set to 8 MiB, but previously your guest had 16 MiB because we didn't pass any value to QEMU command line which means QEMU used its own 16 MiB as default. This will affect all users with guest's display resolution higher than 1920x1080. Signed-off-by: Pavel Hrdina --- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_command.h | 2 ++ src/qemu/qemu_domain.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 1930abd797..101b88af48 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -12314,7 +12314,7 @@ qemuParseCommandLine(virCapsPtr qemuCaps, vid->vram = virDomainVideoDefaultRAM(def, vid->type); if (vid->type == VIR_DOMAIN_VIDEO_TYPE_QXL) { vid->ram = virDomainVideoDefaultRAM(def, vid->type); - vid->vgamem = 8 * 1024; + vid->vgamem = QEMU_QXL_VGAMEM_DEFAULT; } else { vid->ram = 0; vid->vgamem = 0; diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index f7d3c2d16c..6246a8552c 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -55,6 +55,8 @@ # define QEMU_MIGRATION_PORT_MIN 49152 # define QEMU_MIGRATION_PORT_MAX 49215 +# define QEMU_QXL_VGAMEM_DEFAULT 16 * 1024 + typedef struct _qemuBuildCommandLineCallbacks qemuBuildCommandLineCallbacks; typedef qemuBuildCommandLineCallbacks *qemuBuildCommandLineCallbacksPtr; struct _qemuBuildCommandLineCallbacks { diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 3d4023c6c8..6416a28320 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1178,7 +1178,7 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, goto cleanup; } } else { - dev->data.video->vgamem = 8 * 1024; + dev->data.video->vgamem = QEMU_QXL_VGAMEM_DEFAULT; } }