diff options
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | qemu-timer.c | 4 | ||||
| -rw-r--r-- | target-i386/helper.c | 4 |
3 files changed, 5 insertions, 5 deletions
@@ -1 +1 @@ -0.13.90 +0.13.91 diff --git a/qemu-timer.c b/qemu-timer.c index 658f637ced..b0db780a1e 100644 --- a/qemu-timer.c +++ b/qemu-timer.c @@ -708,8 +708,6 @@ int64_t qemu_next_deadline(void) return delta; } -#ifndef _WIN32 - static int64_t qemu_next_alarm_deadline(void) { int64_t delta; @@ -922,6 +920,8 @@ static void dynticks_rearm_timer(struct qemu_alarm_timer *t) #endif /* defined(__linux__) */ +#if !defined(_WIN32) + static int unix_start_timer(struct qemu_alarm_timer *t) { struct sigaction act; diff --git a/target-i386/helper.c b/target-i386/helper.c index 1217452e71..f0c546df5c 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -1147,8 +1147,8 @@ void cpu_inject_x86_mce(CPUState *cenv, int bank, uint64_t status, if (cenv == env) { continue; } - - qemu_inject_x86_mce(env, 1, 0xa000000000000000, 0, 0, 0); + qemu_inject_x86_mce(env, 1, MCI_STATUS_VAL | MCI_STATUS_UC, + MCG_STATUS_MCIP | MCG_STATUS_RIPV, 0, 0); } } } |