Simplify cpu_init
cover Simplify cpu_init
This is the same series I sent yesterday, but with comments addressed.
PATCH 1/4 move registering of cpu_reset to inside cpu_init
This is not pc specific by any means. So we can be moved to inside cpu_x86_init().
This is part of an attempt to only initialize kvm state after everything is already properly initialized. If we don't do that, we can race against, for example, APIC state if kvm vcpus are ran in threads (happens in qemu-kvm.git, soon to happen here too)
--- hw/pc.c | 7 ------- target-i386/helper.c | 8 ++++++++ 2 files changed, 8 insertions(+), 7 deletions(-)
hw/pc.c +0 -7
@@ -725,12 +725,6 @@ static void load_linux(target_phys_addr_t option_rom,generate_bootsect (option_rom, gpr, seg,0 ); } -static void main_cpu_reset (void *opaque) -{ -CPUState *env = opaque; -cpu_reset (env); -} -static const int ide_iobase[2 ] = {0x1f0 ,0x170 };static const int ide_iobase2[2 ] = {0x3f6 ,0x376 };static const int ide_irq[2 ] = {14 ,15 };
@@ -861,7 +855,6 @@ static void pc_init1(ram_addr_t ram_size, int vga_ram_size,/* XXX: enable it in all cases */ env->cpuid_features |=CPUID_APIC ; } -qemu_register_reset (main_cpu_reset, env);if (pci_enabled) {apic_init (env); }
target-i386/helper.c +8 -0
@@ -29,6 +29,7 @@#include "exec-all.h" #include "qemu-common.h" #include "kvm.h" +#include "hw/hw.h" //#define DEBUG_MMU
@@ -507,6 +508,11 @@ void cpu_reset(CPUX86State *env)cpu_watchpoint_remove_all (env,BP_CPU ); } +static void main_cpu_reset (void *_env) +{ +cpu_reset ((CPUState *)_env); +} +void cpu_x86_close (CPUX86State *env) {qemu_free (env);
@@ -1689,6 +1695,8 @@ CPUX86State *cpu_x86_init(const char *cpu_model)return NULL ; }cpu_reset (env); +qemu_register_reset (main_cpu_reset, env); +#ifdef CONFIG_KQEMU kqemu_init (env);#endif
Signature · 1 line
1.5.6.6
PATCH 2/4 move CPUID_APIC flag to where it belongs
We can safely do that inconditionally, so move to processor defined flags like any other flag. ISA machines will still see a LAPIC, but it should behave fine as a normal PIC.
--- hw/pc.c | 4 ---- target-i386/helper.c | 2 +- 2 files changed, 1 insertions(+), 5 deletions(-)
hw/pc.c +0 -4
@@ -851,10 +851,6 @@ static void pc_init1(ram_addr_t ram_size, int vga_ram_size, }if (i !=0 ) env->halted =1 ; -if (smp_cpus >1 ) { -/* XXX: enable it in all cases */ - env->cpuid_features |=CPUID_APIC ; - }if (pci_enabled) {apic_init (env); }
target-i386/helper.c +1 -1
@@ -102,7 +102,7 @@ typedef struct x86_def_t {char model_id[48 ]; } x86_def_t; -#define I486_FEATURES (CPUID_FP87 | CPUID_VME | CPUID_PSE) +#define I486_FEATURES (CPUID_FP87 | CPUID_VME | CPUID_PSE | CPUID_APIC)#define PENTIUM_FEATURES (I486_FEATURES | CPUID_DE | CPUID_TSC | \ CPUID_MSR | CPUID_MCE | CPUID_CX8 | CPUID_MMX)#define PENTIUM2_FEATURES (PENTIUM_FEATURES | CPUID_PAE | CPUID_SEP | \
Signature · 1 line
1.5.6.6
PATCH 3/4 move halted state setting to inside of cpu_x86_init
cpus other than the first one starting at the halted state is a safe assumption to anyone. Move it to exec.c, in common cpu initialization code. Also, we need to keep this state when we reset the cpu.
--- exec.c | 4 ++++ hw/pc.c | 2 -- hw/sun4m.c | 2 -- target-i386/helper.c | 4 ++++ 4 files changed, 8 insertions(+), 4 deletions(-)
exec.c +4 -0
@@ -567,6 +567,10 @@ void cpu_exec_init(CPUState *env)register_savevm ("cpu" , cpu_index,CPU_SAVE_VERSION , cpu_save, cpu_load, env);#endif +#if !defined(CONFIG_USER_ONLY ) +/* cpu 0 can run, others start at halted state */ + env->halted = !!cpu_index; +#endif }static inline void invalidate_page_bitmap (PageDesc *p)
hw/pc.c +0 -2
@@ -849,8 +849,6 @@ static void pc_init1(ram_addr_t ram_size, int vga_ram_size,fprintf (stderr,"Unable to find x86 CPU definition\n" );exit (1 ); } -if (i !=0 ) - env->halted =1 ;if (pci_enabled) {apic_init (env); }
hw/sun4m.c +0 -2
@@ -403,7 +403,6 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, ram_addr_t RAM_size,qemu_register_reset (main_cpu_reset, env); }else {qemu_register_reset (secondary_cpu_reset, env); - env->halted =1 ; } cpu_irqs[i] =qemu_allocate_irqs (cpu_set_irq, envs[i],MAX_PILS ); env->prom_addr = hwdef->slavio_base;
@@ -1193,7 +1192,6 @@ static void sun4d_hw_init(const struct sun4d_hwdef *hwdef, ram_addr_t RAM_size,qemu_register_reset (main_cpu_reset, env); }else {qemu_register_reset (secondary_cpu_reset, env); - env->halted =1 ; } cpu_irqs[i] =qemu_allocate_irqs (cpu_set_irq, envs[i],MAX_PILS ); env->prom_addr = hwdef->slavio_base;
target-i386/helper.c +4 -0
@@ -506,6 +506,10 @@ void cpu_reset(CPUX86State *env) env->dr[7 ] =DR7_FIXED_1 ;cpu_breakpoint_remove_all (env,BP_CPU );cpu_watchpoint_remove_all (env,BP_CPU ); +#if !defined(CONFIG_USER_ONLY ) +/* cpu 0 can run, others start at halted state */ + env->halted = !!env->cpu_index; +#endif }static void main_cpu_reset (void *_env)
Signature · 1 line
1.5.6.6
PATCH 4/4 move apic functions to a separate apic.h header
Later on, we'll want to call an apic function from helper.c. The inclusion of pc.h, besides totally ugly, leads to a lot of clashes.
--- hw/apic.c | 1 + hw/apic.h | 19 +++++++++++++++++++ hw/ioapic.c | 1 + hw/mc146818rtc.c | 1 + hw/pc.c | 1 + hw/pc.h | 15 --------------- 6 files changed, 23 insertions(+), 15 deletions(-) create mode 100644 hw/apic.h
hw/apic.c +1 -0
@@ -19,6 +19,7 @@*/ #include "hw.h" #include "pc.h" +#include "apic.h" #include "qemu-timer.h" #include "host-utils.h"
hw/apic.h new file +19 -0
@@ -0,0 +1,19 @@ +#ifndef _APIC_H_ +#define _APIC_H_ + +/* APIC */ +typedef struct IOAPICState IOAPICState ; +void apic_deliver_irq (uint8_t dest,uint8_t dest_mode, +uint8_t delivery_mode, +uint8_t vector_num,uint8_t polarity, +uint8_t trigger_mode); +int apic_init (CPUState *env); +int apic_accept_pic_intr (CPUState *env); +void apic_deliver_pic_intr (CPUState *env,int level); +int apic_get_interrupt (CPUState *env); +IOAPICState *ioapic_init (void ); +void ioapic_set_irq (void *opaque,int vector,int level); +void apic_reset_irq_delivered (void ); +int apic_get_irq_delivered (void ); + +#endif
hw/ioapic.c +1 -0
@@ -22,6 +22,7 @@*/ #include "hw.h" +#include "apic.h" #include "pc.h" #include "qemu-timer.h" #include "host-utils.h"
hw/mc146818rtc.c +1 -0
@@ -25,6 +25,7 @@#include "qemu-timer.h" #include "sysemu.h" #include "pc.h" +#include "apic.h" #include "isa.h" #include "hpet_emul.h"
hw/pc.c +1 -0
@@ -23,6 +23,7 @@*/ #include "hw.h" #include "pc.h" +#include "apic.h" #include "fdc.h" #include "pci.h" #include "block.h"
hw/pc.h +0 -15
@@ -40,21 +40,6 @@ uint32_t pic_intack_read(PicState2 *s);void pic_info (Monitor *mon);void irq_info (Monitor *mon); -/* APIC */ -typedef struct IOAPICState IOAPICState ; -void apic_deliver_irq (uint8_t dest,uint8_t dest_mode, -uint8_t delivery_mode, -uint8_t vector_num,uint8_t polarity, -uint8_t trigger_mode); -int apic_init (CPUState *env); -int apic_accept_pic_intr (CPUState *env); -void apic_deliver_pic_intr (CPUState *env,int level); -int apic_get_interrupt (CPUState *env); -IOAPICState *ioapic_init (void ); -void ioapic_set_irq (void *opaque,int vector,int level); -void apic_reset_irq_delivered (void ); -int apic_get_irq_delivered (void ); -/* i8254.c */ #define PIT_FREQ 1193182
Signature · 1 line
1.5.6.6
Re: [Qemu-devel] [PATCH 4/4] move apic functions to a separate apic.h header
Quoted 3 lines · Glauber Costa
Later on, we'll want to call an apic function from
helper.c. The inclusion ofpc.h, besides totally ugly, leads to a lot of clashes.
[..snip..]
hw/apic.h line 2
Quoted 2 lines
hw/apic.h new file +2
-0+#ifndef _APIC_H_ +#define _APIC_H_
Looks like you forgot to fix that.
[..snip..]
Signature · 1 line
mailto:[email protected]
Re: [Qemu-devel] [PATCH 4/4] move apic functions to a separate apic.h header
Quoted 6 lines · malc
Quoted 3 lines · Glauber Costa
Later on, we'll want to call an apic function from
helper.c. The inclusion ofpc.h, besides totally ugly, leads to a lot of clashes.
Quoted 6 lines
[..snip..]
hw/apic.h line 2
Quoted 2 lines
hw/apic.h new file +2
-0+#ifndef _APIC_H_ +#define _APIC_H_Looks like you forgot to fix that.
ughhh
you're right.
Anthony, mind committing the other patches? (if they are okay?) I can then send just this one, to avoid confusion