diff options
| author | Marcelo Tosatti <mtosatti@redhat.com> | 2010-03-04 16:38:23 -0300 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2010-03-04 16:38:23 -0300 |
| commit | ca8773d10fa15cd00a754faa7f26091b81587df3 (patch) | |
| tree | 443cfa9f016da700377af33fcadbe663bdf0c7aa /cpu-exec.c | |
| parent | 83554439169d254398e7196e708d8ca09e1cd46b (diff) | |
| parent | e1c247d26cc15dbdf3f99836c0b16a6c91128cf2 (diff) | |
Merge commit 'e1c247d26cc15dbdf3f99836c0b16a6c91128cf2' into upstream-merge
* commit 'e1c247d26cc15dbdf3f99836c0b16a6c91128cf2':
pc-bios: update to latest Seabios
fix 'i' format handling in memory dump
rewrote timer implementation for rtl8139.
qcow2: Fix image creation regression
qcow2: More checks for qemu-img check
qcow2: Rewrite alloc_refcount_block/grow_refcount_table
qcow2: Factor next_refcount_table_size out
declare saved_env_reg as volatile
target-mips: fix ROTR and DROTR by zero
target-mips: fix CpU exception for coprocessor 0
target-mips: remove useless sign extension
Fix qemu_eventfd compile when !CONFIG_EVENTFD
ARM CP15 tls fix
kvm-all.c: define smp_wmb and use it for coalesced mmio
kvm: remove pre-entry exit_request check with iothread enabled
Conflicts:
pc-bios/bios.bin
Diffstat (limited to 'cpu-exec.c')
| -rw-r--r-- | cpu-exec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpu-exec.c b/cpu-exec.c index fe1176ddb..9eda8cdf4 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -214,7 +214,7 @@ static void cpu_handle_debug_exception(CPUState *env) int cpu_exec(CPUState *env1) { - host_reg_t saved_env_reg; + volatile host_reg_t saved_env_reg; int ret, interrupt_request; TranslationBlock *tb; uint8_t *tc_ptr; |