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 /memory_mapping.c | |
| parent | bb7d4d82b63bbde06c5584f94bfd9ba3b3e5ff3f (diff) | |
| parent | 5e891bf8fd509c4d83cb95d352d88effb20720b1 (diff) | |
| download | focaccia-qemu-aaa6a40194e9f204cb853f64ef3c1e170bb014e8.tar.gz focaccia-qemu-aaa6a40194e9f204cb853f64ef3c1e170bb014e8.zip | |
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 'memory_mapping.c')
| -rw-r--r-- | memory_mapping.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/memory_mapping.c b/memory_mapping.c index eeeeb44026..87a6ed5c8e 100644 --- a/memory_mapping.c +++ b/memory_mapping.c @@ -270,7 +270,7 @@ static CPUState *find_paging_enabled_cpu(CPUState *start_cpu) { CPUState *cpu; - for (cpu = start_cpu; cpu != NULL; cpu = cpu->next_cpu) { + CPU_FOREACH(cpu) { if (cpu_paging_enabled(cpu)) { return cpu; } @@ -289,7 +289,8 @@ void qemu_get_guest_memory_mapping(MemoryMappingList *list, first_paging_enabled_cpu = find_paging_enabled_cpu(first_cpu); if (first_paging_enabled_cpu) { - for (cpu = first_paging_enabled_cpu; cpu != NULL; cpu = cpu->next_cpu) { + for (cpu = first_paging_enabled_cpu; cpu != NULL; + cpu = CPU_NEXT(cpu)) { Error *err = NULL; cpu_get_memory_mapping(cpu, list, &err); if (err) { |