diff --git a/tests/cli-test-xml/compare/ppc64-pseries-f20.xml b/tests/cli-test-xml/compare/ppc64-pseries-f20.xml new file mode 100644 index 00000000..dec0e4ee --- /dev/null +++ b/tests/cli-test-xml/compare/ppc64-pseries-f20.xml @@ -0,0 +1,44 @@ + + foobar + 00000000-1111-2222-3333-444444444444 + 65536 + 65536 + 1 + + hvm + + + + + + + + + destroy + restart + restart + + /usr/bin/qemu-system-ppc64 + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/clitest.py b/tests/clitest.py index c2d6e024..a66b246e 100644 --- a/tests/clitest.py +++ b/tests/clitest.py @@ -482,6 +482,7 @@ c.add_compare("--os-variant fedora20 --nodisks --boot fd --graphics spice --mach c.add_compare("--os-variant fedora20 --nodisks --boot fd --graphics sdl --arch sparc --machine SS-20", "qemu-sparc") # exotic arch + machine type c.add_compare("--arch armv7l --machine vexpress-a9 --boot kernel=/f19-arm.kernel,initrd=/f19-arm.initrd,dtb=/f19-arm.dtb,kernel_args=\"console=ttyAMA0 rw root=/dev/mmcblk0p3\" --disk %(EXISTIMG1)s --nographics", "arm-vexpress-plain", support_check=support.SUPPORT_CONN_DISK_SD) c.add_compare("--arch armv7l --machine vexpress-a15 --boot kernel=/f19-arm.kernel,initrd=/f19-arm.initrd,dtb=/f19-arm.dtb,kernel_args=\"console=ttyAMA0 rw root=/dev/vda3\" --disk %(EXISTIMG1)s --nographics --os-variant fedora19", "arm-vexpress-f19", support_check=support.SUPPORT_CONN_VIRTIO_MMIO) +c.add_compare("--arch ppc64 --machine pseries --boot network --disk %(EXISTIMG1)s --os-variant fedora20", "ppc64-pseries-f20") c.add_valid("--cdrom %(EXISTIMG2)s --file %(EXISTIMG1)s --os-variant win2k3 --wait 0 --sound") # HVM windows install with disk c.add_valid("--os-variant fedora20 --file %(EXISTIMG1)s --location %(TREEDIR)s --extra-args console=ttyS0 --sound") # F14 Directory tree URL install with extra-args c.add_invalid("--nodisks --boot network --machine foobar") # Unknown machine type diff --git a/virtinst/guest.py b/virtinst/guest.py index 3760d7f0..b45170fa 100644 --- a/virtinst/guest.py +++ b/virtinst/guest.py @@ -872,8 +872,12 @@ class Guest(XMLBuilder): return True if has_spice(): - video_model = "qxl" self._add_spice_channels() + + if has_spice() and self.os.is_x86(): + video_model = "qxl" + elif self.os.is_ppc64() and self.os.machine == "pseries": + video_model = "vga" else: video_model = self._lookup_osdict_key("videomodel", "cirrus")