diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2014-07-10 17:37:16 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2014-07-10 17:37:16 +0100 |
commit | 74aeb37de06083ab130bf0da7c264043887c6c04 (patch) | |
tree | e1e4b6280492334ac7953acf0e29ab3285e83f39 /hw | |
parent | 9e99c5fd7060267a0331d900e73fdb36047bfe0c (diff) | |
parent | 0a58991a5f7efd6eb8a66643f4fd894b9c6874b7 (diff) |
Merge remote-tracking branch 'remotes/kvm/uq/master' into staging
* remotes/kvm/uq/master:
qtest: fix vhost-user-test compilation with old GLib
mc146818rtc: register the clock reset notifier on the right clock
oslib-posix: Fix new compiler error with -Wclobbered
target-i386: Add "kvmclock-stable-bit" feature bit name
Enforce stack protector usage
watchdog: fix deadlock with -watchdog-action pause
mips_malta: Catch kernels linked at wrong address
mips_malta: Remove incorrect KVM T&E references
mips/kvm: Disable FPU on reset with KVM
mips/kvm: Init EBase to correct KSEG0
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
-rw-r--r-- | hw/mips/mips_malta.c | 20 | ||||
-rw-r--r-- | hw/timer/mc146818rtc.c | 2 | ||||
-rw-r--r-- | hw/watchdog/watchdog.c | 6 |
3 files changed, 23 insertions, 5 deletions
diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 2868ee5b03..cfb60aff9f 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -792,9 +792,23 @@ static int64_t load_kernel (void) loaderparams.kernel_filename); exit(1); } + + /* Sanity check where the kernel has been linked */ if (kvm_enabled()) { + if (kernel_entry & 0x80000000ll) { + error_report("KVM guest kernels must be linked in useg. " + "Did you forget to enable CONFIG_KVM_GUEST?"); + exit(1); + } + xlate_to_kseg0 = cpu_mips_kvm_um_phys_to_kseg0; } else { + if (!(kernel_entry & 0x80000000ll)) { + error_report("KVM guest kernels aren't supported with TCG. " + "Did you unintentionally enable CONFIG_KVM_GUEST?"); + exit(1); + } + xlate_to_kseg0 = cpu_mips_phys_to_kseg0; } @@ -1028,7 +1042,7 @@ void mips_malta_init(MachineState *machine) fl_idx++; if (kernel_filename) { ram_low_size = MIN(ram_size, 256 << 20); - /* For KVM T&E we reserve 1MB of RAM for running bootloader */ + /* For KVM we reserve 1MB of RAM for running bootloader */ if (kvm_enabled()) { ram_low_size -= 0x100000; bootloader_run_addr = 0x40000000 + ram_low_size; @@ -1052,10 +1066,10 @@ void mips_malta_init(MachineState *machine) bootloader_run_addr, kernel_entry); } } else { - /* The flash region isn't executable from a KVM T&E guest */ + /* The flash region isn't executable from a KVM guest */ if (kvm_enabled()) { error_report("KVM enabled but no -kernel argument was specified. " - "Booting from flash is not supported with KVM T&E."); + "Booting from flash is not supported with KVM."); exit(1); } /* Load firmware from flash. */ diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c index 9d817cab78..233fc70d67 100644 --- a/hw/timer/mc146818rtc.c +++ b/hw/timer/mc146818rtc.c @@ -895,7 +895,7 @@ static void rtc_realizefn(DeviceState *dev, Error **errp) check_update_timer(s); s->clock_reset_notifier.notify = rtc_notify_clock_reset; - qemu_clock_register_reset_notifier(QEMU_CLOCK_REALTIME, + qemu_clock_register_reset_notifier(rtc_clock, &s->clock_reset_notifier); s->suspend_notifier.notify = rtc_notify_suspend; diff --git a/hw/watchdog/watchdog.c b/hw/watchdog/watchdog.c index 9f607d42bb..c307f9b57e 100644 --- a/hw/watchdog/watchdog.c +++ b/hw/watchdog/watchdog.c @@ -122,8 +122,12 @@ void watchdog_perform_action(void) exit(0); case WDT_PAUSE: /* same as 'stop' command in monitor */ + /* In a timer callback, when vm_stop calls qemu_clock_enable + * you would get a deadlock. Bypass the problem. + */ + qemu_system_vmstop_request_prepare(); qapi_event_send_watchdog(WATCHDOG_EXPIRATION_ACTION_PAUSE, &error_abort); - vm_stop(RUN_STATE_WATCHDOG); + qemu_system_vmstop_request(RUN_STATE_WATCHDOG); break; case WDT_DEBUG: |