diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/build/fuchsia/qemu_target.py | |
parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
download | qtwebengine-chromium-85-based.tar.gz |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/build/fuchsia/qemu_target.py')
-rw-r--r-- | chromium/build/fuchsia/qemu_target.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/chromium/build/fuchsia/qemu_target.py b/chromium/build/fuchsia/qemu_target.py index bdc397e797b..96d7465bf9e 100644 --- a/chromium/build/fuchsia/qemu_target.py +++ b/chromium/build/fuchsia/qemu_target.py @@ -55,7 +55,11 @@ class QemuTarget(emu_target.EmuTarget): if kvm_supported and same_arch: return True elif self._require_kvm: - raise FuchsiaTargetException('KVM required but unavailable.') + if same_arch: + raise FuchsiaTargetException('KVM required but unavailable.') + else: + raise FuchsiaTargetException('KVM unavailable when CPU architecture of'\ + ' host is different from that of target.') else: return False @@ -119,7 +123,7 @@ class QemuTarget(emu_target.EmuTarget): if self._target_cpu == 'arm64': kvm_command.append('host') else: - kvm_command.append('host,migratable=no') + kvm_command.append('host,migratable=no,+invtsc') else: logging.warning('Unable to launch %s with KVM acceleration.' % (self._emu_type) + |