From c30a6232df03e1efbd9f3b226777b07e087a1122 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 12 Oct 2020 14:27:29 +0200 Subject: BASELINE: Update Chromium to 85.0.4183.140 Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen --- chromium/build/fuchsia/qemu_target.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'chromium/build/fuchsia/qemu_target.py') 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) + -- cgit v1.2.1