diff mbox series

[v2,4/5] qemu: Set default video type in qemu PostParse

Message ID 9435376be7e1c5f88a66175bf016751cf41aff9a.1503846114.git.crobinso@redhat.com
State Accepted
Commit ef08a545388f388b7c76b99a3f3d2584daf05145
Headers show
Series qemu: Default to video type=virtio for machvirt | expand

Commit Message

Cole Robinson Aug. 27, 2017, 3:04 p.m. UTC 
And not generic domain_conf code. We will need qemu private functions
in a bit.

Signed-off-by: Cole Robinson <crobinso@redhat.com>

---
 src/conf/domain_conf.c | 3 ---
 src/qemu/qemu_domain.c | 7 +++++++
 2 files changed, 7 insertions(+), 3 deletions(-)

-- 
2.13.5

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Comments

Pavel Hrdina Aug. 28, 2017, 10:39 a.m. UTC | #1 
On Sun, Aug 27, 2017 at 11:04:41AM -0400, Cole Robinson wrote:
> And not generic domain_conf code. We will need qemu private functions

> in a bit.

> 

> Signed-off-by: Cole Robinson <crobinso@redhat.com>

> ---

>  src/conf/domain_conf.c | 3 ---

>  src/qemu/qemu_domain.c | 7 +++++++

>  2 files changed, 7 insertions(+), 3 deletions(-)


Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
diff mbox series

Patch

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index e902ea9a8..c0515bb2b 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -13852,9 +13852,6 @@  virDomainVideoDefaultType(const virDomainDef *def)
 {
     switch (def->virtType) {
     case VIR_DOMAIN_VIRT_TEST:
-    case VIR_DOMAIN_VIRT_QEMU:
-    case VIR_DOMAIN_VIRT_KQEMU:
-    case VIR_DOMAIN_VIRT_KVM:
     case VIR_DOMAIN_VIRT_XEN:
         if (def->os.type == VIR_DOMAIN_OSTYPE_XEN ||
             def->os.type == VIR_DOMAIN_OSTYPE_LINUX)
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 1c6b1ba79..7d8c2c1ce 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -3667,6 +3667,13 @@  qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
     }
 
     if (dev->type == VIR_DOMAIN_DEVICE_VIDEO) {
+        if (dev->data.video->type == VIR_DOMAIN_VIDEO_TYPE_DEFAULT) {
+            if ARCH_IS_PPC64(def->os.arch)
+                dev->data.video->type = VIR_DOMAIN_VIDEO_TYPE_VGA;
+            else
+                dev->data.video->type = VIR_DOMAIN_VIDEO_TYPE_CIRRUS;
+        }
+
         if (dev->data.video->type == VIR_DOMAIN_VIDEO_TYPE_QXL &&
             !dev->data.video->vgamem) {
             dev->data.video->vgamem = QEMU_QXL_VGAMEM_DEFAULT;