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

osdict: Make qemu_ga support solely dependent on virtio-serial support

Browse Source 
We shouldn't concern ourselves with whether the OS supports qemu_ga
out of the box, just set up the channel regardless, as long as
virtio-serial is supported.

This adds the channel for some aarch64 cases which didn't have OS
specified, but that's desired IMO
This commit is contained in:
Cole Robinson 2018-09-01 13:18:49 -04:00
parent 0f3b7fcc26
commit d5638eb140
5 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/cli-test-xml/compare/virt-install-aarch64-cdrom.xml
View File

@ -36,6 +36,10 @@
<model type="virtio"/> <model type="virtio"/>
</interface> </interface>
<console type="pty"/> <console type="pty"/>
<channel type="unix">
<source mode="bind"/>
<target type="virtio" name="org.qemu.guest_agent.0"/>
</channel>
</devices> </devices>
</domain> </domain>
<domain type="qemu"> <domain type="qemu">
@ -73,5 +77,9 @@
<model type="virtio"/> <model type="virtio"/>
</interface> </interface>
<console type="pty"/> <console type="pty"/>
<channel type="unix">
<source mode="bind"/>
<target type="virtio" name="org.qemu.guest_agent.0"/>
</channel>
</devices> </devices>
</domain> </domain>

4
tests/cli-test-xml/compare/virt-install-aarch64-machdefault.xml
View File

@ -29,5 +29,9 @@
<model type="virtio"/> <model type="virtio"/>
</interface> </interface>
<console type="pty"/> <console type="pty"/>
<channel type="unix">
<source mode="bind"/>
<target type="virtio" name="org.qemu.guest_agent.0"/>
</channel>
</devices> </devices>
</domain> </domain>

4
tests/cli-test-xml/compare/virt-install-aarch64-machvirt.xml
View File

@ -29,5 +29,9 @@
<model type="virtio"/> <model type="virtio"/>
</interface> </interface>
<console type="pty"/> <console type="pty"/>
<channel type="unix">
<source mode="bind"/>
<target type="virtio" name="org.qemu.guest_agent.0"/>
</channel>
</devices> </devices>
</domain> </domain>

2
virtinst/guest.py
View File

@ -659,7 +659,7 @@ class Guest(XMLBuilder):
return return
if (self.conn.is_qemu() and if (self.conn.is_qemu() and
self._os_object.supports_qemu_ga() and self._supports_virtio(self._os_object.supports_virtioserial()) and
self.conn.check_support(self.conn.SUPPORT_CONN_AUTOSOCKET)): self.conn.check_support(self.conn.SUPPORT_CONN_AUTOSOCKET)):
dev = DeviceChannel(self.conn) dev = DeviceChannel(self.conn)
dev.type = "unix" dev.type = "unix"

10
virtinst/osdict.py
View File

@ -336,10 +336,6 @@ class _OsVariant(object):
return "localtime" return "localtime"
return "utc" return "utc"
def supports_qemu_ga(self):
return self._is_related_to(
["debian8", "fedora18", "rhel6.0", "sles11sp4"])
def supported_netmodels(self): def supported_netmodels(self):
return self._device_filter(cls="net") return self._device_filter(cls="net")
@ -355,6 +351,12 @@ class _OsVariant(object):
def supports_virtiorng(self): def supports_virtiorng(self):
return bool(self._device_filter(cls="rng", name="virtio.*-rng")) return bool(self._device_filter(cls="rng", name="virtio.*-rng"))
def supports_virtioserial(self):
if self._device_filter(cls="console", name="virtio.*-console"):
return True
# 2018-09-01: osinfo data is wrong for RHEL/centos here
return self._is_related_to("rhel6.0")
def get_recommended_resources(self, guest): def get_recommended_resources(self, guest):
ret = {} ret = {}
if not self._os: if not self._os: