From patchwork Wed Jun 17 21:02:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Robert Foley X-Patchwork-Id: 190944 Delivered-To: patch@linaro.org Received: by 2002:a92:cf06:0:0:0:0:0 with SMTP id c6csp814802ilo; Wed, 17 Jun 2020 14:29:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzZICbJ8G8fy3jvYdPmbvKF7GeMPJW4Y33tAhUmHIGRxr/2unmqz6Dh74bMSco/Syuu98KW X-Received: by 2002:a25:5307:: with SMTP id h7mr1407878ybb.464.1592429355933; Wed, 17 Jun 2020 14:29:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592429355; cv=none; d=google.com; s=arc-20160816; b=MPCOzbbjKGBQmTViLm4NP9eTI4QcPj35Eh4R7eQPCmhfgdi+HpEIyl9OMJ8hMX9lUh OE5cG3gmGLxXe2TO8rZpECWaWRLBkWx7nascLvOPX0GYTucE3UgrUw0RlIxIC0Jrf5sY ArhRz8R4igLKAXSDnDeT521wq4iV6E0gx2diKZAcQWuNFRmyTUYUVScPwm4i1+USZYBZ eEFqnT5EY5/ODt1xSGvtjGqNsFSIwo+i0SWyQOJXVW86mqCSBjyBqFaKSYObJJqJbyoR u9wLk3PTK9gXDwfApFSXDBio5nmUYlT9RHVILUY00+/bAYVCOGgouG6TRc/2IAz/anyg OSOA== 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=ljUyAp0qqYElrS8vzQ49pxqGCe+fOWSwI5BjIxDRmqQ=; b=AIRL1HB5RMzbVt+0s+Eu0mAw6fTCJdBnYgcYCQT8gCkB0T8bkUr9uTIvxQbofZrZfp 78Gbk8v1QMGhV87MOx+CRSjwTZMFO8DrdryAy2M9wcWzRwGHOGhzpsrj0ixPzpTmgTbs quL8EH/BZd+5DeW7TU9mjzJsCkXlHpV5f2OtmSKx5zDvSWO6iI/NKwiaKOpqsyzIsOfa C7Im3kvpmTN3Sv5MUt1dlOFCUOz/Pp0hm3HA3QLiXW5FX8hx0u2ePwFftRVobarCWj24 uwqQABp+Wbq0/aeqDS9Wjfwa5x1mbgnkpwGyAvqTKaQQw4Lw/CsVgWvzaiHKGaxxOyOy /TZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=tmQ+zuW2; 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 o77si650187ybg.332.2020.06.17.14.29.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Jun 2020 14:29:15 -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=tmQ+zuW2; 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]:46292 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jlfcR-0004Ne-CO for patch@linaro.org; Wed, 17 Jun 2020 17:29:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37866) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jlfEY-0004EO-D3 for qemu-devel@nongnu.org; Wed, 17 Jun 2020 17:04:34 -0400 Received: from mail-qt1-x842.google.com ([2607:f8b0:4864:20::842]:41177) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jlfEW-0000MG-QV for qemu-devel@nongnu.org; Wed, 17 Jun 2020 17:04:34 -0400 Received: by mail-qt1-x842.google.com with SMTP id w90so2750781qtd.8 for ; Wed, 17 Jun 2020 14:04:32 -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=ljUyAp0qqYElrS8vzQ49pxqGCe+fOWSwI5BjIxDRmqQ=; b=tmQ+zuW2eIVChtJ/OEnskHJxF3k9ShXoaMhKG9DVleoTY8AIwCy/Vn0caSyLKfWerP mRH0n0/uYybOYJVOvCwQTIKX8l39KMEr15B7loh/wkwXaiArqt152Tjxh3utng+J8zdt CGMfyvNZFGCSmsS7QsAZi+zxOcIFLqKKhPQhpAqz8yzzvjyaFmLurXfCQmgElH+vhZeb p8tmWYJNU4n8yrMx/zy/d/z3Nz8FQefdOrkRxsG/SWJBZKn/cJ2u80RGdrstMzojix7n gwyl2Q9RVpErRixBXV2eEl+n6nUqBn7CpgaMMbPTXEpVX2zpSAycKgja3R3YPKPF505r clIw== 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=ljUyAp0qqYElrS8vzQ49pxqGCe+fOWSwI5BjIxDRmqQ=; b=TbokHBMiS51AC2ZQmvavrtPbljkM3T2kU6ZkXDNCP8S4G8WtTpVWr5VMDGdReVIJGi LZZ29U+fT5l7Pul2SGiW8Ge12zlVxgdTp5+08HsANfmM5DdjKOQptiBHo7cuy68Mwov3 x+vbMXWRwa/Fbwn+gHbgJ6/7jm2iJCPZoVOU7kZ9mEoSG3U/dNkiSMDa+lLvwo/PEt5/ GDk5lk7EewCORtdfI0RoOAmhPEpvCPt/p9oZ5VVg0uX9StgdhUyYy4+7feOGqxU1obni +n6WhD1kDUS6HHQT3ULv98+3xVufG8l4t6D7FyUc8OG6lHGWv3A5WwyR1hGKDR1fFyv9 KXhQ== X-Gm-Message-State: AOAM533Q1u+hRuARgX1JuPyzVFZ+f9qMq4+GU/KYvmPbvDTdB53r/4Qc gLUvaAetTmABtMMIwOX2rtqr4PQTTR5LJA== X-Received: by 2002:ac8:6bc1:: with SMTP id b1mr1116070qtt.65.1592427871693; Wed, 17 Jun 2020 14:04:31 -0700 (PDT) Received: from Rfoley-MA01.hsd1.ma.comcast.net ([2601:199:4480:60c0:fc79:714c:9711:2e9c]) by smtp.gmail.com with ESMTPSA id w13sm997245qkb.91.2020.06.17.14.04.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jun 2020 14:04:31 -0700 (PDT) From: Robert Foley To: qemu-devel@nongnu.org Subject: [PATCH v10 52/73] s390x: convert to cpu_interrupt_request Date: Wed, 17 Jun 2020 17:02:10 -0400 Message-Id: <20200617210231.4393-53-robert.foley@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200617210231.4393-1-robert.foley@linaro.org> References: <20200617210231.4393-1-robert.foley@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::842; envelope-from=robert.foley@linaro.org; helo=mail-qt1-x842.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_HELO_NONE=0.001, SPF_PASS=-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: Thomas Huth , robert.foley@linaro.org, David Hildenbrand , Cornelia Huck , Halil Pasic , Christian Borntraeger , qemu-s390x@nongnu.org, cota@braap.org, peter.puhov@linaro.org, alex.bennee@linaro.org, Richard Henderson 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 46ec8272c0..964cb41b4c 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 d7a98bd52b..d157dbb7a9 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; }