@@ -65,7 +65,7 @@ struct pvclock_vcpu_time_info {
static uint64_t kvmclock_current_nsec(KVMClockState *s)
{
- CPUState *cpu = first_cpu;
+ CPUState *cpu = qemu_get_cpu(0, TYPE_X86_CPU);
CPUX86State *env = cpu_env(cpu);
hwaddr kvmclock_struct_pa;
uint64_t migration_tsc = env->tsc;
@@ -330,7 +330,7 @@ static const TypeInfo kvmclock_info = {
/* Note: Must be called after VCPU initialization. */
void kvmclock_create(bool create_always)
{
- X86CPU *cpu = X86_CPU(first_cpu);
+ X86CPU *cpu = X86_CPU(qemu_get_cpu(0, TYPE_X86_CPU));
assert(kvm_enabled());
if (!kvm_has_adjust_clock()) {
@@ -760,7 +760,8 @@ static void kvmvapic_vm_state_change(void *opaque, bool running,
if (s->state == VAPIC_ACTIVE) {
if (ms->smp.cpus == 1) {
- run_on_cpu(first_cpu, do_vapic_enable, RUN_ON_CPU_HOST_PTR(s));
+ run_on_cpu(qemu_get_cpu(0, TYPE_X86_CPU), do_vapic_enable,
+ RUN_ON_CPU_HOST_PTR(s));
} else {
zero = g_malloc0(s->rom_state.vapic_size);
cpu_physical_memory_write(s->vapic_paddr, zero,
@@ -229,7 +229,7 @@ static void microvm_devices_init(MicrovmMachineState *mms)
if (x86_machine_is_acpi_enabled(x86ms) && mms->pcie == ON_OFF_AUTO_ON) {
/* use topmost 25% of the address space available */
- hwaddr phys_size = (hwaddr)1 << X86_CPU(first_cpu)->phys_bits;
+ hwaddr phys_size = (hwaddr)1 << X86_CPU(qemu_get_cpu(0, TYPE_X86_CPU))->phys_bits;
if (phys_size > 0x1000000ll) {
mms->gpex.mmio64.size = phys_size / 4;
mms->gpex.mmio64.base = phys_size - mms->gpex.mmio64.size;
@@ -813,7 +813,7 @@ static uint64_t pc_get_cxl_range_end(PCMachineState *pcms)
static hwaddr pc_max_used_gpa(PCMachineState *pcms, uint64_t pci_hole64_size)
{
- X86CPU *cpu = X86_CPU(first_cpu);
+ X86CPU *cpu = X86_CPU(qemu_get_cpu(0, TYPE_X86_CPU));
PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms);
MachineState *ms = MACHINE(pcms);
@@ -898,7 +898,7 @@ void pc_memory_init(PCMachineState *pcms,
X86MachineState *x86ms = X86_MACHINE(pcms);
hwaddr maxphysaddr, maxusedaddr;
hwaddr cxl_base, cxl_resv_end = 0;
- X86CPU *cpu = X86_CPU(first_cpu);
+ X86CPU *cpu = X86_CPU(qemu_get_cpu(0, TYPE_X86_CPU));
assert(machine->ram_size == x86ms->below_4g_mem_size +
x86ms->above_4g_mem_size);
@@ -1182,7 +1182,8 @@ static void pc_superio_init(ISABus *isa_bus, bool create_fdctrl,
}
port92 = isa_create_simple(isa_bus, TYPE_PORT92);
- a20_line = qemu_allocate_irqs(handle_a20_line_change, first_cpu, 2);
+ a20_line = qemu_allocate_irqs(handle_a20_line_change,
+ qemu_get_cpu(0, TYPE_X86_CPU), 2);
i8042_setup_a20_line(i8042, a20_line[0]);
qdev_connect_gpio_out_named(DEVICE(port92),
PORT92_A20_LINE, 0, a20_line[1]);
@@ -363,7 +363,8 @@ static void pc_init1(MachineState *machine,
if (pcmc->pci_enabled && x86_machine_is_acpi_enabled(X86_MACHINE(pcms))) {
PCIDevice *piix4_pm;
- smi_irq = qemu_allocate_irq(pc_acpi_smi_interrupt, first_cpu, 0);
+ smi_irq = qemu_allocate_irq(pc_acpi_smi_interrupt,
+ qemu_get_cpu(0, TYPE_X86_CPU), 0);
piix4_pm = pci_new(piix3_devfn + 3, TYPE_PIIX4_PM);
qdev_prop_set_uint32(DEVICE(piix4_pm), "smb_io_base", 0xb100);
qdev_prop_set_bit(DEVICE(piix4_pm), "smm-enabled",
@@ -538,7 +538,7 @@ uint64_t cpu_get_tsc(CPUX86State *env)
/* IRQ handling */
static void pic_irq_request(void *opaque, int irq, int level)
{
- CPUState *cs = first_cpu;
+ CPUState *cs = qemu_get_cpu(0, TYPE_X86_CPU);
X86CPU *cpu = X86_CPU(cs);
trace_x86_pic_interrupt(irq, level);
@@ -327,7 +327,7 @@ static PCIINTxRoute ich9_route_intx_pin_to_irq(void *opaque, int pirq_pin)
void ich9_generate_smi(void)
{
- cpu_interrupt(first_cpu, CPU_INTERRUPT_SMI);
+ cpu_interrupt(qemu_get_cpu(0, TYPE_X86_CPU), CPU_INTERRUPT_SMI);
}
/* Returns -1 on error, IRQ number on success */
@@ -185,7 +185,7 @@ int x86_cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cs,
X86CPU *cpu = X86_CPU(cs);
int ret;
#ifdef TARGET_X86_64
- X86CPU *first_x86_cpu = X86_CPU(first_cpu);
+ X86CPU *first_x86_cpu = X86_CPU(qemu_get_cpu(0, TYPE_X86_CPU));
bool lma = !!(first_x86_cpu->env.hflags & HF_LMA_MASK);
if (lma) {
@@ -401,8 +401,8 @@ int cpu_get_dump_info(ArchDumpInfo *info,
GuestPhysBlock *block;
#ifdef TARGET_X86_64
- X86CPU *first_x86_cpu = X86_CPU(first_cpu);
- lma = first_cpu && (first_x86_cpu->env.hflags & HF_LMA_MASK);
+ X86CPU *first_x86_cpu = X86_CPU(qemu_get_cpu(0, TYPE_X86_CPU));
+ lma = qemu_get_cpu(0, TYPE_X86_CPU) && (first_x86_cpu->env.hflags & HF_LMA_MASK);
#endif
if (lma) {
@@ -3464,7 +3464,7 @@ static int kvm_put_msrs(X86CPU *cpu, int level)
* Hyper-V partition-wide MSRs: to avoid clearing them on cpu hot-add,
* only sync them to KVM on the first cpu
*/
- if (current_cpu == first_cpu) {
+ if (current_cpu == qemu_get_cpu(0, TYPE_X86_CPU)) {
if (has_msr_hv_hypercall) {
kvm_msr_entry_add(cpu, HV_X64_MSR_GUEST_OS_ID,
env->msr_hv_guest_os_id);
@@ -5601,10 +5601,10 @@ uint64_t kvm_swizzle_msi_ext_dest_id(uint64_t address)
CPUX86State *env;
uint64_t ext_id;
- if (!first_cpu) {
+ if (!qemu_get_cpu(0, TYPE_X86_CPU)) {
return address;
}
- env = &X86_CPU(first_cpu)->env;
+ env = &X86_CPU(qemu_get_cpu(0, TYPE_X86_CPU))->env;
if (!(env->features[FEAT_KVM] & (1 << KVM_FEATURE_MSI_EXT_DEST_ID))) {
return address;
}
@@ -41,13 +41,13 @@ void fpu_check_raise_ferr_irq(CPUX86State *env)
void cpu_clear_ignne(void)
{
- CPUX86State *env = &X86_CPU(first_cpu)->env;
+ CPUX86State *env = &X86_CPU(qemu_get_cpu(0, TYPE_X86_CPU))->env;
env->hflags2 &= ~HF2_IGNNE_MASK;
}
void cpu_set_ignne(void)
{
- CPUX86State *env = &X86_CPU(first_cpu)->env;
+ CPUX86State *env = &X86_CPU(qemu_get_cpu(0, TYPE_X86_CPU))->env;
assert(qemu_mutex_iothread_locked());
Mechanical change using the following coccinelle script: @@ @@ - first_cpu + qemu_get_cpu(0, TYPE_X86_CPU) Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- hw/i386/kvm/clock.c | 4 ++-- hw/i386/kvmvapic.c | 3 ++- hw/i386/microvm.c | 2 +- hw/i386/pc.c | 7 ++++--- hw/i386/pc_piix.c | 3 ++- hw/i386/x86.c | 2 +- hw/isa/lpc_ich9.c | 2 +- target/i386/arch_dump.c | 6 +++--- target/i386/kvm/kvm.c | 6 +++--- target/i386/tcg/sysemu/fpu_helper.c | 4 ++-- 10 files changed, 21 insertions(+), 18 deletions(-)