From nobody Fri Nov 7 01:02:37 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1544678411424756.0550128199707; Wed, 12 Dec 2018 21:20:11 -0800 (PST) Received: from localhost ([::1]:50500 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXJPp-0002kE-DX for importer@patchew.org; Thu, 13 Dec 2018 00:20:05 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55883) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXJCr-0007rR-TJ for qemu-devel@nongnu.org; Thu, 13 Dec 2018 00:06:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gXJCo-0001ts-Go for qemu-devel@nongnu.org; Thu, 13 Dec 2018 00:06:41 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:54881) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gXJCn-0001ZO-K6 for qemu-devel@nongnu.org; Thu, 13 Dec 2018 00:06:38 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id B94C222236; Thu, 13 Dec 2018 00:05:45 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Thu, 13 Dec 2018 00:05:45 -0500 Received: from localhost (flamenco.cs.columbia.edu [128.59.20.216]) by mail.messagingengine.com (Postfix) with ESMTPA id 4C8C510086; Thu, 13 Dec 2018 00:05:45 -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=/a6KeJBmuXDPv63AnblqO7DdIsPts3OhVfgvRSIi5No=; b=LYb1V aGAg895HG8uIAtMO1LZVkb6Gk+aKnxV7DZSJFyT31leH+277Ue7VMJZAatho36oe +JtQEC2mAN/AteitZfd+uTCsK8Ty+Tv9khLJz6DMF44zAtixtw+7cFZX34Ec1PoI qPr3FrnJ5POvptPEqv2SMc5kfQNLlyDkT4B+3c= 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=/a6KeJBmuXDPv63AnblqO7DdIsPts 3OhVfgvRSIi5No=; b=Gk6UW8G2ZGpA00MCzZX1ZRDr174CUPx2X69guHn9QU3DT wMGuQxfQHTXVq6voZnseOFOnVpTt6x4E5E7vZZT48RaWIOSOoGJrHKe6mbloNQpn P1OGL1uFzFDfirEOWxEvSWajwbMJf/XVTOrxsySngTuKoKeqPIhZI5FmhiuUm3m6 zzxmDAlQ6VSrwQ20t8AET53U4Wy61UPrlu6+JuFya+Llc2HBlWnXzhzUTcDeCFgE jQbKtrjJpI1iwkpqkW6HhD1eOk3KHJbjEr5eCCI3b7rUbS2zzhHuX8VdevCY1Y/1 lnV9RL+8x6b0j1T7QsCUlERG+CogvEdWWG5zOfWSA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedtkedrudehuddgkedtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfquhhtnecuuegrihhlohhuthemucef tddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpefhvffufffkof gjfhestddtredtredttdenucfhrhhomhepfdfgmhhilhhiohcuifdrucevohhtrgdfuceo tghothgrsegsrhgrrghprdhorhhgqeenucfkphepuddvkedrheelrddvtddrvdduieenuc frrghrrghmpehmrghilhhfrhhomheptghothgrsegsrhgrrghprdhorhhgnecuvehluhhs thgvrhfuihiivgepke X-ME-Proxy: From: "Emilio G. Cota" To: qemu-devel@nongnu.org Date: Thu, 13 Dec 2018 00:04:19 -0500 Message-Id: <20181213050453.9677-40-cota@braap.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181213050453.9677-1-cota@braap.org> References: <20181213050453.9677-1-cota@braap.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.111.4.25 Subject: [Qemu-devel] [PATCH v5 39/73] i386: convert to cpu_interrupt_request 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , 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" Reviewed-by: Richard Henderson Signed-off-by: Emilio G. Cota --- target/i386/cpu.c | 2 +- target/i386/helper.c | 4 ++-- target/i386/svm_helper.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 22cca17b9e..35d1d2d10a 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -5641,7 +5641,7 @@ int x86_cpu_pending_interrupt(CPUState *cs, int inter= rupt_request) =20 static bool x86_cpu_has_work(CPUState *cs) { - return x86_cpu_pending_interrupt(cs, cs->interrupt_request) !=3D 0; + return x86_cpu_pending_interrupt(cs, cpu_interrupt_request(cs)) !=3D 0; } =20 static void x86_disas_set_info(CPUState *cs, disassemble_info *info) diff --git a/target/i386/helper.c b/target/i386/helper.c index a75278f954..9197fb4edc 100644 --- a/target/i386/helper.c +++ b/target/i386/helper.c @@ -1035,12 +1035,12 @@ void do_cpu_init(X86CPU *cpu) CPUState *cs =3D CPU(cpu); CPUX86State *env =3D &cpu->env; CPUX86State *save =3D g_new(CPUX86State, 1); - int sipi =3D cs->interrupt_request & CPU_INTERRUPT_SIPI; + int sipi =3D cpu_interrupt_request(cs) & CPU_INTERRUPT_SIPI; =20 *save =3D *env; =20 cpu_reset(cs); - cs->interrupt_request =3D sipi; + cpu_interrupt_request_set(cs, sipi); memcpy(&env->start_init_save, &save->start_init_save, offsetof(CPUX86State, end_init_save) - offsetof(CPUX86State, start_init_save)); diff --git a/target/i386/svm_helper.c b/target/i386/svm_helper.c index a6d33e55d8..ebf3643ba7 100644 --- a/target/i386/svm_helper.c +++ b/target/i386/svm_helper.c @@ -316,7 +316,7 @@ void helper_vmrun(CPUX86State *env, int aflag, int next= _eip_addend) if (int_ctl & V_IRQ_MASK) { CPUState *cs =3D CPU(x86_env_get_cpu(env)); =20 - cs->interrupt_request |=3D CPU_INTERRUPT_VIRQ; + cpu_interrupt_request_or(cs, CPU_INTERRUPT_VIRQ); } =20 /* maybe we need to inject an event */ @@ -674,7 +674,7 @@ void do_vmexit(CPUX86State *env, uint32_t exit_code, ui= nt64_t exit_info_1) env->vm_vmcb + offsetof(struct vmcb, control.int_ct= l)); int_ctl &=3D ~(V_TPR_MASK | V_IRQ_MASK); int_ctl |=3D env->v_tpr & V_TPR_MASK; - if (cs->interrupt_request & CPU_INTERRUPT_VIRQ) { + if (cpu_interrupt_request(cs) & CPU_INTERRUPT_VIRQ) { int_ctl |=3D V_IRQ_MASK; } x86_stl_phys(cs, --=20 2.17.1