mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-06 17:23:56 -06:00
Merge remote-tracking branch 'stefanha/trivial-patches-next' into staging
This commit is contained in:
commit
9423a2e8dd
94 changed files with 228 additions and 533 deletions
2
cpus.c
2
cpus.c
|
@ -89,7 +89,7 @@ TimersState timers_state;
|
|||
int64_t cpu_get_icount(void)
|
||||
{
|
||||
int64_t icount;
|
||||
CPUState *env = cpu_single_env;;
|
||||
CPUState *env = cpu_single_env;
|
||||
|
||||
icount = qemu_icount;
|
||||
if (env) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue