Message ID | 20190304181813.8075-57-cota@braap.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org> 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 777B314DE for <patchwork-qemu-devel@patchwork.kernel.org>; Mon, 4 Mar 2019 18:56:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 64A1C2B101 for <patchwork-qemu-devel@patchwork.kernel.org>; Mon, 4 Mar 2019 18:56:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 58A4E2B10F; Mon, 4 Mar 2019 18:56:31 +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 EFD792B101 for <patchwork-qemu-devel@patchwork.kernel.org>; Mon, 4 Mar 2019 18:56:30 +0000 (UTC) Received: from localhost ([127.0.0.1]:59153 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org>) id 1h0slK-0007HO-30 for patchwork-qemu-devel@patchwork.kernel.org; Mon, 04 Mar 2019 13:56:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44934) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <cota@braap.org>) id 1h0sBC-0000T5-Ny 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 <cota@braap.org>) id 1h0sBA-00026m-Np for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:19:10 -0500 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:57031) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <cota@braap.org>) id 1h0sBA-0001Ku-Ci 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 9036F372F; Mon, 4 Mar 2019 13:18:28 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Mon, 04 Mar 2019 13:18:28 -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=J8aIIqTjV+Mt0jNHcvj5ebXyUHn/nrOTKAO/hoazzNI=; b=d+DLQZrTHEp4 sAt8DmuSz1bKhpEsNHHEhk3xqBFFAMnq6vaw579sXgp82Hfh3tcW1kKXZSNmd9mB 34s7Ymp2cNWjphk6JcFTLIo+hSA1WLIjGTRdQT9lCDmnV9FBiWg78i5Rjj3dVtne dAJAMZcUQoovqsVbysELpDHmB8KwJ88= 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=J8aIIqTjV+Mt0jNHcvj5ebXyUHn/nrOTKAO/hoazz NI=; b=sklnuHARF/3MLAmPbzFaPBHfuvU+XgSNuGT59HNA3CHeYKd+w1df/TQ1+ 0rA94SxEpRPNq80t8XoW1UyPDkbErsz8MUA0hx2RXp/LrUagiMXZzoa+LsgcyGik Ua5REoQXfiAYLiEDXQt8hJyhiuLIq9T5wTU7hpUtzcJu/R/powqCYUu4+bJyQG7q bH+XenhM9GFDuEL1EROVNOwzGJXMhVDCB3I+fX+DDySzq+QaigD7al9YZ46VF9aH lc+dhW+hSUIdf//XBRtpR7rShwvdHWgT3je6CBoz62VbktTAjYQpQi3llIxrHb8S hQhj9VpxxHwdnsrJpxsqrbzeYAyvA== X-ME-Sender: <xms:9Gt9XLY0DzCWU3_SkSw2EXjEIl5sxXRsYXlT_3UhAMKC9kPm1x5Lig> X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedutddrfedugdduuddtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfgggtgfesthekredtredtjeenucfhrhhomhepfdfgmhhi lhhiohcuifdrucevohhtrgdfuceotghothgrsegsrhgrrghprdhorhhgqeenucfkphepud dvkedrheelrddvtddrvdduieenucfrrghrrghmpehmrghilhhfrhhomheptghothgrsegs rhgrrghprdhorhhgnecuvehluhhsthgvrhfuihiivgepgeej X-ME-Proxy: <xmx:9Gt9XDyH3a8o4KD4xp1918EzPppS-6HhzaHCGYFPQCraPd78S4palA> <xmx:9Gt9XHH7RKt4Hk6G7SVQH6kPPZ2xFsbvijO-1fwWHKkiLquL94FhJQ> <xmx:9Gt9XErDT-uLJDxAw6fJXYnTMdKj3Wv8GU8bQFA3TgMiMy0PBlGnCg> <xmx:9Gt9XHKYc120mtGmSR0FjjEDXccRzE1NKQIBSD1Y_DYbeZTe_UVmqw> Received: from localhost (flamenco.cs.columbia.edu [128.59.20.216]) by mail.messagingengine.com (Postfix) with ESMTPA id C52151030F; Mon, 4 Mar 2019 13:18:27 -0500 (EST) From: "Emilio G. Cota" <cota@braap.org> To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 13:17:56 -0500 Message-Id: <20190304181813.8075-57-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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 56/73] openrisc: convert to cpu_interrupt_request X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>, Stafford Horne <shorne@gmail.com>, Richard Henderson <richard.henderson@linaro.org> Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org> X-Virus-Scanned: ClamAV using ClamSMTP |
Series |
[v7,01/73] cpu: convert queued work to a QSIMPLEQ
|
expand
|
diff --git a/hw/openrisc/cputimer.c b/hw/openrisc/cputimer.c index 850f88761c..739404e4f5 100644 --- a/hw/openrisc/cputimer.c +++ b/hw/openrisc/cputimer.c @@ -102,7 +102,7 @@ static void openrisc_timer_cb(void *opaque) CPUState *cs = CPU(cpu); cpu->env.ttmr |= TTMR_IP; - cs->interrupt_request |= CPU_INTERRUPT_TIMER; + cpu_interrupt_request_or(cs, CPU_INTERRUPT_TIMER); } switch (cpu->env.ttmr & TTMR_M) { diff --git a/target/openrisc/cpu.c b/target/openrisc/cpu.c index 541b2a66c7..a01737dfda 100644 --- a/target/openrisc/cpu.c +++ b/target/openrisc/cpu.c @@ -32,8 +32,8 @@ static void openrisc_cpu_set_pc(CPUState *cs, vaddr value) static bool openrisc_cpu_has_work(CPUState *cs) { - return cs->interrupt_request & (CPU_INTERRUPT_HARD | - CPU_INTERRUPT_TIMER); + return cpu_interrupt_request(cs) & (CPU_INTERRUPT_HARD | + CPU_INTERRUPT_TIMER); } static void openrisc_disas_set_info(CPUState *cpu, disassemble_info *info)