From ef8c772be7b6192ca2b21c71b05dae0ce581bfda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Fri, 27 Sep 2019 13:30:22 +0200 Subject: [PATCH] guest,osdict: Pass down extra_devs to supports_virtio*() methods MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Cole Robinson Signed-off-by: Fabiano Fidêncio --- virtinst/guest.py | 14 +++++++------- virtinst/osdict.py | 3 ++- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/virtinst/guest.py b/virtinst/guest.py index c7deff8af..ec844468c 100644 --- a/virtinst/guest.py +++ b/virtinst/guest.py @@ -487,13 +487,13 @@ class Guest(XMLBuilder): return False def supports_virtionet(self): - return self._supports_virtio(self.osinfo.supports_virtionet()) + return self._supports_virtio(self.osinfo.supports_virtionet(self._extra_drivers)) def supports_virtiodisk(self): - return self._supports_virtio(self.osinfo.supports_virtiodisk()) + return self._supports_virtio(self.osinfo.supports_virtiodisk(self._extra_drivers)) def supports_virtioscsi(self): - return self._supports_virtio(self.osinfo.supports_virtioscsi()) + return self._supports_virtio(self.osinfo.supports_virtioscsi(self._extra_drivers)) def _supports_virtioserial(self): - return self._supports_virtio(self.osinfo.supports_virtioserial()) + return self._supports_virtio(self.osinfo.supports_virtioserial(self._extra_drivers)) ############################### @@ -838,7 +838,7 @@ class Guest(XMLBuilder): self.add_device(dev) # s390x guests need VirtIO input devices - if self.os.is_s390x() and self.osinfo.supports_virtioinput(): + if self.os.is_s390x() and self.osinfo.supports_virtioinput(self._extra_drivers): dev = DeviceInput(self.conn) dev.type = "tablet" dev.bus = "virtio" @@ -945,7 +945,7 @@ class Guest(XMLBuilder): return if (self.conn.is_qemu() and - self.osinfo.supports_virtiorng() and + self.osinfo.supports_virtiorng(self._extra_drivers) and self.conn.support.conn_rng_urandom()): dev = DeviceRng(self.conn) dev.type = "random" @@ -978,7 +978,7 @@ class Guest(XMLBuilder): self.os.is_pseries()): return - if self.osinfo.supports_virtioballoon(): + if self.osinfo.supports_virtioballoon(self._extra_drivers): dev = DeviceMemballoon(self.conn) dev.model = "virtio" self.add_device(dev) diff --git a/virtinst/osdict.py b/virtinst/osdict.py index 33b2a9e17..a285b6251 100644 --- a/virtinst/osdict.py +++ b/virtinst/osdict.py @@ -576,7 +576,8 @@ class _OsVariant(object): def supports_chipset_q35(self, extra_devs=None): # For our purposes, check for the union of q35 + virtio1.0 support - if self.supports_virtionet() and not self.supports_virtio1(): + if (self.supports_virtionet(extra_devs=extra_devs) and + not self.supports_virtio1(extra_devs=extra_devs)): return False devids = ["http://qemu.org/chipset/x86/q35"] return bool(self._device_filter(devids=devids, extra_devs=extra_devs))