From a9e0fefa1d43437c48028772a84f60d85caf39d0 Mon Sep 17 00:00:00 2001 From: Ruben Kerkhof Date: Mon, 17 Jan 2022 15:10:23 +0100 Subject: [PATCH] Change the default amount of video ram to 16MB (#1435) Libvirt did already change the current 9216kb to 16384kb when starting a domain so in practice this is a no-op. The libvirt default was changed in 2014 in https://gitlab.com/libvirt/libvirt/-/commit/81ba2298b27aa3257e7b5136f5dd5055076d7d9c --- README.md | 2 +- lib/vagrant-libvirt/config.rb | 2 +- spec/unit/action/create_domain_spec/additional_disks_domain.xml | 2 +- spec/unit/action/create_domain_spec/custom_disk_settings.xml | 2 +- spec/unit/action/create_domain_spec/default_domain.xml | 2 +- spec/unit/action/create_domain_spec/two_disk_settings.xml | 2 +- .../unit/action/destroy_domain_spec/additional_disks_domain.xml | 2 +- spec/unit/action/destroy_domain_spec/box_multiple_disks.xml | 2 +- .../box_multiple_disks_and_additional_and_custom_disks.xml | 2 +- ...ultiple_disks_and_additional_and_custom_disks_no_aliases.xml | 2 +- .../box_multiple_disks_and_additional_disks.xml | 2 +- spec/unit/action/destroy_domain_spec/cdrom_domain.xml | 2 +- spec/unit/action/start_domain_spec/clock_timer_rtc.xml | 2 +- spec/unit/action/start_domain_spec/default.xml | 2 +- spec/unit/action/start_domain_spec/default_added_tpm_path.xml | 2 +- .../unit/action/start_domain_spec/default_added_tpm_version.xml | 2 +- spec/unit/action/start_domain_spec/existing.xml | 2 +- spec/unit/templates/domain_all_settings.xml | 2 +- spec/unit/templates/domain_cpu_mode_passthrough.xml | 2 +- spec/unit/templates/domain_custom_cpu_model.xml | 2 +- spec/unit/templates/domain_defaults.xml | 2 +- spec/unit/templates/tpm/version_1.2.xml | 2 +- spec/unit/templates/tpm/version_2.0.xml | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index fb72bd0..2c25356 100644 --- a/README.md +++ b/README.md @@ -610,7 +610,7 @@ end values](http://libvirt.org/formatdomain.html#elementsVideo) are "vga", "cirrus", "vmvga", "xen", "vbox", or "qxl". * `video_vram` - Used by some graphics card types to vary the amount of RAM - dedicated to video. Defaults to 9216. + dedicated to video. Defaults to 16384. * `video_accel3d` - Set to `true` to enable 3D acceleration. Defaults to `false`. * `sound_type` - [Set the virtual sound card](https://libvirt.org/formatdomain.html#elementsSound) diff --git a/lib/vagrant-libvirt/config.rb b/lib/vagrant-libvirt/config.rb index a74999d..5bafe45 100644 --- a/lib/vagrant-libvirt/config.rb +++ b/lib/vagrant-libvirt/config.rb @@ -879,7 +879,7 @@ module VagrantPlugins @graphics_port = -1 if @graphics_port == UNSET_VALUE @graphics_ip = '127.0.0.1' if @graphics_ip == UNSET_VALUE @video_type = 'cirrus' if @video_type == UNSET_VALUE - @video_vram = 9216 if @video_vram == UNSET_VALUE + @video_vram = 16384 if @video_vram == UNSET_VALUE @video_accel3d = false if @video_accel3d == UNSET_VALUE @graphics_gl = @video_accel3d if @graphics_gl == UNSET_VALUE @sound_type = nil if @sound_type == UNSET_VALUE diff --git a/spec/unit/action/create_domain_spec/additional_disks_domain.xml b/spec/unit/action/create_domain_spec/additional_disks_domain.xml index d671572..4587c62 100644 --- a/spec/unit/action/create_domain_spec/additional_disks_domain.xml +++ b/spec/unit/action/create_domain_spec/additional_disks_domain.xml @@ -43,7 +43,7 @@ diff --git a/spec/unit/action/create_domain_spec/custom_disk_settings.xml b/spec/unit/action/create_domain_spec/custom_disk_settings.xml index 37d9a5e..419c754 100644 --- a/spec/unit/action/create_domain_spec/custom_disk_settings.xml +++ b/spec/unit/action/create_domain_spec/custom_disk_settings.xml @@ -37,7 +37,7 @@ diff --git a/spec/unit/action/create_domain_spec/default_domain.xml b/spec/unit/action/create_domain_spec/default_domain.xml index 70ece4d..1dc7bcd 100644 --- a/spec/unit/action/create_domain_spec/default_domain.xml +++ b/spec/unit/action/create_domain_spec/default_domain.xml @@ -37,7 +37,7 @@ diff --git a/spec/unit/action/create_domain_spec/two_disk_settings.xml b/spec/unit/action/create_domain_spec/two_disk_settings.xml index b975c2c..67236cc 100644 --- a/spec/unit/action/create_domain_spec/two_disk_settings.xml +++ b/spec/unit/action/create_domain_spec/two_disk_settings.xml @@ -43,7 +43,7 @@ diff --git a/spec/unit/action/destroy_domain_spec/additional_disks_domain.xml b/spec/unit/action/destroy_domain_spec/additional_disks_domain.xml index f5b345f..7c83416 100644 --- a/spec/unit/action/destroy_domain_spec/additional_disks_domain.xml +++ b/spec/unit/action/destroy_domain_spec/additional_disks_domain.xml @@ -41,7 +41,7 @@ diff --git a/spec/unit/action/destroy_domain_spec/box_multiple_disks.xml b/spec/unit/action/destroy_domain_spec/box_multiple_disks.xml index 2677908..13fe1a3 100644 --- a/spec/unit/action/destroy_domain_spec/box_multiple_disks.xml +++ b/spec/unit/action/destroy_domain_spec/box_multiple_disks.xml @@ -49,7 +49,7 @@ diff --git a/spec/unit/action/destroy_domain_spec/box_multiple_disks_and_additional_and_custom_disks.xml b/spec/unit/action/destroy_domain_spec/box_multiple_disks_and_additional_and_custom_disks.xml index fad5450..33bd9ff 100644 --- a/spec/unit/action/destroy_domain_spec/box_multiple_disks_and_additional_and_custom_disks.xml +++ b/spec/unit/action/destroy_domain_spec/box_multiple_disks_and_additional_and_custom_disks.xml @@ -66,7 +66,7 @@ diff --git a/spec/unit/action/destroy_domain_spec/box_multiple_disks_and_additional_and_custom_disks_no_aliases.xml b/spec/unit/action/destroy_domain_spec/box_multiple_disks_and_additional_and_custom_disks_no_aliases.xml index 16b7c73..446ed90 100644 --- a/spec/unit/action/destroy_domain_spec/box_multiple_disks_and_additional_and_custom_disks_no_aliases.xml +++ b/spec/unit/action/destroy_domain_spec/box_multiple_disks_and_additional_and_custom_disks_no_aliases.xml @@ -61,7 +61,7 @@ diff --git a/spec/unit/action/destroy_domain_spec/box_multiple_disks_and_additional_disks.xml b/spec/unit/action/destroy_domain_spec/box_multiple_disks_and_additional_disks.xml index 25aa6d1..c2d99bf 100644 --- a/spec/unit/action/destroy_domain_spec/box_multiple_disks_and_additional_disks.xml +++ b/spec/unit/action/destroy_domain_spec/box_multiple_disks_and_additional_disks.xml @@ -61,7 +61,7 @@ diff --git a/spec/unit/action/destroy_domain_spec/cdrom_domain.xml b/spec/unit/action/destroy_domain_spec/cdrom_domain.xml index 1e18760..b9886d3 100644 --- a/spec/unit/action/destroy_domain_spec/cdrom_domain.xml +++ b/spec/unit/action/destroy_domain_spec/cdrom_domain.xml @@ -42,7 +42,7 @@ diff --git a/spec/unit/action/start_domain_spec/clock_timer_rtc.xml b/spec/unit/action/start_domain_spec/clock_timer_rtc.xml index 7bb1403..6468403 100644 --- a/spec/unit/action/start_domain_spec/clock_timer_rtc.xml +++ b/spec/unit/action/start_domain_spec/clock_timer_rtc.xml @@ -32,7 +32,7 @@ diff --git a/spec/unit/action/start_domain_spec/default.xml b/spec/unit/action/start_domain_spec/default.xml index fe3b573..beb503e 100644 --- a/spec/unit/action/start_domain_spec/default.xml +++ b/spec/unit/action/start_domain_spec/default.xml @@ -30,7 +30,7 @@ diff --git a/spec/unit/action/start_domain_spec/default_added_tpm_path.xml b/spec/unit/action/start_domain_spec/default_added_tpm_path.xml index 71f792b..4adad67 100644 --- a/spec/unit/action/start_domain_spec/default_added_tpm_path.xml +++ b/spec/unit/action/start_domain_spec/default_added_tpm_path.xml @@ -30,7 +30,7 @@ diff --git a/spec/unit/action/start_domain_spec/default_added_tpm_version.xml b/spec/unit/action/start_domain_spec/default_added_tpm_version.xml index 5129226..553f6e8 100644 --- a/spec/unit/action/start_domain_spec/default_added_tpm_version.xml +++ b/spec/unit/action/start_domain_spec/default_added_tpm_version.xml @@ -30,7 +30,7 @@ diff --git a/spec/unit/action/start_domain_spec/existing.xml b/spec/unit/action/start_domain_spec/existing.xml index 185f13e..abde302 100644 --- a/spec/unit/action/start_domain_spec/existing.xml +++ b/spec/unit/action/start_domain_spec/existing.xml @@ -52,7 +52,7 @@