From patchwork Mon Mar 4 18:18:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Emilio Cota X-Patchwork-Id: 10838289 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4FD291390 for ; Mon, 4 Mar 2019 19:12:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3EE1B2B1CC for ; Mon, 4 Mar 2019 19:12:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 32BE12AA5E; Mon, 4 Mar 2019 19:12:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CF1192AA5E for ; Mon, 4 Mar 2019 19:12:47 +0000 (UTC) Received: from localhost ([127.0.0.1]:59399 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0t14-0004Gg-V0 for patchwork-qemu-devel@patchwork.kernel.org; Mon, 04 Mar 2019 14:12:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44941) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sBC-0000T7-O3 for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:19:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sBA-00025U-FC for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:19:10 -0500 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:55515) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h0sB9-0001M0-WF for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:19:08 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 519993734; Mon, 4 Mar 2019 13:18:29 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Mon, 04 Mar 2019 13:18:29 -0500 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=WOrvZF1rj6VDuX5dsSoayKf9MhaIyN4EJXYysUSld+U=; b=2cFZaO8kND9w ViiV1lcvUIHepjYX++d9qCagL6nA2O7pG4KoY8q8dyf/Stvx8MyW6u/cpI9CIBwT 3lwsK7jEvxV2hHL8W+1BfDWrluu5TzpXLFP6EweRpmU0e7bTVkAYKkBPJct2ctXN j3VrU1SiVSfAFl8YFb2crD3DcKWD7ko= 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=fm2; bh=WOrvZF1rj6VDuX5dsSoayKf9MhaIyN4EJXYysUSld +U=; b=T63INjE1JceN/GXaxIyDCBWvLPhWYyIInbobxLf6bBUHv8yQs8tcWfAS8 dG2atX79CUlDYEXcIIRLnLJdHWlJJUd3jsXJZGyefCv6L0TGuAdux+5Ve+iCAnhH k1MRe0139oW8/coRooWEIRNyv+HjQVwMjdebZ1SJ42SqeGLgyxZUB607h1uJ2Rzw Ixe7MqpPN2iSFOwTkNyx/p4znjBOFNu6NPC2HSRQjzSWlU6j/ebBZB2WU7wd3Ifa idr81bVz39JWjNRDvO64zVj3JWywlXcD7mIhwQZqZLQlc4wAVedxIf48IywpUPtD fy7TS3q9myBsyxmc+1eMmlX34mx9w== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedutddrfedugdduuddtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfgggtgfesthekredtredtjeenucfhrhhomhepfdfgmhhi lhhiohcuifdrucevohhtrgdfuceotghothgrsegsrhgrrghprdhorhhgqeenucfkphepud dvkedrheelrddvtddrvdduieenucfrrghrrghmpehmrghilhhfrhhomheptghothgrsegs rhgrrghprdhorhhgnecuvehluhhsthgvrhfuihiivgepgeej X-ME-Proxy: Received: from localhost (flamenco.cs.columbia.edu [128.59.20.216]) by mail.messagingengine.com (Postfix) with ESMTPA id 90A0110319; Mon, 4 Mar 2019 13:18:28 -0500 (EST) From: "Emilio G. Cota" To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 13:18:00 -0500 Message-Id: <20190304181813.8075-61-cota@braap.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190304181813.8075-1-cota@braap.org> References: <20190304181813.8075-1-cota@braap.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 64.147.123.25 Subject: [Qemu-devel] [PATCH v7 60/73] cpu: convert to 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_Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP This finishes the conversion to interrupt_request. Reviewed-by: Alex Bennée Reviewed-by: Richard Henderson Signed-off-by: Emilio G. Cota --- qom/cpu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qom/cpu.c b/qom/cpu.c index 00add81a7f..f2695be9b2 100644 --- a/qom/cpu.c +++ b/qom/cpu.c @@ -275,7 +275,7 @@ static void cpu_common_reset(CPUState *cpu) log_cpu_state(cpu, cc->reset_dump_flags); } - cpu->interrupt_request = 0; + cpu_interrupt_request_set(cpu, 0); cpu_halted_set(cpu, 0); cpu->mem_io_pc = 0; cpu->mem_io_vaddr = 0; @@ -412,7 +412,7 @@ static vaddr cpu_adjust_watchpoint_address(CPUState *cpu, vaddr addr, int len) static void generic_handle_interrupt(CPUState *cpu, int mask) { - cpu->interrupt_request |= mask; + cpu_interrupt_request_or(cpu, mask); if (!qemu_cpu_is_self(cpu)) { qemu_cpu_kick(cpu);