mirror of
https://github.com/virt-manager/virt-manager.git
synced 2025-02-25 18:55:27 -06:00
osdict: Don't force encode cirrus as the video default
Forcing cirrus isn't correct for non-x86 architectures, so let's have libvirt fill in the default so there's only one place to fix it.
This commit is contained in:
parent
0759a31acc
commit
d89888a7bd
@ -40,8 +40,5 @@
|
|||||||
<input type="mouse" bus="ps2"/>
|
<input type="mouse" bus="ps2"/>
|
||||||
<graphics type="vnc" port="-1" keymap="en-us"/>
|
<graphics type="vnc" port="-1" keymap="en-us"/>
|
||||||
<console type="pty"/>
|
<console type="pty"/>
|
||||||
<video>
|
|
||||||
<model type="cirrus"/>
|
|
||||||
</video>
|
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
|
@ -29,8 +29,5 @@
|
|||||||
<source mode="bind"/>
|
<source mode="bind"/>
|
||||||
<target type="virtio" name="org.qemu.guest_agent.0"/>
|
<target type="virtio" name="org.qemu.guest_agent.0"/>
|
||||||
</channel>
|
</channel>
|
||||||
<video>
|
|
||||||
<model type="cirrus"/>
|
|
||||||
</video>
|
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
|
@ -19,8 +19,5 @@
|
|||||||
</interface>
|
</interface>
|
||||||
<input type="mouse" bus="xen"/>
|
<input type="mouse" bus="xen"/>
|
||||||
<graphics type="vnc" port="-1" keymap="en-us"/>
|
<graphics type="vnc" port="-1" keymap="en-us"/>
|
||||||
<video>
|
|
||||||
<model type="cirrus"/>
|
|
||||||
</video>
|
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
|
@ -37,8 +37,5 @@
|
|||||||
<input type="mouse" bus="ps2"/>
|
<input type="mouse" bus="ps2"/>
|
||||||
<graphics type="vnc" port="-1" keymap="en-us"/>
|
<graphics type="vnc" port="-1" keymap="en-us"/>
|
||||||
<console type="pty"/>
|
<console type="pty"/>
|
||||||
<video>
|
|
||||||
<model type="cirrus"/>
|
|
||||||
</video>
|
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
|
@ -18,8 +18,5 @@
|
|||||||
<mac address="00:11:22:33:44:55"/>
|
<mac address="00:11:22:33:44:55"/>
|
||||||
</interface>
|
</interface>
|
||||||
<graphics type="vnc" port="-1" keymap="en-us"/>
|
<graphics type="vnc" port="-1" keymap="en-us"/>
|
||||||
<video>
|
|
||||||
<model type="cirrus"/>
|
|
||||||
</video>
|
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
|
@ -31,9 +31,6 @@
|
|||||||
</interface>
|
</interface>
|
||||||
<graphics type="vnc" port="-1" keymap="en-us"/>
|
<graphics type="vnc" port="-1" keymap="en-us"/>
|
||||||
<console type="pty"/>
|
<console type="pty"/>
|
||||||
<video>
|
|
||||||
<model type="cirrus"/>
|
|
||||||
</video>
|
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
<domain type="xen">
|
<domain type="xen">
|
||||||
@ -67,8 +64,5 @@
|
|||||||
</interface>
|
</interface>
|
||||||
<graphics type="vnc" port="-1" keymap="en-us"/>
|
<graphics type="vnc" port="-1" keymap="en-us"/>
|
||||||
<console type="pty"/>
|
<console type="pty"/>
|
||||||
<video>
|
|
||||||
<model type="cirrus"/>
|
|
||||||
</video>
|
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
|
@ -23,9 +23,6 @@
|
|||||||
<mac address="00:11:22:33:44:55"/>
|
<mac address="00:11:22:33:44:55"/>
|
||||||
</interface>
|
</interface>
|
||||||
<graphics type="vnc" port="-1" keymap="en-us"/>
|
<graphics type="vnc" port="-1" keymap="en-us"/>
|
||||||
<video>
|
|
||||||
<model type="cirrus"/>
|
|
||||||
</video>
|
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
<domain type="xen">
|
<domain type="xen">
|
||||||
@ -48,8 +45,5 @@
|
|||||||
<mac address="00:11:22:33:44:55"/>
|
<mac address="00:11:22:33:44:55"/>
|
||||||
</interface>
|
</interface>
|
||||||
<graphics type="vnc" port="-1" keymap="en-us"/>
|
<graphics type="vnc" port="-1" keymap="en-us"/>
|
||||||
<video>
|
|
||||||
<model type="cirrus"/>
|
|
||||||
</video>
|
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
|
@ -24,9 +24,6 @@
|
|||||||
</interface>
|
</interface>
|
||||||
<input type="mouse" bus="xen"/>
|
<input type="mouse" bus="xen"/>
|
||||||
<graphics type="vnc" port="-1" keymap="en-us"/>
|
<graphics type="vnc" port="-1" keymap="en-us"/>
|
||||||
<video>
|
|
||||||
<model type="cirrus"/>
|
|
||||||
</video>
|
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
<domain type="xen">
|
<domain type="xen">
|
||||||
@ -50,8 +47,5 @@
|
|||||||
</interface>
|
</interface>
|
||||||
<input type="mouse" bus="xen"/>
|
<input type="mouse" bus="xen"/>
|
||||||
<graphics type="vnc" port="-1" keymap="en-us"/>
|
<graphics type="vnc" port="-1" keymap="en-us"/>
|
||||||
<video>
|
|
||||||
<model type="cirrus"/>
|
|
||||||
</video>
|
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
|
@ -48,8 +48,5 @@
|
|||||||
<graphics type="vnc" port="-1" keymap="ja"/>
|
<graphics type="vnc" port="-1" keymap="ja"/>
|
||||||
<console type="pty"/>
|
<console type="pty"/>
|
||||||
<sound model="ich6"/>
|
<sound model="ich6"/>
|
||||||
<video>
|
|
||||||
<model type="cirrus"/>
|
|
||||||
</video>
|
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
|
@ -46,8 +46,5 @@
|
|||||||
<graphics type="vnc" port="-1" keymap="ja"/>
|
<graphics type="vnc" port="-1" keymap="ja"/>
|
||||||
<console type="pty"/>
|
<console type="pty"/>
|
||||||
<sound model="ich6"/>
|
<sound model="ich6"/>
|
||||||
<video>
|
|
||||||
<model type="cirrus"/>
|
|
||||||
</video>
|
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
|
@ -979,7 +979,7 @@ class Guest(XMLBuilder):
|
|||||||
self._add_spice_sound()
|
self._add_spice_sound()
|
||||||
self._add_spice_usbredir()
|
self._add_spice_usbredir()
|
||||||
|
|
||||||
video_model = self._os_object.get_videomodel(self) or "cirrus"
|
video_model = self._os_object.get_videomodel(self)
|
||||||
for video in self.get_devices("video"):
|
for video in self.get_devices("video"):
|
||||||
if video.model == video.MODEL_DEFAULT:
|
if video.model == video.MODEL_DEFAULT:
|
||||||
video.model = video_model
|
video.model = video_model
|
||||||
|
Loading…
Reference in New Issue
Block a user