File a2ca7ca5-conf-add-VIDEO_TYPE_DEFAULT.patch of Package libvirt.10106

Overview Repositories Revisions Requests Users Attributes Meta

File a2ca7ca5-conf-add-VIDEO_TYPE_DEFAULT.patch of Package libvirt.10106

commit a2ca7ca52eb624883ac5a7e1d5deebb43981a410
Author: Cole Robinson <crobinso@redhat.com>
Date:   Sun Aug 27 11:04:39 2017 -0400

conf: domain: add VIDEO_TYPE_DEFAULT
    
    Will be needed for future patches to pull the default video type
    setting out of XML parsing routines.
    
    Signed-off-by: Cole Robinson <crobinso@redhat.com>

Index: libvirt-3.3.0/src/conf/domain_conf.c
===================================================================
--- libvirt-3.3.0.orig/src/conf/domain_conf.c
+++ libvirt-3.3.0/src/conf/domain_conf.c
@@ -544,6 +544,7 @@ VIR_ENUM_IMPL(virDomainPanicModel, VIR_D
               "s390")
 
 VIR_ENUM_IMPL(virDomainVideo, VIR_DOMAIN_VIDEO_TYPE_LAST,
+              "default",
               "vga",
               "cirrus",
               "vmvga",
Index: libvirt-3.3.0/src/conf/domain_conf.h
===================================================================
--- libvirt-3.3.0.orig/src/conf/domain_conf.h
+++ libvirt-3.3.0/src/conf/domain_conf.h
@@ -1336,6 +1336,7 @@ struct _virDomainWatchdogDef {
 
 
 typedef enum {
+    VIR_DOMAIN_VIDEO_TYPE_DEFAULT,
     VIR_DOMAIN_VIDEO_TYPE_VGA,
     VIR_DOMAIN_VIDEO_TYPE_CIRRUS,
     VIR_DOMAIN_VIDEO_TYPE_VMVGA,
Index: libvirt-3.3.0/src/qemu/qemu_command.c
===================================================================
--- libvirt-3.3.0.orig/src/qemu/qemu_command.c
+++ libvirt-3.3.0/src/qemu/qemu_command.c
@@ -95,6 +95,7 @@ VIR_ENUM_IMPL(qemuDiskCacheV2, VIR_DOMAI
               "unsafe");
 
 VIR_ENUM_IMPL(qemuVideo, VIR_DOMAIN_VIDEO_TYPE_LAST,
+              "", /* default value, we shouldn't see this */
               "std",
               "cirrus",
               "vmware",
@@ -108,6 +109,7 @@ VIR_ENUM_IMPL(qemuVideo, VIR_DOMAIN_VIDE
 VIR_ENUM_DECL(qemuDeviceVideo)
 
 VIR_ENUM_IMPL(qemuDeviceVideo, VIR_DOMAIN_VIDEO_TYPE_LAST,
+              "", /* default value, we shouldn't see this */
               "VGA",
               "cirrus-vga",
               "vmware-svga",
@@ -121,6 +123,7 @@ VIR_ENUM_IMPL(qemuDeviceVideo, VIR_DOMAI
 VIR_ENUM_DECL(qemuDeviceVideoSecondary)
 
 VIR_ENUM_IMPL(qemuDeviceVideoSecondary, VIR_DOMAIN_VIDEO_TYPE_LAST,
+              "", /* default value, we shouldn't see this */
               "", /* no secondary device for VGA */
               "", /* no secondary device for cirrus-vga */
               "", /* no secondary device for vmware-svga */
Index: libvirt-3.3.0/src/qemu/qemu_domain.c
===================================================================
--- libvirt-3.3.0.orig/src/qemu/qemu_domain.c
+++ libvirt-3.3.0/src/qemu/qemu_domain.c
@@ -2913,6 +2913,7 @@ qemuDomainDefValidateVideo(const virDoma
         case VIR_DOMAIN_VIDEO_TYPE_XEN:
         case VIR_DOMAIN_VIDEO_TYPE_VBOX:
         case VIR_DOMAIN_VIDEO_TYPE_PARALLELS:
+        case VIR_DOMAIN_VIDEO_TYPE_DEFAULT:
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                            _("video type '%s' is not supported with QEMU"),
                            virDomainVideoTypeToString(video->type));
Index: libvirt-3.3.0/src/qemu/qemu_domain_address.c
===================================================================
--- libvirt-3.3.0.orig/src/qemu/qemu_domain_address.c
+++ libvirt-3.3.0/src/qemu/qemu_domain_address.c
@@ -747,6 +747,7 @@ qemuDomainDeviceCalculatePCIConnectFlags
         case VIR_DOMAIN_VIDEO_TYPE_PARALLELS:
             return pciFlags;
 
+        case VIR_DOMAIN_VIDEO_TYPE_DEFAULT:
         case VIR_DOMAIN_VIDEO_TYPE_GOP:
         case VIR_DOMAIN_VIDEO_TYPE_LAST:
             return 0;
Index: libvirt-3.3.0/tests/domaincapsschemadata/full.xml
===================================================================
--- libvirt-3.3.0.orig/tests/domaincapsschemadata/full.xml
+++ libvirt-3.3.0/tests/domaincapsschemadata/full.xml
@@ -62,6 +62,7 @@
     </graphics>
     <video supported='yes'>
       <enum name='modelType'>
+        <value>default</value>
         <value>vga</value>
         <value>cirrus</value>
         <value>vmvga</value>

Places

File a2ca7ca5-conf-add-VIDEO_TYPE_DEFAULT.patch of Package libvirt.10106

Places