Message ID | 20181019010625.25294-44-cota@braap.org |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=braap.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=braap.org header.i=@braap.org header.b="D/MMMUiH"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="ZrZjJ/la"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42bpQ54fDzz9sBj for <incoming@patchwork.ozlabs.org>; Fri, 19 Oct 2018 12:35:25 +1100 (AEDT) Received: from localhost ([::1]:46030 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1gDJhD-0004fQ-6z for incoming@patchwork.ozlabs.org; Thu, 18 Oct 2018 21:35:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59260) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <cota@braap.org>) id 1gDJFn-0004rl-5k for qemu-devel@nongnu.org; Thu, 18 Oct 2018 21:07:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <cota@braap.org>) id 1gDJFk-0003N3-NL for qemu-devel@nongnu.org; Thu, 18 Oct 2018 21:07:02 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:47341) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <cota@braap.org>) id 1gDJFj-00034m-Va for qemu-devel@nongnu.org; Thu, 18 Oct 2018 21:07:00 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 8B5D322989; Thu, 18 Oct 2018 21:06:36 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Thu, 18 Oct 2018 21:06:36 -0400 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=VqCUWqgwwu90FfGSvGiwtcK3qQVYDq1lev2Uj3WBHu4=; b=D/MMM UiHBIkO1Y8MVcXu3Vdt84Jmf6OjuygtKBEft+3JYZtLx+zifai5V6X+Oa5/JGO/w QGyBNufHDxTqgCOOeRn1nhPephTCMFiycvWNWIOFvlp+H+8xw4PDg39nuMALrSko AYZfHdzr6kh4zgZhX75G2YHAWQLz5Av929dqEc= 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=VqCUWqgwwu90FfGSvGiwtcK3qQVYD q1lev2Uj3WBHu4=; b=ZrZjJ/laoBG3AqZMGJuki+CP4OPTDkcfTuMieTV8MEpTJ xXFUzXDi+6ScLErBhqpTLeeY9bzRR7auCieZ+iwFHqEkMBMa7Nl+OlNRy9aHIspr sBz2kB2cyYiseCecPEwgSDQFBWaa88u8LCEXeNPJecr7MCqAL+JdUZXzD1weCyCo DMpgb7qDeumQvN3IVIrpNbcZAWquVwytK4zuAwXTO9gCMkK9Hf6SvLJEG5wNX07M udCVN94Ow0LwzAaOMQwUrghcyTglhaX8SPT1d40cj/JuWCnavsNsOPf1Zyiy6s1z NAsDa21cPOBXuBiURoxgw3F4K0RLokzJfdghSvEvw== X-ME-Sender: <xms:HC7JW4Ui111I3t8zm-49iPb2ZwqC6OvsjGLb8FnrLmaw6AV9OzPqOw> X-ME-Proxy: <xmx:HC7JW3tWrQNsAML-aDqw5t5UzpKU_KazZaPLdUGS9QIRoqnCIcZvDw> <xmx:HC7JW6fp559osqxStTzwwy_JHXhBd9Qu_pzOAekfoVbGWRoEV0Fllw> <xmx:HC7JW_BwAUxPd4e7-njx8ejHOT4v7VqO_hrORz7rrJKz2YmW7Fy63w> <xmx:HC7JWxJ81nazkHZiC0-AFnQSTeVpU9OQ1rCIqt6l-LMFErMIkY6N6Q> <xmx:HC7JW8uWCuncGTnj5WI0_jsVXuErPQZhUlrU5v2Pc0rj5KjmPSD21Q> <xmx:HC7JWxY00IlQzeUMRZhQ1R-FKkNybqZM0JgzW3jGH5DDCMONrp1EHA> Received: from localhost (flamenco.cs.columbia.edu [128.59.20.216]) by mail.messagingengine.com (Postfix) with ESMTPA id 2CEF4102E4; Thu, 18 Oct 2018 21:06:36 -0400 (EDT) From: "Emilio G. Cota" <cota@braap.org> To: qemu-devel@nongnu.org Date: Thu, 18 Oct 2018 21:06:12 -0400 Message-Id: <20181019010625.25294-44-cota@braap.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181019010625.25294-1-cota@braap.org> References: <20181019010625.25294-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.29 Subject: [Qemu-devel] [RFC v3 43/56] 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: Paolo Bonzini <pbonzini@redhat.com>, Stafford Horne <shorne@gmail.com> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
per-CPU locks
|
expand
|
On 10/19/18 2:06 AM, Emilio G. Cota wrote: > Cc: Stafford Horne <shorne@gmail.com> > Signed-off-by: Emilio G. Cota <cota@braap.org> > --- > hw/openrisc/cputimer.c | 2 +- > target/openrisc/cpu.c | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
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 fb7cb5c507..cdbc9353b7 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)
Cc: Stafford Horne <shorne@gmail.com> Signed-off-by: Emilio G. Cota <cota@braap.org> --- hw/openrisc/cputimer.c | 2 +- target/openrisc/cpu.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)