Blame SOURCES/libvirt-qemu-validate-Enforce-compile-time-switch-type-checking-for-videos.patch

51d9a2
From 3bb028d79a9069ebc76bb27fa640af06adad2be5 Mon Sep 17 00:00:00 2001
51d9a2
Message-Id: <3bb028d79a9069ebc76bb27fa640af06adad2be5@dist-git>
51d9a2
From: Erik Skultety <eskultet@redhat.com>
51d9a2
Date: Thu, 19 Jul 2018 15:03:53 +0200
51d9a2
Subject: [PATCH] qemu: validate: Enforce compile time switch type checking for
51d9a2
 videos
51d9a2
MIME-Version: 1.0
51d9a2
Content-Type: text/plain; charset=UTF-8
51d9a2
Content-Transfer-Encoding: 8bit
51d9a2
51d9a2
There wasn't an explicit type case to the video type enum in
51d9a2
qemuDomainDeviceDefValidateVideo, _TYPE_GOP was also missing from the
51d9a2
switch.
51d9a2
51d9a2
Signed-off-by: Erik Skultety <eskultet@redhat.com>
51d9a2
Reviewed-by: John Ferlan <jferlan@redhat.com>
51d9a2
(cherry picked from commit 767f9e1449b1a36111532847f0c62dc758263c42)
51d9a2
51d9a2
https://bugzilla.redhat.com/show_bug.cgi?id=1475770
51d9a2
Signed-off-by: Erik Skultety <eskultet@redhat.com>
51d9a2
Reviewed-by: Ján Tomko <jtomko@redhat.com>
51d9a2
---
51d9a2
 src/conf/domain_conf.h | 2 +-
51d9a2
 src/qemu/qemu_domain.c | 3 ++-
51d9a2
 2 files changed, 3 insertions(+), 2 deletions(-)
51d9a2
51d9a2
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
51d9a2
index 1fc1734bcc..0f10e242fd 100644
51d9a2
--- a/src/conf/domain_conf.h
51d9a2
+++ b/src/conf/domain_conf.h
51d9a2
@@ -1453,7 +1453,7 @@ struct _virDomainVideoDriverDef {
51d9a2
 };
51d9a2
 
51d9a2
 struct _virDomainVideoDef {
51d9a2
-    int type;
51d9a2
+    int type;   /* enum virDomainVideoType */
51d9a2
     unsigned int ram;  /* kibibytes (multiples of 1024) */
51d9a2
     unsigned int vram; /* kibibytes (multiples of 1024) */
51d9a2
     unsigned int vram64; /* kibibytes (multiples of 1024) */
51d9a2
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
51d9a2
index dec057e021..a42a6df91b 100644
51d9a2
--- a/src/qemu/qemu_domain.c
51d9a2
+++ b/src/qemu/qemu_domain.c
51d9a2
@@ -4470,10 +4470,11 @@ qemuDomainDeviceDefValidateHostdev(const virDomainHostdevDef *hostdev,
51d9a2
 static int
51d9a2
 qemuDomainDeviceDefValidateVideo(const virDomainVideoDef *video)
51d9a2
 {
51d9a2
-    switch (video->type) {
51d9a2
+    switch ((virDomainVideoType) video->type) {
51d9a2
     case VIR_DOMAIN_VIDEO_TYPE_XEN:
51d9a2
     case VIR_DOMAIN_VIDEO_TYPE_VBOX:
51d9a2
     case VIR_DOMAIN_VIDEO_TYPE_PARALLELS:
51d9a2
+    case VIR_DOMAIN_VIDEO_TYPE_GOP:
51d9a2
     case VIR_DOMAIN_VIDEO_TYPE_DEFAULT:
51d9a2
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
51d9a2
                        _("video type '%s' is not supported with QEMU"),
51d9a2
-- 
51d9a2
2.18.0
51d9a2