diff options
| author | Tao Wu <lepton@google.com> | 2018-01-18 19:59:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-01-18 19:59:38 +0000 |
| commit | 6f1225aba6a2f327ef840e956a6730b053c51dda (patch) | |
| tree | 1e031c47276c9e10d545d0d18f35f67f2fbd6d56 | |
| parent | 924b295c1e207503c66a2ba728c89a46639e469c (diff) | |
| parent | c276de316ea80a83949f80a51875a6e7aa28d9cf (diff) | |
| download | qemu-emu-2.5-release.tar.gz | |
Merge "kernel-parameters: Disable apic timer check." into emu-2.5-releaseemu-2.5-release
| -rw-r--r-- | android/android-emu/android/main-kernel-parameters.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/android/android-emu/android/main-kernel-parameters.cpp b/android/android-emu/android/main-kernel-parameters.cpp index 51296a03f8..791371cb98 100644 --- a/android/android-emu/android/main-kernel-parameters.cpp +++ b/android/android-emu/android/main-kernel-parameters.cpp @@ -46,7 +46,7 @@ char* emulator_getKernelParameters(const AndroidOptions* opts, android::ParameterList params; if (isCros) { std::string cmdline(StringFormat( - "ro noresume noswap loglevel=7 noinitrd root=/dev/sda3 " + "ro noresume noswap loglevel=7 noinitrd root=/dev/sda3 no_timer_check" "cros_legacy cros_debug console=%s", opts->show_kernel ? "ttyS0" : "")); return strdup(cmdline.c_str()); @@ -57,6 +57,9 @@ char* emulator_getKernelParameters(const AndroidOptions* opts, // We always force qemu=1 when running inside QEMU. params.add("qemu=1"); + // Disable apic timer check. b/33963880 + params.add("no_timer_check"); + params.addFormat("androidboot.hardware=%s", isQemu2 ? "ranchu" : "goldfish"); |