From nobody Fri Nov 7 22:59:22 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 1548810947393608.1843656661447; Tue, 29 Jan 2019 17:15:47 -0800 (PST) Received: from localhost ([127.0.0.1]:58149 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goeTb-0004Yd-8s for importer@patchew.org; Tue, 29 Jan 2019 20:15:39 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35645) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goe3w-00005W-MP for qemu-devel@nongnu.org; Tue, 29 Jan 2019 19:49:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1goe3s-0001G8-PO for qemu-devel@nongnu.org; Tue, 29 Jan 2019 19:49:06 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:55645) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1goe3s-0000yS-I8 for qemu-devel@nongnu.org; Tue, 29 Jan 2019 19:49:04 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 5E25022121; Tue, 29 Jan 2019 19:48:20 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Tue, 29 Jan 2019 19:48:20 -0500 Received: from localhost (flamenco.cs.columbia.edu [128.59.20.216]) by mail.messagingengine.com (Postfix) with ESMTPA id 191A8E4559; Tue, 29 Jan 2019 19:48:20 -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; s= mesmtp; bh=0/a9OGctNOF4CEU6FzYoTH6+KLJUMb4KjKR6c+e1Yuk=; b=CMSk8 NrdmF7AifaY8Glwpp1wHpVBYXDSof9t6Tzmk6VNRww3EqVFJ5O38OYnc0GUXNJR7 DsLJ8rcqNfeOl1AehbdzAE9JLwV06uwrx8jpwB32LHenvBcwix8o65laah9OVg2R cL8sHQxposDmc1otI/1CvWmNu9KAKwPBhZbtJM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; bh=0/a9OGctNOF4CEU6FzYoTH6+KLJUM b4KjKR6c+e1Yuk=; b=xEA4Js4Ji078yH7VSomOPJkdHLuvJAz2QfWc8spYbUPEN dSBEF8dI3IGEs7HyqlM5M86YNh6rVd1QXBxlqeS72PpOw5MPZQmDmJx4PLwKoiCl 8cgDJml0SiLBOfAfcwOozXj/vKWCP2Hfb0XUZ3hRZB5gDrbwafM4pGe2qMWrMpPN N0Fadws0TYVbPXN8+VkzT6NaWV6nxjKL4qWi8jWwJMYmmOUC/j7Z22JqtbCnDDnA 74nEp85e5aI2wXLEZ7xv4tja0TSqo93vBQpj2r5SdwVSLokIlXIsyb21bNUswV8A HhoJwOeoeQfzMMDtsiLzAFt3UzT5DWhCKoTCHxbkw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedtledrjeefgddvkecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfhuthenuceurghilhhouhhtmecufedt tdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhephffvufffkffojg hfsedttdertdertddtnecuhfhrohhmpedfgfhmihhlihhoucfirdcuvehothgrfdcuoegt ohhtrgessghrrggrphdrohhrgheqnecukfhppeduvdekrdehledrvddtrddvudeinecurf grrhgrmhepmhgrihhlfhhrohhmpegtohhtrgessghrrggrphdrohhrghenucevlhhushht vghrufhiiigvpeeg X-ME-Proxy: From: "Emilio G. Cota" To: qemu-devel@nongnu.org Date: Tue, 29 Jan 2019 19:47:29 -0500 Message-Id: <20190130004811.27372-32-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> 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 31/73] cpu: 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 Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This finishes the conversion to cpu_halted. Signed-off-by: Emilio G. Cota Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson --- cpus.c | 8 ++++---- qom/cpu.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cpus.c b/cpus.c index c4fa3cc876..aee129c0b3 100644 --- a/cpus.c +++ b/cpus.c @@ -204,7 +204,7 @@ static bool cpu_thread_is_idle(CPUState *cpu) if (cpu_is_stopped(cpu)) { return true; } - if (!cpu->halted || cpu_has_work(cpu) || + if (!cpu_halted(cpu) || cpu_has_work(cpu) || kvm_halt_in_kernel()) { return false; } @@ -1686,7 +1686,7 @@ static void *qemu_hax_cpu_thread_fn(void *arg) =20 cpu->thread_id =3D qemu_get_thread_id(); cpu->created =3D true; - cpu->halted =3D 0; + cpu_halted_set(cpu, 0); current_cpu =3D cpu; =20 hax_init_vcpu(cpu); @@ -1845,7 +1845,7 @@ static void *qemu_tcg_cpu_thread_fn(void *arg) * * cpu->halted should ensure we sleep in wait_io_event */ - g_assert(cpu->halted); + g_assert(cpu_halted(cpu)); break; case EXCP_ATOMIC: qemu_mutex_unlock_iothread(); @@ -2342,7 +2342,7 @@ CpuInfoList *qmp_query_cpus(Error **errp) info->value =3D g_malloc0(sizeof(*info->value)); info->value->CPU =3D cpu->cpu_index; info->value->current =3D (cpu =3D=3D first_cpu); - info->value->halted =3D cpu->halted; + info->value->halted =3D cpu_halted(cpu); info->value->qom_path =3D object_get_canonical_path(OBJECT(cpu)); info->value->thread_id =3D cpu->thread_id; #if defined(TARGET_I386) diff --git a/qom/cpu.c b/qom/cpu.c index 2c05aa1bca..c5106d5af8 100644 --- a/qom/cpu.c +++ b/qom/cpu.c @@ -261,7 +261,7 @@ static void cpu_common_reset(CPUState *cpu) } =20 cpu->interrupt_request =3D 0; - cpu->halted =3D 0; + cpu_halted_set(cpu, 0); cpu->mem_io_pc =3D 0; cpu->mem_io_vaddr =3D 0; cpu->icount_extra =3D 0; --=20 2.17.1