openkylin
/
virt-manager
mirror of https://gitee.com/openkylin/virt-manager.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

osdict: Always use vmvga for ubuntu 

There's been a couple reports recently that virt-manager's default of video
model=qxl doesn't work well with latest ubuntu 14.04:

https://bugzilla.redhat.com/show_bug.cgi?id=1129803
https://lists.fedoraproject.org/pipermail/virt/2014-August/004105.html

However vmvga works, so let's use it for all ubuntu versions and not just a
couple of them. Marc Deslauriers confirmed it should be safe.
This commit is contained in:
Cole Robinson 2014-09-06 13:36:48 -04:00
parent d89888a7bd
commit 7d25dbe7a3
3 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,21 +41,15 @@
<mac address="00:11:22:33:44:55"/>
<model type="virtio"/>
</interface>
<input type="tablet" bus="usb"/>
<input type="mouse" bus="ps2"/>
<graphics type="spice" port="-1" tlsPort="-1" autoport="yes"/>
<console type="pty">
<target type="virtio"/>
</console>
<channel type="unix">
<source mode="bind"/>
<target type="virtio" name="org.qemu.guest_agent.0"/>
</channel>
<console type="pty"/>
<channel type="spicevmc">
<target type="virtio" name="com.redhat.spice.0"/>
</channel>
<sound model="ich6"/>
<video>
<model type="qxl"/>
<model type="vmvga"/>
</video>
<redirdev bus="usb" type="spicevmc"/>
<redirdev bus="usb" type="spicevmc"/>

2
tests/clitest.py
View File

@ -529,7 +529,7 @@ c.add_compare("--os-variant fedora20 --file %(EXISTIMG1)s --location %(TREEDIR)s
c.add_compare("--os-variant fedora20 --disk %(NEWIMG1)s,size=.01 --location %(TREEDIR)s --extra-args console=ttyS0 --quiet", "quiet-url") # Quiet URL install should make no noise
c.add_compare("--cdrom %(EXISTIMG2)s --file %(EXISTIMG1)s --os-variant win2k3 --wait 0 --sound --controller usb", "kvm-win2k3-cdrom") # HVM windows install with disk
c.add_compare("--os-variant fedora20 --nodisks --boot hd --paravirt --cpu pentium2", "kvm-xenner") # xenner
c.add_compare("--os-variant fedora20 --nodisks --boot cdrom --virt-type qemu --cpu Penryn", "qemu-plain") # plain qemu
c.add_compare("--os-variant ubuntusaucy --nodisks --boot cdrom --virt-type qemu --cpu Penryn", "qemu-plain") # plain qemu
c.add_compare("--os-variant fedora20 --nodisks --boot network --nographics --arch i686", "qemu-32-on-64") # 32 on 64
c.add_compare("--os-variant fedora20 --nodisks --boot fd --graphics spice --machine pc --cpu none", "kvm-machine") # kvm machine type 'pc'
c.add_compare("--os-variant fedora20 --nodisks --boot fd --graphics sdl --arch sparc --machine SS-20", "qemu-sparc") # exotic arch + machine type

21
virtinst/osdict.py
View File

@ -238,16 +238,23 @@ class _OSVariant(object):
return None
def get_videomodel(self, guest):
if guest.has_spice() and guest.os.is_x86():
return "qxl"
if guest.os.is_ppc64() and guest.os.machine == "pseries":
return "vga"
if self._os:
if self._os.get_short_id() in {"ubuntu13.10", "ubuntu13.04"}:
return "vmvga"
if _OsVariantOsInfo.is_windows(self._os):
return "vga"
# Marc Deslauriers of canonical had previously patched us
# to use vmvga for ubuntu, see fb76c4e5. And Fedora users report
# issues with ubuntu + qxl for as late as 14.04, so carry the vmvga
# default forward until someone says otherwise. In 2014-09 I contacted
# Marc offlist and he said this was fine for now.
if self._os and self._os.get_distro() == "ubuntu":
return "vmvga"
if guest.has_spice() and guest.os.is_x86():
return "qxl"
if self._os and _OsVariantOsInfo.is_windows(self._os):
return "vga"
return None