From patchwork Thu May 21 16:39:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Robert Foley X-Patchwork-Id: 187071 Delivered-To: patch@linaro.org Received: by 2002:a92:5b0a:0:0:0:0:0 with SMTP id p10csp1736433ilb; Thu, 21 May 2020 10:15:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy0/BLjcunWoGa/m0CU9q0q2WtCwSf5pLBG/NCTqY2Z9WAn6LdeA3isftPUkdPo+s7Id0SA X-Received: by 2002:a37:4243:: with SMTP id p64mr11130660qka.438.1590081332221; Thu, 21 May 2020 10:15:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1590081332; cv=none; d=google.com; s=arc-20160816; b=aH1/Dn6TviMHmDbhma0StKqXkgO8094BgJugUeR80G3bhcdDy4xNJ5rgi7wMhf2H2b YD2dU7WjAXi0EpVpvpg9oQKEz5KiMtgJ9rp2ue0YxOMNBEgaqMSeo+FMKyJT1rLFmkVE OKfA0RklZexFkQfkxhtGfFsfWb+T0BFDw7y82xBkFUN5gG+9hvfvI76oEF5S42lH0nVB Y1Z5nzlBOBV7oZ32IFO+pvypL3ta9Gv8cOp8v9Rf4aijOx+v6yU5XjAnApewpShN4oWC tkQ8H0R8o1MnF6BjLCwIHcsyYSMNGJsjC+n5aTgpSbWKP+QbtA0JHGMrO9Kpon+N6Bg6 AfZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=rdoJqb1IBk9SgvYZUNMM+KSW8M0ZuxcTTKuiIiIMCBs=; b=NQYfeN2LlxBPhDfr9bdu+/5ME37B3UFVosmdo9XnMPLfH1UEC1dJuqKcT9CVOF68iy 2e2M0+FKjw/IqJQoRJZ+HfQxscd8Mu7iTk4ISktxcrG2T6jOCaNpx3gQJUCLdO8r7qY9 npqn+88gYB9BcYenCUrjRP5f0SLFb1ZbEzAWx3aak6EkPG2zHXC4Hyaun9VZhbVHodtL zh+1/RbdKZEp11jh3BAE76KCB0wHpnW171spNK6GmJh0ES4+wQRaDBWGVdZla/9uQbBP xhJ4DtFqiHtLRmpv8mG7mWZ4t7ElA80Bp/4Xhwy40Hlcse9VM0W+HHxxBR02vsacLbkN ao+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=v5ZpjIYG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id y62si3882440qka.278.2020.05.21.10.15.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 21 May 2020 10:15:32 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=v5ZpjIYG; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:51780 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jbon5-0001NF-KS for patch@linaro.org; Thu, 21 May 2020 13:15:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50094) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jboJ1-0004Ia-No for qemu-devel@nongnu.org; Thu, 21 May 2020 12:44:29 -0400 Received: from mail-qv1-xf2d.google.com ([2607:f8b0:4864:20::f2d]:37756) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jboJ1-0006h6-1g for qemu-devel@nongnu.org; Thu, 21 May 2020 12:44:27 -0400 Received: by mail-qv1-xf2d.google.com with SMTP id z5so3375396qvw.4 for ; Thu, 21 May 2020 09:44:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rdoJqb1IBk9SgvYZUNMM+KSW8M0ZuxcTTKuiIiIMCBs=; b=v5ZpjIYGOvlPCrZUyNTyCt6JWDyWc3FctG1uKuwFMq/oFAcQLPRSG3lM8g/KdEKCnU 5j4hCb+6fotCXd6RUDlwoUqAYVHNZlZlP/atalJIJpW0nRJtxemhdeQ/MydYJmzlvGsB LxpjxKjk1veQQqQ1XfO4qrUxjVcwkVpVZsUk+ruwG0wkzrfGxG5dpMgM12g1kT7yF0jo bztlncEi3L0X4CWeHN6ZenhqmP2RU0iFZ4TM1uMhfdtIQg8+Jpn7/E+fZ6Gvw4AqzCR6 YY4+QFC+Y/U4MCaUvpiMPoGXHyjvWg8NSM1W72KZyy8UMzKBFjf3BabvozC0SMUgl02/ nw+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rdoJqb1IBk9SgvYZUNMM+KSW8M0ZuxcTTKuiIiIMCBs=; b=Q2j0ogNGatzT1ZoYDuMaVBRH/NBK1McPDK6lTga02Ip2nOtBWfBpdA3YnC9lz01nqM 55rHYRFJ4kmYvpnFGdqPAGl6hGCjTkNVqzAeUzbs81BJjQEJBI8JDe/lccoB9vvnqmFc PDz2SeKcxo05RAdH8THjbCEV117cGNdb6uvSvLOM7h48LyTKzs44UwaalWKniPnM0cl6 k0QVpxqASbQvqkusj0iWCQaE5lWMtJ9zs1FuaDT4xdlwIMOmmoXJ/PlD+5VQUHawNhV6 0FFpLyxAD2NOy6FqSp0+ZV2r0bvZanfUYH9xkq0J1/oAR4MDpSyl+0vDaPbQPZ8thjf6 sKOA== X-Gm-Message-State: AOAM533mE5VRdV4U38R1AM7RPTQQ6X+pw/jxNgLSnLA0QxHjzktXA1GP cyD4z2lcb0jg/Dyhk2xiygrqtBzyX66YFw== X-Received: by 2002:a0c:90e7:: with SMTP id p94mr11208478qvp.219.1590079465710; Thu, 21 May 2020 09:44:25 -0700 (PDT) Received: from Rfoley-MA01.hsd1.ma.comcast.net ([2601:199:4480:60c0:1944:c530:655c:5583]) by smtp.gmail.com with ESMTPSA id x24sm5923829qth.57.2020.05.21.09.44.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 May 2020 09:44:25 -0700 (PDT) From: Robert Foley To: qemu-devel@nongnu.org Subject: [PATCH v9 53/74] s390x: convert to cpu_interrupt_request Date: Thu, 21 May 2020 12:39:50 -0400 Message-Id: <20200521164011.638-54-robert.foley@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200521164011.638-1-robert.foley@linaro.org> References: <20200521164011.638-1-robert.foley@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::f2d; envelope-from=robert.foley@linaro.org; helo=mail-qv1-xf2d.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: robert.foley@linaro.org, David Hildenbrand , richard.henderson@linaro.org, Christian Borntraeger , qemu-s390x@nongnu.org, cota@braap.org, peter.puhov@linaro.org, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: "Emilio G. Cota" Cc: Christian Borntraeger Cc: David Hildenbrand Cc: qemu-s390x@nongnu.org Reviewed-by: Richard Henderson Reviewed-by: Alex Bennée Reviewed-by: Cornelia Huck Signed-off-by: Emilio G. Cota Signed-off-by: Robert Foley --- hw/intc/s390_flic.c | 2 +- target/s390x/cpu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.17.1 diff --git a/hw/intc/s390_flic.c b/hw/intc/s390_flic.c index a1c6b8a6f6..40b1a5b940 100644 --- a/hw/intc/s390_flic.c +++ b/hw/intc/s390_flic.c @@ -191,7 +191,7 @@ static void qemu_s390_flic_notify(uint32_t type) CPU_FOREACH(cs) { S390CPU *cpu = S390_CPU(cs); - cs->interrupt_request |= CPU_INTERRUPT_HARD; + cpu_interrupt_request_or(cs, CPU_INTERRUPT_HARD); /* ignore CPUs that are not sleeping */ if (s390_cpu_get_state(cpu) != S390_CPU_STATE_OPERATING && diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index 4b1961694e..490644e12b 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -65,7 +65,7 @@ static bool s390_cpu_has_work(CPUState *cs) return false; } - if (!(cs->interrupt_request & CPU_INTERRUPT_HARD)) { + if (!(cpu_interrupt_request(cs) & CPU_INTERRUPT_HARD)) { return false; }