From nobody Mon Feb 9 06:16:01 2026 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 154881082621680.58413343856955; Tue, 29 Jan 2019 17:13:46 -0800 (PST) Received: from localhost ([127.0.0.1]:58121 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goeRg-0002ru-54 for importer@patchew.org; Tue, 29 Jan 2019 20:13:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35678) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goe3y-00007p-KT for qemu-devel@nongnu.org; Tue, 29 Jan 2019 19:49:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1goe3u-0001HR-RX for qemu-devel@nongnu.org; Tue, 29 Jan 2019 19:49:08 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:40621) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1goe3s-00010H-Qt 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 9CCB022153; Tue, 29 Jan 2019 19:48:23 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Tue, 29 Jan 2019 19:48:23 -0500 Received: from localhost (flamenco.cs.columbia.edu [128.59.20.216]) by mail.messagingengine.com (Postfix) with ESMTPA id AA1C5E4664; Tue, 29 Jan 2019 19:48:22 -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=bGEeZ1XvmuPEE0rUqIT0YC7V8KY51BIMKyg+H57sem4=; b=SHmXw YNqqCGIzUJZmQS1S84xwX41nXNJGM1rMEuBHqXa55+ZYDX2MZIc4WE3xG1d/Y0Sv NGBlZOeR3h/RI8DpBE1XHnsrr2rINEM6Y3z8NyU6UqYBZ2Bokz/b4GGJP4GQICOW MtlvQcftXTyLwqjOfFETMaxEDVZwgyFfq7zqPI= 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=bGEeZ1XvmuPEE0rUqIT0YC7V8KY51 BIMKyg+H57sem4=; b=l45eebTyFvbeQF/CPFPhGipiZ/qsVaq//AccOUSnCE53l SjU2x2ndMf1OjZ4AROnwI4YwWM6e+0oqz+cxl7QoXsUBnZPflbEESTho5VaUHkNx f5HeP+DgpPt6MMJpSXqpnXu1ECY6zeh7wpgWsK9DLlGwPqzUGibfjuJY4Lqm2cuF Da+xZbcCKXdIHHA2JtCXCdZndva4wz/b/kPBp90ZMfaUXpBdG3d3I6R9PUj/uT7q TQVAUEmL76IS+BGlSJ8UjztS9cy9KirVT3WS1pFQzJQL3v1gsXVLAxNU0Uu/MqT6 Y4FcVJoNLWmutA1Do7DpC6lkxa4ttWrFLNo29mZ+g== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedtledrjeefgddvkecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfhuthenuceurghilhhouhhtmecufedt tdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhephffvufffkffojg hfsedttdertdertddtnecuhfhrohhmpedfgfhmihhlihhoucfirdcuvehothgrfdcuoegt ohhtrgessghrrggrphdrohhrgheqnecukfhppeduvdekrdehledrvddtrddvudeinecurf grrhgrmhepmhgrihhlfhhrohhmpegtohhtrgessghrrggrphdrohhrghenucevlhhushht vghrufhiiigvpeek X-ME-Proxy: From: "Emilio G. Cota" To: qemu-devel@nongnu.org Date: Tue, 29 Jan 2019 19:47:37 -0500 Message-Id: <20190130004811.27372-40-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 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: 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 Reviewed-by: Alex Benn=C3=A9e --- 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 a37b984b61..35dea8c152 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -5678,7 +5678,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