Message ID | 20181213050453.9677-61-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="AqBbabvY"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=messagingengine.com header.i=@messagingengine.com header.b="Q4S/zb02"; 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 43Fj9Z2Gngz9s9h for <incoming@patchwork.ozlabs.org>; Thu, 13 Dec 2018 16:37:06 +1100 (AEDT) Received: from localhost ([::1]:50593 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 1gXJgF-0000Qn-OJ for incoming@patchwork.ozlabs.org; Thu, 13 Dec 2018 00:37:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56181) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <cota@braap.org>) id 1gXJCy-0007yl-8W for qemu-devel@nongnu.org; Thu, 13 Dec 2018 00:06:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <cota@braap.org>) id 1gXJCw-00028H-HX for qemu-devel@nongnu.org; Thu, 13 Dec 2018 00:06:47 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:46771) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <cota@braap.org>) id 1gXJCw-0001oW-5E for qemu-devel@nongnu.org; Thu, 13 Dec 2018 00:06:46 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id D930822247; Thu, 13 Dec 2018 00:05:50 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Thu, 13 Dec 2018 00:05:50 -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; s= mesmtp; bh=awvmmiC54gKeJsk1kiKU1aotMd439kBqDS2NFlqv7Dg=; b=AqBba bvYZfLaeGwLqsmo7xRGjAsB6cTeLu0JQSoH+vZ/o+Y3NnphzLvYRUNfeu8ZSbhJH 9bJrOp5smZhYeMb91UQs2P079a0WWTkzE+TQEIKK101z3BlaKGBwZ8NWdycpMNGz fSZUvoTXc35fJVACGP00/gpo70WlZ58bB5eMx0= 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=awvmmiC54gKeJsk1kiKU1aotMd439 kBqDS2NFlqv7Dg=; b=Q4S/zb02Foq1S6SPSi0wdT9hSkTVblK6ZvJfWaWMrNjup kjpxOAB9O6IVziMV60NpZUD8rOrwibeetGs95uXr399RVotzsFeuiYJJQdmZ6Cct oPqwxgmvm6QG+iLx7zMj3PEfsxgQcWBaUC4VgEOyr0iyVfjMCe+L5HJClvMEOtgf SHVJQp74X349VbqlWl/ypYWhPNoyC3I4oPHhuBLEhnEX/6rwiIKHHZSvLeKRDv+E twOmG+DYZiPEl4hAXh0GFsEfnEkUGmAeNVckkUOWceXRbh66nalzzID/MEwNA8UG ySv8Gxcg4GMMJisTScTFr+2brGmNAU9BwwowIH47Q== X-ME-Sender: <xms:rugRXOd2r9It2fjX4ZKikk-ON6R9BJLQ9F0R8zTq8S2dPsgCqdlPQQ> X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedtkedrudehuddgkedtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfquhhtnecuuegrihhlohhuthemucef tddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpefhvffufffkof gjfhestddtredtredttdenucfhrhhomhepfdfgmhhilhhiohcuifdrucevohhtrgdfuceo tghothgrsegsrhgrrghprdhorhhgqeenucfkphepuddvkedrheelrddvtddrvdduieenuc frrghrrghmpehmrghilhhfrhhomheptghothgrsegsrhgrrghprdhorhhgnecuvehluhhs thgvrhfuihiivgepke X-ME-Proxy: <xmx:rugRXPz5Dp-H28a6GHWlyE39b-bqI__4fzHjdXVR7pTgfBdxxJ-HzA> <xmx:rugRXPLi80QFmLLWZdmmNprYIDdcBj9Km-oWLEM6t4ajhcG5q8JIMA> <xmx:rugRXItsiEAH24SgOf7Snn7pFpJS5oCHTXIialHw40k1eiqVxPIHUg> <xmx:rugRXLpjKHjbZbHSISwc9XaI-w-QcI7d9SL5YLEGWFC9UOFh3qCC7w> Received: from localhost (flamenco.cs.columbia.edu [128.59.20.216]) by mail.messagingengine.com (Postfix) with ESMTPA id 6D6F91033F; Thu, 13 Dec 2018 00:05:50 -0500 (EST) From: "Emilio G. Cota" <cota@braap.org> To: qemu-devel@nongnu.org Date: Thu, 13 Dec 2018 00:04:40 -0500 Message-Id: <20181213050453.9677-61-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 60/73] cpu: convert to 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>, Paolo Bonzini <pbonzini@redhat.com>, Richard Henderson <richard.henderson@linaro.org> 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
|
diff --git a/qom/cpu.c b/qom/cpu.c index 44b78f1892..7452109833 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; @@ -410,7 +410,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);
This finishes the conversion to interrupt_request. Signed-off-by: Emilio G. Cota <cota@braap.org> --- qom/cpu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)