vmx: vmware: move video default logic to driver

The logic setting a device default should be in the post parse function
of individual driver code.

Signed-off-by: Rafael Fonseca <r4f4rfs@gmail.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index e6a3500b7a5b75c335379804bb29a0d25e5a281b..53bc791e1082388be8477abceecfc59a39187941 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -15728,8 +15728,6 @@ virDomainVideoDefaultType(const virDomainDef *def)
         return VIR_DOMAIN_VIDEO_TYPE_VBOX;
 
     case VIR_DOMAIN_VIRT_VMWARE:
-        return VIR_DOMAIN_VIDEO_TYPE_VMVGA;
-
     case VIR_DOMAIN_VIRT_VZ:
     case VIR_DOMAIN_VIRT_PARALLELS:
     case VIR_DOMAIN_VIRT_XEN:

diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c
index 32c81b13a0b352f9b66defbbc385e9ef89b6a6af..d5dd6e4f5e1926b86df8fbab5b610c713270e503 100644 (file)
--- a/src/vmware/vmware_driver.c
+++ b/src/vmware/vmware_driver.c
@@ -137,6 +137,10 @@ vmwareDomainDeviceDefPostParse(virDomainDeviceDefPtr dev G_GNUC_UNUSED,
                                void *opaque G_GNUC_UNUSED,
                                void *parseOpaque G_GNUC_UNUSED)
 {
+    if (dev->type == VIR_DOMAIN_DEVICE_VIDEO &&
+        dev->data.video->type == VIR_DOMAIN_VIDEO_TYPE_DEFAULT)
+        dev->data.video->type = VIR_DOMAIN_VIDEO_TYPE_VMVGA;
+
     return 0;
 }
 

diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index 6c6ef7acf3405009cd1bcbc095c119cc833ce5da..b1fd1181eb8970dc82c4ef236e176702056748b6 100644 (file)
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -548,6 +548,10 @@ virVMXDomainDevicesDefPostParse(virDomainDeviceDefPtr dev G_GNUC_UNUSED,
                                 void *opaque G_GNUC_UNUSED,
                                 void *parseOpaque G_GNUC_UNUSED)
 {
+    if (dev->type == VIR_DOMAIN_DEVICE_VIDEO &&
+        dev->data.video->type == VIR_DOMAIN_VIDEO_TYPE_DEFAULT)
+        dev->data.video->type = VIR_DOMAIN_VIDEO_TYPE_VMVGA;
+
     return 0;
 }