diff options
| author | Anthony Liguori <anthony@codemonkey.ws> | 2013-09-03 12:33:32 -0500 |
|---|---|---|
| committer | Anthony Liguori <anthony@codemonkey.ws> | 2013-09-03 12:33:32 -0500 |
| commit | aaa6a40194e9f204cb853f64ef3c1e170bb014e8 (patch) | |
| tree | d2cfe475e7bcdafdf50fa2cca72a1a0050794af8 /target-i386/misc_helper.c | |
| parent | bb7d4d82b63bbde06c5584f94bfd9ba3b3e5ff3f (diff) | |
| parent | 5e891bf8fd509c4d83cb95d352d88effb20720b1 (diff) | |
| download | hqemu-aaa6a40194e9f204cb853f64ef3c1e170bb014e8.zip hqemu-aaa6a40194e9f204cb853f64ef3c1e170bb014e8.tar.gz | |
Merge remote-tracking branch 'afaerber/tags/qom-cpu-for-anthony' into staging
QOM CPUState refactorings / X86CPU
* Conversion of global CPU list to QTAILQ - preparing for CPU hot-unplug
* Document X86CPU magic numbers for CPUID cache info
# gpg: Signature made Tue 03 Sep 2013 10:59:22 AM CDT using RSA key ID 3E7E013F
# gpg: Can't check signature: public key not found
# By Andreas Färber (3) and Eduardo Habkost (1)
# Via Andreas Färber
* afaerber/tags/qom-cpu-for-anthony:
target-i386: Use #defines instead of magic numbers for CPUID cache info
cpu: Replace qemu_for_each_cpu()
cpu: Use QTAILQ for CPU list
a15mpcore: Use qemu_get_cpu() for generic timers
Diffstat (limited to 'target-i386/misc_helper.c')
| -rw-r--r-- | target-i386/misc_helper.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target-i386/misc_helper.c b/target-i386/misc_helper.c index 957926c..93933fd 100644 --- a/target-i386/misc_helper.c +++ b/target-i386/misc_helper.c @@ -610,7 +610,7 @@ void helper_mwait(CPUX86State *env, int next_eip_addend) cpu = x86_env_get_cpu(env); cs = CPU(cpu); /* XXX: not complete but not completely erroneous */ - if (cs->cpu_index != 0 || cs->next_cpu != NULL) { + if (cs->cpu_index != 0 || CPU_NEXT(cs) != NULL) { /* more than one CPU: do not sleep because another CPU may wake this one */ } else { |
