diff --git a/tests/cli-test-xml/compare/virt-install-qemu-plain.xml b/tests/cli-test-xml/compare/virt-install-qemu-plain.xml index e95cf58d..3273e0e4 100644 --- a/tests/cli-test-xml/compare/virt-install-qemu-plain.xml +++ b/tests/cli-test-xml/compare/virt-install-qemu-plain.xml @@ -52,7 +52,7 @@ diff --git a/tests/xmlconfig-xml/install-novmvga-rhel.xml b/tests/xmlconfig-xml/install-novmvga-rhel.xml deleted file mode 100644 index e37060e4..00000000 --- a/tests/xmlconfig-xml/install-novmvga-rhel.xml +++ /dev/null @@ -1,62 +0,0 @@ - - TestGuest - 12345678-1234-1234-1234-123456789012 - 409600 - 204800 - 5 - - hvm - - - - - - - - - - - - - destroy - - - - - - /usr/libexec/qemu-kvm - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/xmlconfig.py b/tests/xmlconfig.py index 31996a25..14c6b99e 100644 --- a/tests/xmlconfig.py +++ b/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) diff --git a/virtinst/guest.py b/virtinst/guest.py index 6bdfe170..ba87c865 100644 --- a/virtinst/guest.py +++ b/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