From nobody Fri Nov 7 23:04:49 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 154881012569437.79896625505887; Tue, 29 Jan 2019 17:02:05 -0800 (PST) Received: from localhost ([127.0.0.1]:57955 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goeGN-0002DY-5l for importer@patchew.org; Tue, 29 Jan 2019 20:01:59 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35335) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goe3b-0008H1-IZ for qemu-devel@nongnu.org; Tue, 29 Jan 2019 19:48:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1goe3a-00010D-6u for qemu-devel@nongnu.org; Tue, 29 Jan 2019 19:48:47 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:53889) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1goe3a-0000nA-0l for qemu-devel@nongnu.org; Tue, 29 Jan 2019 19:48:46 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id E929A21D1F; Tue, 29 Jan 2019 19:48:17 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Tue, 29 Jan 2019 19:48:17 -0500 Received: from localhost (flamenco.cs.columbia.edu [128.59.20.216]) by mail.messagingengine.com (Postfix) with ESMTPA id 759A5E4667; Tue, 29 Jan 2019 19:48:17 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=braap.org; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; s=mesmtp; bh=KsN5jCji4hQ6WtTC+1zKqtuxAR438zTAt3ofaYlADvw=; b=GY6k1xQQi5iv QPFCRIDFx5e2jDGN77dY8fhuZG2lhKCY44bvIebi3p4ywiOr9br3i3tRDZ5uyMdu Hu5krs/ECdYDDax1MtreEYZBzLVx7MBpKZL/2IDbsgKEL2gCuH9Is8dGQ7+0zWvu pVk91HkxxyDqJrnX2a5nALdH+M5/WYs= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; bh=KsN5jCji4hQ6WtTC+1zKqtuxAR438zTAt3ofaYlAD vw=; b=ATHOkvp/azrLrFrbeQXDsTakUwrU/szEsaGqDYtEr1LW9B3NtYohV+WS3 +aUUpH5z8x0qr05jzQgjz9UdxtBCszFREMahfZ4RPESJ+U7UpUbY8u5wZPeEYUWE d7WKkIeeLwgTCIvfGG8xmmFbf34UUhFFW/vZxWsf+P1pqv2fk/ljlKU11+/EkouG +ERvnzPGtMjpIEqzFK4NyBFqGyvc6C/yojJauUERwZrT3yGnlzBIrwd2K6yoYG+4 MKDjzEgni/M9YHLJza9iIA1GoRHphHz3pzP8AE5sfGiqMEuCWYWWnXZLsVGcCq/l F8n5Bryxgj0LF1QmsrJuAoIwM69Vg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedtledrjeefgddvkecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfhuthenuceurghilhhouhhtmecufedt tdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhephffvufffkffojg hfgggtgfesthekredtredtjeenucfhrhhomhepfdfgmhhilhhiohcuifdrucevohhtrgdf uceotghothgrsegsrhgrrghprdhorhhgqeenucfkphepuddvkedrheelrddvtddrvdduie enucfrrghrrghmpehmrghilhhfrhhomheptghothgrsegsrhgrrghprdhorhhgnecuvehl uhhsthgvrhfuihiivgepke X-ME-Proxy: From: "Emilio G. Cota" To: qemu-devel@nongnu.org Date: Tue, 29 Jan 2019 19:47:18 -0500 Message-Id: <20190130004811.27372-21-cota@braap.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190130004811.27372-1-cota@braap.org> References: <20190130004811.27372-1-cota@braap.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 66.111.4.25 Subject: [Qemu-devel] [PATCH v6 20/73] i386: convert to cpu_halted X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Richard Henderson , Eduardo Habkost Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Cc: Eduardo Habkost Reviewed-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Emilio G. Cota --- target/i386/cpu.h | 2 +- target/i386/cpu.c | 2 +- target/i386/hax-all.c | 4 ++-- target/i386/helper.c | 4 ++-- target/i386/hvf/hvf.c | 8 ++++---- target/i386/hvf/x86hvf.c | 4 ++-- target/i386/kvm.c | 10 +++++----- target/i386/misc_helper.c | 2 +- target/i386/whpx-all.c | 6 +++--- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 59656a70e6..6c65b2ee5d 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1618,7 +1618,7 @@ static inline void cpu_x86_load_seg_cache_sipi(X86CPU= *cpu, sipi_vector << 12, env->segs[R_CS].limit, env->segs[R_CS].flags); - cs->halted =3D 0; + cpu_halted_set(cs, 0); } =20 int cpu_x86_get_descr_debug(CPUX86State *env, unsigned int selector, diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 2f5412592d..a37b984b61 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -4723,7 +4723,7 @@ static void x86_cpu_reset(CPUState *s) /* We hard-wire the BSP to the first CPU. */ apic_designate_bsp(cpu->apic_state, s->cpu_index =3D=3D 0); =20 - s->halted =3D !cpu_is_bsp(cpu); + cpu_halted_set(s, !cpu_is_bsp(cpu)); =20 if (kvm_enabled()) { kvm_arch_reset_vcpu(cpu); diff --git a/target/i386/hax-all.c b/target/i386/hax-all.c index b978a9b821..22951017cf 100644 --- a/target/i386/hax-all.c +++ b/target/i386/hax-all.c @@ -471,7 +471,7 @@ static int hax_vcpu_hax_exec(CPUArchState *env) return 0; } =20 - cpu->halted =3D 0; + cpu_halted_set(cpu, 0); =20 if (cpu->interrupt_request & CPU_INTERRUPT_POLL) { cpu->interrupt_request &=3D ~CPU_INTERRUPT_POLL; @@ -548,7 +548,7 @@ static int hax_vcpu_hax_exec(CPUArchState *env) !(cpu->interrupt_request & CPU_INTERRUPT_NMI)) { /* hlt instruction with interrupt disabled is shutdown */ env->eflags |=3D IF_MASK; - cpu->halted =3D 1; + cpu_halted_set(cpu, 1); cpu->exception_index =3D EXCP_HLT; ret =3D 1; } diff --git a/target/i386/helper.c b/target/i386/helper.c index e695f8ba7a..a75278f954 100644 --- a/target/i386/helper.c +++ b/target/i386/helper.c @@ -454,7 +454,7 @@ void x86_cpu_dump_state(CPUState *cs, FILE *f, fprintf_= function cpu_fprintf, (env->hflags >> HF_INHIBIT_IRQ_SHIFT) & 1, (env->a20_mask >> 20) & 1, (env->hflags >> HF_SMM_SHIFT) & 1, - cs->halted); + cpu_halted(cs)); } else #endif { @@ -481,7 +481,7 @@ void x86_cpu_dump_state(CPUState *cs, FILE *f, fprintf_= function cpu_fprintf, (env->hflags >> HF_INHIBIT_IRQ_SHIFT) & 1, (env->a20_mask >> 20) & 1, (env->hflags >> HF_SMM_SHIFT) & 1, - cs->halted); + cpu_halted(cs)); } =20 for(i =3D 0; i < 6; i++) { diff --git a/target/i386/hvf/hvf.c b/target/i386/hvf/hvf.c index e193022c03..c1ff220985 100644 --- a/target/i386/hvf/hvf.c +++ b/target/i386/hvf/hvf.c @@ -499,7 +499,7 @@ void hvf_reset_vcpu(CPUState *cpu) { } =20 hv_vm_sync_tsc(0); - cpu->halted =3D 0; + cpu_halted_set(cpu, 0); hv_vcpu_invalidate_tlb(cpu->hvf_fd); hv_vcpu_flush(cpu->hvf_fd); } @@ -659,7 +659,7 @@ int hvf_vcpu_exec(CPUState *cpu) int ret =3D 0; uint64_t rip =3D 0; =20 - cpu->halted =3D 0; + cpu_halted_set(cpu, 0); =20 if (hvf_process_events(cpu)) { return EXCP_HLT; @@ -677,7 +677,7 @@ int hvf_vcpu_exec(CPUState *cpu) vmx_update_tpr(cpu); =20 qemu_mutex_unlock_iothread(); - if (!cpu_is_bsp(X86_CPU(cpu)) && cpu->halted) { + if (!cpu_is_bsp(X86_CPU(cpu)) && cpu_halted(cpu)) { qemu_mutex_lock_iothread(); return EXCP_HLT; } @@ -711,7 +711,7 @@ int hvf_vcpu_exec(CPUState *cpu) (EFLAGS(env) & IF_MASK)) && !(cpu->interrupt_request & CPU_INTERRUPT_NMI) && !(idtvec_info & VMCS_IDT_VEC_VALID)) { - cpu->halted =3D 1; + cpu_halted_set(cpu, 1); ret =3D EXCP_HLT; } ret =3D EXCP_INTERRUPT; diff --git a/target/i386/hvf/x86hvf.c b/target/i386/hvf/x86hvf.c index df8e946fbc..163bbed23f 100644 --- a/target/i386/hvf/x86hvf.c +++ b/target/i386/hvf/x86hvf.c @@ -446,7 +446,7 @@ int hvf_process_events(CPUState *cpu_state) if (((cpu_state->interrupt_request & CPU_INTERRUPT_HARD) && (EFLAGS(env) & IF_MASK)) || (cpu_state->interrupt_request & CPU_INTERRUPT_NMI)) { - cpu_state->halted =3D 0; + cpu_halted_set(cpu_state, 0); } if (cpu_state->interrupt_request & CPU_INTERRUPT_SIPI) { hvf_cpu_synchronize_state(cpu_state); @@ -458,5 +458,5 @@ int hvf_process_events(CPUState *cpu_state) apic_handle_tpr_access_report(cpu->apic_state, env->eip, env->tpr_access_type); } - return cpu_state->halted; + return cpu_halted(cpu); } diff --git a/target/i386/kvm.c b/target/i386/kvm.c index 9af4542fb8..9006f04d92 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -2836,7 +2836,7 @@ static int kvm_get_mp_state(X86CPU *cpu) } env->mp_state =3D mp_state.mp_state; if (kvm_irqchip_in_kernel()) { - cs->halted =3D (mp_state.mp_state =3D=3D KVM_MP_STATE_HALTED); + cpu_halted_set(cs, mp_state.mp_state =3D=3D KVM_MP_STATE_HALTED); } return 0; } @@ -3320,7 +3320,7 @@ int kvm_arch_process_async_events(CPUState *cs) env->exception_injected =3D EXCP12_MCHK; env->has_error_code =3D 0; =20 - cs->halted =3D 0; + cpu_halted_set(cs, 0); if (kvm_irqchip_in_kernel() && env->mp_state =3D=3D KVM_MP_STATE_H= ALTED) { env->mp_state =3D KVM_MP_STATE_RUNNABLE; } @@ -3343,7 +3343,7 @@ int kvm_arch_process_async_events(CPUState *cs) if (((cs->interrupt_request & CPU_INTERRUPT_HARD) && (env->eflags & IF_MASK)) || (cs->interrupt_request & CPU_INTERRUPT_NMI)) { - cs->halted =3D 0; + cpu_halted_set(cs, 0); } if (cs->interrupt_request & CPU_INTERRUPT_SIPI) { kvm_cpu_synchronize_state(cs); @@ -3356,7 +3356,7 @@ int kvm_arch_process_async_events(CPUState *cs) env->tpr_access_type); } =20 - return cs->halted; + return cpu_halted(cs); } =20 static int kvm_handle_halt(X86CPU *cpu) @@ -3367,7 +3367,7 @@ static int kvm_handle_halt(X86CPU *cpu) if (!((cs->interrupt_request & CPU_INTERRUPT_HARD) && (env->eflags & IF_MASK)) && !(cs->interrupt_request & CPU_INTERRUPT_NMI)) { - cs->halted =3D 1; + cpu_halted_set(cs, 1); return EXCP_HLT; } =20 diff --git a/target/i386/misc_helper.c b/target/i386/misc_helper.c index 78f2020ef2..fcd6d833e8 100644 --- a/target/i386/misc_helper.c +++ b/target/i386/misc_helper.c @@ -554,7 +554,7 @@ static void do_hlt(X86CPU *cpu) CPUX86State *env =3D &cpu->env; =20 env->hflags &=3D ~HF_INHIBIT_IRQ_MASK; /* needed if sti is just before= */ - cs->halted =3D 1; + cpu_halted_set(cs, 1); cs->exception_index =3D EXCP_HLT; cpu_loop_exit(cs); } diff --git a/target/i386/whpx-all.c b/target/i386/whpx-all.c index 57e53e1f1f..b9c79ccd99 100644 --- a/target/i386/whpx-all.c +++ b/target/i386/whpx-all.c @@ -697,7 +697,7 @@ static int whpx_handle_halt(CPUState *cpu) (env->eflags & IF_MASK)) && !(cpu->interrupt_request & CPU_INTERRUPT_NMI)) { cpu->exception_index =3D EXCP_HLT; - cpu->halted =3D true; + cpu_halted_set(cpu, true); ret =3D 1; } qemu_mutex_unlock_iothread(); @@ -857,7 +857,7 @@ static void whpx_vcpu_process_async_events(CPUState *cp= u) if (((cpu->interrupt_request & CPU_INTERRUPT_HARD) && (env->eflags & IF_MASK)) || (cpu->interrupt_request & CPU_INTERRUPT_NMI)) { - cpu->halted =3D false; + cpu_halted_set(cpu, false); } =20 if (cpu->interrupt_request & CPU_INTERRUPT_SIPI) { @@ -887,7 +887,7 @@ static int whpx_vcpu_run(CPUState *cpu) int ret; =20 whpx_vcpu_process_async_events(cpu); - if (cpu->halted) { + if (cpu_halted(cpu)) { cpu->exception_index =3D EXCP_HLT; atomic_set(&cpu->exit_request, false); return 0; --=20 2.17.1