shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2024-12-23 17:34:21 +03:00
Code Issues Projects Releases Wiki Activity

guest: Make spice default device additions explicit

Browse Source 
Don't lump it in with setting video defaults
This commit is contained in:
Cole Robinson 2018-09-01 16:34:25 -04:00
parent 7738b8f407
commit fdd1cc5ca8
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/cli-test-xml/compare/virt-install-kvm-win2k3-cdrom.xml
View File

@ -12,12 +12,12 @@
<features>
<acpi/>
<apic/>
<vmport state="off"/>
<hyperv>
<relaxed state="on"/>
<vapic state="on"/>
<spinlocks state="on" retries="8191"/>
</hyperv>
<vmport state="off"/>
</features>
<cpu mode="custom" match="exact">
<model>Opteron_G4</model>
@ -80,12 +80,12 @@
<features>
<acpi/>
<apic/>
<vmport state="off"/>
<hyperv>
<relaxed state="on"/>
<vapic state="on"/>
<spinlocks state="on" retries="8191"/>
</hyperv>
<vmport state="off"/>
</features>
<cpu mode="custom" match="exact">
<model>Opteron_G4</model>

30
virtinst/guest.py
View File

@ -730,9 +730,6 @@ class Guest(XMLBuilder):
def _set_defaults(self):
self._add_install_cdrom()
# some options check for has_spice() which is resolved after this:
self._set_graphics_defaults()
self._set_clock_defaults()
self._set_emulator_defaults()
self._set_cpu_defaults()
@ -741,8 +738,11 @@ class Guest(XMLBuilder):
for dev in self.devices.get_all():
dev.set_defaults(self)
self._set_disk_defaults()
self._add_implied_controllers()
self._set_graphics_defaults()
self._add_spice_devices()
self._set_net_defaults()
self._set_video_defaults()
self._set_sound_defaults()
@ -921,12 +921,6 @@ class Guest(XMLBuilder):
else:
self.features.pae = self.capsinfo.guest.supports_pae()
if (self.features.vmport == "default" and
self.os.is_x86() and
self.has_spice() and
self.conn.check_support(self.conn.SUPPORT_CONN_VMPORT)):
self.features.vmport = False
if (self._os_object.is_windows() and
self._hyperv_supported() and
self.conn.check_support(self.conn.SUPPORT_CONN_HYPERV_VAPIC)):
@ -1200,14 +1194,22 @@ class Guest(XMLBuilder):
return None
def _set_video_defaults(self):
if self.has_spice():
self._add_spice_channels()
self._add_spice_sound()
self._add_spice_usbredir()
video_model = self._default_videomodel()
for video in self.devices.video:
if video.model == video.MODEL_DEFAULT:
video.model = video_model
if video.model == 'virtio' and self.has_gl():
video.accel3d = True
def _add_spice_devices(self):
if not self.has_spice():
return
if (self.features.vmport == "default" and
self.os.is_x86() and
self.conn.check_support(self.conn.SUPPORT_CONN_VMPORT)):
self.features.vmport = False
self._add_spice_channels()
self._add_spice_sound()
self._add_spice_usbredir()