[virt-tools-list] [virt-manager PATCH] addhardware: don't remove QXL if VNC graphics are configured

[Pavel Hrdina]

Commit 1a6e803a introduced a fix for bogus behavior of QXL+VNC where
there was no cursor visible by disabling this configuration in
virt-manager.  We should enable it again because this is a supported
configuration and the bug was actually in QEMU.

This is now fixed in qemu-2.6.0 [1] so revert commits 1a6e803a and
67ca0a9f.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1326544

[1] http://lists.nongnu.org/archive/html/qemu-devel/2016-03/msg00507.html

Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
---
 virtManager/addhardware.py | 29 +++++------------------------
 virtManager/details.py     |  3 ---
 2 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/virtManager/addhardware.py b/virtManager/addhardware.py
index 6afe8b3..aab9095 100644
--- a/virtManager/addhardware.py
+++ b/virtManager/addhardware.py
@@ -455,9 +455,6 @@ class vmmAddHardware(vmmGObjectUI):
         # FS params
         self._fsdetails.reset_state()
 
-        # Video params
-        self.populate_video_combo(self.vm, self.widget("video-model"))
-
         # TPM params
         self.widget("tpm-device-path").set_text("/dev/tpm0")
 
@@ -490,36 +487,20 @@ class vmmAddHardware(vmmGObjectUI):
     #####################
 
     @staticmethod
-    def populate_video_combo(vm, combo):
-        model = combo.get_model()
-        has_spice = bool([g for g in vm.get_graphics_devices()
-                          if g.type == g.TYPE_SPICE])
-        has_qxl = bool([v for v in vm.get_video_devices()
-                        if v.model == "qxl"])
+    def build_video_combo(vm, combo):
+        model = Gtk.ListStore(str, str)
+        combo.set_model(model)
+        uiutil.init_combo_text_column(combo, 1)
+        combo.get_model().set_sort_column_id(1, Gtk.SortType.ASCENDING)
 
-        model.clear()
         tmpdev = virtinst.VirtualVideoDevice(vm.conn.get_backend())
         for m in tmpdev.MODELS:
-            if vm.stable_defaults():
-                if m == "qxl" and not has_spice and not has_qxl:
-                    # Only list QXL video option when VM has SPICE video
-                    continue
-
             model.append([m, tmpdev.pretty_model(m)])
 
         if len(model) > 0:
             combo.set_active(0)
 
     @staticmethod
-    def build_video_combo(vm, combo):
-        model = Gtk.ListStore(str, str)
-        combo.set_model(model)
-        uiutil.init_combo_text_column(combo, 1)
-        combo.get_model().set_sort_column_id(1, Gtk.SortType.ASCENDING)
-
-        vmmAddHardware.populate_video_combo(vm, combo)
-
-    @staticmethod
     def build_sound_combo(vm, combo):
         model = Gtk.ListStore(str)
         combo.set_model(model)
diff --git a/virtManager/details.py b/virtManager/details.py
index 0b8b145..0c369a4 100644
--- a/virtManager/details.py
+++ b/virtManager/details.py
@@ -2897,9 +2897,6 @@ class vmmDetails(vmmGObjectUI):
         if not vid:
             return
 
-        vmmAddHardware.populate_video_combo(self.vm,
-            self.widget("video-model"))
-
         model = vid.model
         if model == "qxl" and vid.vgamem:
             ram = vid.vgamem
-- 
2.8.2