From nobody Sat Apr 20 14:54:41 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1585084028; cv=none; d=zohomail.com; s=zohoarc; b=m2tL8r1QAwE2ehaSfshoBWQFBBmiHg3uCvMiqBPK/6P6ofUucvay4Fg5K57MCQ5K30QnOG2hdfFhrxPHzmn8F734omJXzqjP76o+t3ECfzmFZGSDg39N5K38lVI9l4YziTYtajAnILzCRjRQvGqjz6LLziLdPMNuDTXVDSgprYs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585084028; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/PaVl/qSnU5x1y8yrybb65l7FtK22198lD0bNYcd+zE=; b=R6dWSBp4zmJAX7MAFx3ehS6FRqmCp9lF28932u5baZHdNp8uX6o4nh4Hj7VWWHHpRpCUxHDSUSYQUlxc1SfhWi8RiU1z4QdIz4Y5GyQT+mNYXJPLE3nzwN3DO8PL/952yn0xZScXvYMWDKhHfQ5poiMe8q8y3WpLjxgAnWrzlLc= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1585084028494888.7054831467842; Tue, 24 Mar 2020 14:07:08 -0700 (PDT) Received: from localhost ([::1]:55008 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGqlO-0000KO-TD for importer@patchew.org; Tue, 24 Mar 2020 17:07:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33961) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGqjw-00073v-QS for qemu-devel@nongnu.org; Tue, 24 Mar 2020 17:05:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jGqjv-0005Pl-SM for qemu-devel@nongnu.org; Tue, 24 Mar 2020 17:05:36 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:48366 helo=mail.default.ilande.uk0.bigv.io) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jGqjv-0005P8-Mz; Tue, 24 Mar 2020 17:05:35 -0400 Received: from host86-130-37-163.range86-130.btcentralplus.com ([86.130.37.163] helo=kentang.home) by mail.default.ilande.uk0.bigv.io with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1jGqkL-0001H4-02; Tue, 24 Mar 2020 21:06:04 +0000 From: Mark Cave-Ayland To: peter.maydell@linaro.org, jsnow@redhat.com, balaton@eik.bme.hu, qemu-devel@nongnu.org, qemu-ppc@nongnu.org, qemu-block@nongnu.org Date: Tue, 24 Mar 2020 21:05:17 +0000 Message-Id: <20200324210519.2974-2-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200324210519.2974-1-mark.cave-ayland@ilande.co.uk> References: <20200324210519.2974-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 86.130.37.163 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH for-5.0 1/3] via-ide: don't use PCI level for legacy IRQs X-SA-Exim-Version: 4.2.1 (built Tue, 02 Aug 2016 21:08:31 +0000) X-SA-Exim-Scanned: Yes (on mail.default.ilande.uk0.bigv.io) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:41c9:1:41f::167 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The PCI level calculation was accidentally left in when rebasing from a previous patchset. Since both IRQs are driven separately, the value being passed into the IRQ handler should be used directly. Signed-off-by: Mark Cave-Ayland --- hw/ide/via.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/ide/via.c b/hw/ide/via.c index 8de4945cc1..2a55b7fbc6 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c @@ -112,7 +112,6 @@ static void via_ide_set_irq(void *opaque, int n, int le= vel) d->config[0x70 + n * 8] &=3D ~0x80; } =20 - level =3D (d->config[0x70] & 0x80) || (d->config[0x78] & 0x80); qemu_set_irq(isa_get_irq(NULL, 14 + n), level); } =20 --=20 2.20.1