From 7cad52ce9774ffc05b86ce2c127429345ee851fa Mon Sep 17 00:00:00 2001 From: karmab Date: Tue, 30 Jul 2024 14:25:00 +0200 Subject: [PATCH] kvm aarch64: warn when forcing machine --- kvirt/providers/kvm/__init__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/kvirt/providers/kvm/__init__.py b/kvirt/providers/kvm/__init__.py index 12fbc2b8f..8d495ab9e 100644 --- a/kvirt/providers/kvm/__init__.py +++ b/kvirt/providers/kvm/__init__.py @@ -254,12 +254,13 @@ def create(self, name, virttype=None, profile='kvirt', flavor=None, plan='kvirt' aarch64 = capabilities['arch'] == 'aarch64' aarch64_full = aarch64 and capabilities['kvm'] as390x = capabilities['arch'] == 's390x' - if aarch64 and not aarch64_full: + if aarch64: if 'machine' not in overrides: virtmachines = [m for m in sorted(capabilities['machines']) if m.startswith('virt-')] if not virtmachines: return {'result': 'failure', 'reason': "Couldn't find a valid machine"} else: + warning(f"Using machine {virtmachines[-1]}") overrides['machine'] = virtmachines[-1] if 'cpumodel' not in overrides: cpumodel = 'cortex-a57' @@ -1264,7 +1265,7 @@ def create(self, name, virttype=None, profile='kvirt', flavor=None, plan='kvirt' """ % hugepages - machine = "" if aarch64_full else f"machine='{machine}'" + machine = f"machine='{machine}'" emulatorxml = f"{emulator}" uuidxml = "" if 'uuid' in overrides: