tests: Fix after vmvga change

tests/cli-test-xml/compare/virt-install-qemu-plain.xml

@@ -52,7 +52,7 @@
     </channel>
     <sound model="ich6"/>
     <video>
-      <model type="vmvga"/>
+      <model type="qxl"/>
     </video>
     <redirdev bus="usb" type="spicevmc"/>
     <redirdev bus="usb" type="spicevmc"/>

tests/xmlconfig-xml/install-novmvga-rhel.xml

@@ -1,62 +0,0 @@
-<domain type="kvm">
-  <name>TestGuest</name>
-  <uuid>12345678-1234-1234-1234-123456789012</uuid>
-  <memory>409600</memory>
-  <currentMemory>204800</currentMemory>
-  <vcpu>5</vcpu>
-  <os>
-    <type arch="i686">hvm</type>
-    <boot dev="cdrom"/>
-    <boot dev="hd"/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-  </features>
-  <clock offset="utc">
-    <timer name="rtc" tickpolicy="catchup"/>
-    <timer name="pit" tickpolicy="delay"/>
-    <timer name="hpet" present="no"/>
-  </clock>
-  <on_reboot>destroy</on_reboot>
-  <pm>
-    <suspend-to-mem enabled="no"/>
-    <suspend-to-disk enabled="no"/>
-  </pm>
-  <devices>
-    <emulator>/usr/libexec/qemu-kvm</emulator>
-    <disk type="file" device="floppy">
-      <driver name="qemu" type="qcow2"/>
-      <source file="/dev/default-pool/testvol1.img"/>
-      <target dev="fda" bus="fdc"/>
-    </disk>
-    <disk type="file" device="disk">
-      <driver name="qemu" type="raw"/>
-      <source file="/dev/default-pool/new-test-suite.img"/>
-      <target dev="vda" bus="virtio"/>
-    </disk>
-    <disk type="block" device="disk">
-      <driver name="qemu" type="raw" cache="none" io="native"/>
-      <source dev="/dev/disk-pool/diskvol1"/>
-      <target dev="vdb" bus="virtio"/>
-    </disk>
-    <disk type="file" device="cdrom">
-      <driver name="qemu"/>
-      <source file="/dev/null"/>
-      <target dev="hda" bus="ide"/>
-      <readonly/>
-    </disk>
-    <interface type="network">
-      <source network="default"/>
-      <mac address="22:22:33:44:55:66"/>
-      <model type="virtio"/>
-    </interface>
-    <input type="tablet" bus="usb"/>
-    <graphics type="vnc" port="-1" keymap="ja"/>
-    <console type="pty"/>
-    <sound model="ich6"/>
-    <video>
-      <model type="vga"/>
-    </video>
-  </devices>
-</domain>

tests/xmlconfig.py

@@ -307,30 +307,6 @@ class TestXMLMisc(unittest.TestCase):
         finally:
             CLIConfig.stable_defaults = False
 
-    def test_no_vmvga_RHEL(self):
-        # Test that vmvga is not used on RHEL
-        conn = utils.open_kvm_rhel()
-        def _make():
-            g = _make_guest(conn=conn)
-            g.emulator = "/usr/libexec/qemu-kvm"
-            g.add_default_video_device()
-            g.os_variant = "ubuntu13.10"
-
-            # Some input handling to work with different libsoinfo dbs
-            g.add_default_input_device()
-            g.get_devices("input")[0].type = "tablet"
-            return g
-
-        try:
-            g = _make()
-            self._compare(g, "install-novmvga-rhel", True)
-
-            CLIConfig.stable_defaults = True
-            g = _make()
-            self._compare(g, "install-novmvga-rhel", True)
-        finally:
-            CLIConfig.stable_defaults = False
-
     def test_hyperv_clock(self):
         def _make(connver):
             conn = utils.open_kvm(libver=1002002, connver=connver)

virtinst/guest.py

@@ -1184,9 +1184,6 @@ class Guest(XMLBuilder):
             self._add_spice_usbredir()
 
         video_model = self._os_object.default_videomodel(self)
-        if video_model == 'vmvga' and self.stable_defaults(force=True):
-            video_model = 'vga'
-
         for video in self.get_devices("video"):
             if video.model == video.MODEL_DEFAULT:
                 video.model = video_model