From f5f6a3a8ed54f84a2d64ec52e89c90f4858c3c5d Mon Sep 17 00:00:00 2001 From: Rafael David Tinoco Date: Sun, 20 Oct 2019 20:34:44 +0000 Subject: [PATCH 1/2] d/p/u/ubuntu-libxl-Fix-up-VRAM-to-minimum-requirements.patch: error: fix Werror=switch-enum FTBS with GCC 8.3.0 Signed-off-by: Rafael David Tinoco --- ...-Fix-up-VRAM-to-minimum-requirements.patch | 26 ++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/debian/patches/ubuntu/ubuntu-libxl-Fix-up-VRAM-to-minimum-requirements.patch b/debian/patches/ubuntu/ubuntu-libxl-Fix-up-VRAM-to-minimum-requirements.patch index eebc17f93..9c26d5908 100644 --- a/debian/patches/ubuntu/ubuntu-libxl-Fix-up-VRAM-to-minimum-requirements.patch +++ b/debian/patches/ubuntu/ubuntu-libxl-Fix-up-VRAM-to-minimum-requirements.patch @@ -1,4 +1,3 @@ -From 73efd3699e8e1b1f4521af63401184e31dd3cd97 Mon Sep 17 00:00:00 2001 From: Stefan Bader Date: Sat, 3 May 2014 17:10:29 -0400 Subject: [PATCH 2/2] libxl: Fix up VRAM to minimum requirements @@ -16,14 +15,22 @@ the GUI says. This would not be that different from current Cirrus behaviour. Only that in that case qemu seems to ignore the provided size. + [Fix FTBS for GCC 8.3.0] + - Added missing enum cases in switch statement to avoid: + error: enumeration value 'LIBXL_DEVICE_MODEL_VERSION_UNKNOWN' + not handled in switch [-Werror=switch-enum] + Signed-off-by: Stefan Bader +Signed-off-by: Rafael David Tinoco --- - src/libxl/libxl_conf.c | 27 ++++++++++++++++++++++++++- - 1 file changed, 26 insertions(+), 1 deletion(-) + src/libxl/libxl_conf.c | 60 ++++++++++++++++++++---------------------- + 1 file changed, 29 insertions(+), 31 deletions(-) +diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c +index 73e988a3d..b0b72b184 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c -@@ -1832,7 +1832,6 @@ +@@ -2368,7 +2368,6 @@ libxlMakeVideo(virDomainDefPtr def, libxl_domain_config *d_config) { libxl_domain_build_info *b_info = &d_config->b_info; @@ -31,7 +38,7 @@ Signed-off-by: Stefan Bader if (d_config->c_info.type != LIBXL_DOMAIN_TYPE_HVM) return 0; -@@ -1842,50 +1841,45 @@ +@@ -2378,50 +2377,49 @@ libxlMakeVideo(virDomainDefPtr def, libxl_domain_config *d_config) * on the first graphics device (display). */ if (def->nvideos) { @@ -65,6 +72,8 @@ Signed-off-by: Stefan Bader + min_vram = 8 * 1024; + break; + case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: ++ case LIBXL_DEVICE_MODEL_VERSION_UNKNOWN: ++ case LIBXL_DEVICE_MODEL_VERSION_NONE: + default: + min_vram = 16 * 1024; } @@ -89,6 +98,8 @@ Signed-off-by: Stefan Bader + min_vram = 4 * 1024; /* Actually the max, too */ + break; + case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: ++ case LIBXL_DEVICE_MODEL_VERSION_UNKNOWN: ++ case LIBXL_DEVICE_MODEL_VERSION_NONE: + default: + min_vram = 8 * 1024; } @@ -106,7 +117,7 @@ Signed-off-by: Stefan Bader break; #endif -@@ -1896,7 +1890,7 @@ +@@ -2432,7 +2430,7 @@ libxlMakeVideo(virDomainDefPtr def, libxl_domain_config *d_config) return -1; } /* vram validated for each video type, now set it */ @@ -115,3 +126,6 @@ Signed-off-by: Stefan Bader } else { libxl_defbool_set(&b_info->u.hvm.nographic, 1); } +-- +2.20.1 + -- 2.20.1