diff options
-rw-r--r-- | tests/data/cli/compare/virt-install-aarch64-cdrom.xml | 4 | ||||
-rw-r--r-- | tests/data/cli/compare/virt-install-aarch64-machdefault.xml | 2 | ||||
-rw-r--r-- | tests/data/cli/compare/virt-install-aarch64-machvirt.xml | 2 | ||||
-rw-r--r-- | virtinst/devices/sound.py | 2 | ||||
-rw-r--r-- | virtinst/guest.py | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/tests/data/cli/compare/virt-install-aarch64-cdrom.xml b/tests/data/cli/compare/virt-install-aarch64-cdrom.xml index 32abf29f..0e7678b5 100644 --- a/tests/data/cli/compare/virt-install-aarch64-cdrom.xml +++ b/tests/data/cli/compare/virt-install-aarch64-cdrom.xml @@ -71,7 +71,7 @@ <graphics type="spice" port="-1" tlsPort="-1" autoport="yes"> <image compression="off"/> </graphics> - <sound model="ich6"/> + <sound model="ich9"/> <video> <model type="virtio"/> </video> @@ -151,7 +151,7 @@ <graphics type="spice" port="-1" tlsPort="-1" autoport="yes"> <image compression="off"/> </graphics> - <sound model="ich6"/> + <sound model="ich9"/> <video> <model type="virtio"/> </video> diff --git a/tests/data/cli/compare/virt-install-aarch64-machdefault.xml b/tests/data/cli/compare/virt-install-aarch64-machdefault.xml index 60c55098..b379a97c 100644 --- a/tests/data/cli/compare/virt-install-aarch64-machdefault.xml +++ b/tests/data/cli/compare/virt-install-aarch64-machdefault.xml @@ -63,7 +63,7 @@ <graphics type="spice" port="-1" tlsPort="-1" autoport="yes"> <image compression="off"/> </graphics> - <sound model="ich6"/> + <sound model="ich9"/> <video> <model type="virtio"/> </video> diff --git a/tests/data/cli/compare/virt-install-aarch64-machvirt.xml b/tests/data/cli/compare/virt-install-aarch64-machvirt.xml index 60c55098..b379a97c 100644 --- a/tests/data/cli/compare/virt-install-aarch64-machvirt.xml +++ b/tests/data/cli/compare/virt-install-aarch64-machvirt.xml @@ -63,7 +63,7 @@ <graphics type="spice" port="-1" tlsPort="-1" autoport="yes"> <image compression="off"/> </graphics> - <sound model="ich6"/> + <sound model="ich9"/> <video> <model type="virtio"/> </video> diff --git a/virtinst/devices/sound.py b/virtinst/devices/sound.py index eae36a11..c2f6435d 100644 --- a/virtinst/devices/sound.py +++ b/virtinst/devices/sound.py @@ -31,7 +31,7 @@ class DeviceSound(Device): @staticmethod def default_model(guest): - if guest.os.is_q35(): + if guest.defaults_to_pcie(): return "ich9" return "ich6" diff --git a/virtinst/guest.py b/virtinst/guest.py index 166fbcc4..9522508b 100644 --- a/virtinst/guest.py +++ b/virtinst/guest.py @@ -1005,7 +1005,7 @@ class Guest(XMLBuilder): ctrl.set_defaults(self) self.add_device(ctrl) - def _defaults_to_pcie(self): + def defaults_to_pcie(self): if self.os.is_q35(): return True if self.os.is_arm_machvirt(): @@ -1017,7 +1017,7 @@ class Guest(XMLBuilder): def _add_q35_pcie_controllers(self): if any([c for c in self.devices.controller if c.type == "pci"]): return - if not self._defaults_to_pcie(): + if not self.defaults_to_pcie(): return added = False |