diff options
| author | Anthony Liguori | 2013-07-29 18:33:34 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2013-07-29 18:33:34 +0200 |
| commit | 4ff1fac4305f78d9cf987ca8abf3bda7f29c856e (patch) | |
| tree | 6924734408a2617a5025e57c1f436a634ce68c1d /target-m68k/cpu.c | |
| parent | qapi: Rename ChardevBackend member "memory" to "ringbuf" (diff) | |
| parent | target-i386: Disable PMU CPUID leaf by default (diff) | |
| download | qemu-4ff1fac4305f78d9cf987ca8abf3bda7f29c856e.tar.gz qemu-4ff1fac4305f78d9cf987ca8abf3bda7f29c856e.tar.xz qemu-4ff1fac4305f78d9cf987ca8abf3bda7f29c856e.zip | |
Merge remote-tracking branch 'afaerber/tags/qom-cpu-for-anthony' into staging
QOM CPUState refactorings
* Fix x86 cpu-add
* Change KVM PMU behavior for 1.6
# gpg: Signature made Mon 29 Jul 2013 10:28:18 AM CDT using RSA key ID 3E7E013F
# gpg: Can't check signature: public key not found
# By Eduardo Habkost (2) and Andreas Färber (1)
# Via Andreas Färber
* afaerber/tags/qom-cpu-for-anthony:
target-i386: Disable PMU CPUID leaf by default
target-i386: Pass X86CPU object to cpu_x86_find_by_name()
cpu: Partially revert "cpu: Change qemu_init_vcpu() argument to CPUState"
Diffstat (limited to 'target-m68k/cpu.c')
| -rw-r--r-- | target-m68k/cpu.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/target-m68k/cpu.c b/target-m68k/cpu.c index c0bcb0dbce..008d8db2da 100644 --- a/target-m68k/cpu.c +++ b/target-m68k/cpu.c @@ -143,12 +143,14 @@ static const M68kCPUInfo m68k_cpus[] = { static void m68k_cpu_realizefn(DeviceState *dev, Error **errp) { + CPUState *cs = CPU(dev); M68kCPU *cpu = M68K_CPU(dev); M68kCPUClass *mcc = M68K_CPU_GET_CLASS(dev); m68k_cpu_init_gdb(cpu); - cpu_reset(CPU(cpu)); + cpu_reset(cs); + qemu_init_vcpu(cs); mcc->parent_realize(dev, errp); } |