From nobody Mon Apr 29 00:00:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) client-ip=209.85.221.42; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f42.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1616541247; cv=none; d=zohomail.com; s=zohoarc; b=muV26KKlUe1n8gDSx9nT4zJ5JFMNlxJTHpIkWZTdoWjQRGA5tCURrkCDyO5WBeF/qA//AJnzPUEWaWSpdPoVyp88d5HjFJOAREplds9WQfi7tuM4lH+GtP6Pj3dB+3OC/Qwv3s4x1XidJsEN/UgSCh3KShVrVpOXt8VQZSSAXIk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616541247; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=sXZ5+rlla4hihnGaVsI2lt7KqMDnWJjmcdH6IhiIyEo=; b=aAEsfyIN0JnnjBEMj+Z0jn1ChYGaE4Fbt66ZdD7ZfObzT7ck+4iNlbWFnpIZ44bEiM6hdyxn9S+I7MB9ZTL5NL6yRgo241RKIkhTIxInox/GNicW4n5CBrGaPk3Wx7sLZdO9vbamYulGkVojGcG30AMbQt129AqKKny5nuc8u8A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mx.zohomail.com with SMTPS id 1616541247955392.29552534229333; Tue, 23 Mar 2021 16:14:07 -0700 (PDT) Received: by mail-wr1-f42.google.com with SMTP id c8so9625545wrq.11 for ; Tue, 23 Mar 2021 16:14:07 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id a14sm483763wrg.84.2021.03.23.16.14.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 16:14:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sXZ5+rlla4hihnGaVsI2lt7KqMDnWJjmcdH6IhiIyEo=; b=ZLqCD0Gpxqtp0SDy3lky78VnlZRZ8YDrP4BiCiv3r20dEfP7Ng4LkwDNgvZwwBznjm K7svhznNryC+x42fkDbKjSlAPvzrTg/A+kLAOZ5pzqbT09NSxWLAFJVKiaTeYaeX73es Wgym1HrNSNPyVZYGSf4CMnLE/5H7k4PXQPYml2P3ENSS9xzvqQ1vZY+xrWN6fxOpXVaz rmGx6dpntHeJ9CEFGF3rZo9s+sdUoMKGVX9VEWO4R1qVnzCLllyWmXYrsA0Bt5K9h5FY 0GfRA7HSNTxpdwb9AefH3iEJwBa523eT1HMqvXZppwYCVWyKneBQTiIQ66eYzZm5abY8 X1Kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=sXZ5+rlla4hihnGaVsI2lt7KqMDnWJjmcdH6IhiIyEo=; b=KgU0TIN+J3AKs2/yXOl6sjtyQLsj1XzClwcEKmoaF0PAOF4vCXp9wnC8+OANEDHbjp 9Z5jNcnGqjqZQeAe81VEx8QRxA0N9+R1s69GVwZbYPMwYwXnRyancnjKt6p4cqPgfaWQ q52gmyyt4kzrccxgulCoIJvMOX+KDXuPqDf2OnJFah/FQqt4W1rnp7gXXnjSJrsV1vxi PAngDEJE28gUImWY30LiyKhNCB8fPnlgm60RpHPwVOSaNInrDyBGKd0KYE6oQ12F5GiC uHFs2dao7wgQh4CU6y0QqDfT7QGwLgKlnb2rEcl3yx56qbEKuBTzUyKuteWfaHUiGbSc dtQA== X-Gm-Message-State: AOAM531Ft16zlh4J69osj0AGSRGCfXjOLTL/T/aV23F8I/+E7+YfVyva eQf+sJR/qwFP1gwU3uscqBiTyc5xku40zg== X-Google-Smtp-Source: ABdhPJyf0b4MMlPIcfzx5/iQiQ+K4z2Gtyt1DVmPXwsjsi6wZPocYQF0E5gHpeG4NUJAlob8AIOPMw== X-Received: by 2002:adf:90f0:: with SMTP id i103mr296408wri.318.1616541246281; Tue, 23 Mar 2021 16:14:06 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Greg Kurz , Aleksandar Rikalo , Aurelien Jarno , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson , BALATON Zoltan , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , qemu-ppc@nongnu.org, Peter Maydell , Jiaxun Yang , Huacai Chen Subject: [PATCH 1/6] hw/isa/i82378: Name output IRQ as 'intr' Date: Wed, 24 Mar 2021 00:13:53 +0100 Message-Id: <20210323231358.396520-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210323231358.396520-1-f4bug@amsat.org> References: <20210323231358.396520-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Named IRQs are easier to understand in the monitor. Name the single output interrupt as 'intr'. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/isa/i82378.c | 2 +- hw/ppc/prep.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/isa/i82378.c b/hw/isa/i82378.c index 2a2ff05b937..fd296c8ed7a 100644 --- a/hw/isa/i82378.c +++ b/hw/isa/i82378.c @@ -113,7 +113,7 @@ static void i82378_init(Object *obj) DeviceState *dev =3D DEVICE(obj); I82378State *s =3D I82378(obj); =20 - qdev_init_gpio_out(dev, s->out, 1); + qdev_init_gpio_out_named(dev, s->out, "intr", 1); qdev_init_gpio_in(dev, i82378_request_pic_irq, 16); } =20 diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index f1b1efdcef9..50d9b6f0d54 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -284,8 +284,8 @@ static void ibm_40p_init(MachineState *machine) =20 /* PCI -> ISA bridge */ i82378_dev =3D DEVICE(pci_create_simple(pci_bus, PCI_DEVFN(11, 0), "i8= 2378")); - qdev_connect_gpio_out(i82378_dev, 0, - cpu->env.irq_inputs[PPC6xx_INPUT_INT]); + qdev_connect_gpio_out_named(i82378_dev, "intr", 0, + cpu->env.irq_inputs[PPC6xx_INPUT_INT]); sysbus_connect_irq(pcihost, 0, qdev_get_gpio_in(i82378_dev, 15)); isa_bus =3D ISA_BUS(qdev_get_child_bus(i82378_dev, "isa.0")); =20 --=20 2.26.2 From nobody Mon Apr 29 00:00:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) client-ip=209.85.221.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1616541253; cv=none; d=zohomail.com; s=zohoarc; b=iXwOPkvS4TNgbLWsiS/HkBw2eLJSWRhfOFVjjcNl4xbr854o+w3YOa9crx5n8mN/GgmV8ypOuaqWbcrKlql09vsgwKVjOWKGsV66WScM3UjbSHiPBbv6v6YC56I+CcvWNwmYiupX9gPCyQMkrnh8JNZgwSGwOrl9cTIwxGVP61c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616541253; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=aApVmQ+rRe6KJFTwqONCwpRpXk9mf0Cx9NTVPhXwmZQ=; b=W9+klWIdvO1dFGpoAsd8JOugWHzD1Lipxr3cUbfegZ5x2awy3PyBQFjIbu80yc0mWt/q6drKp1d9s47S//3X7bT82QvleHWQY5E7pGifcsaXXG6Wi0oMYBMDC11qsYj/3pZ9Tpu09R7nQ7fqrUcLeyVL5BHET0oGm+euRUqapqc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.zohomail.com with SMTPS id 1616541253065933.0053532124242; Tue, 23 Mar 2021 16:14:13 -0700 (PDT) Received: by mail-wr1-f49.google.com with SMTP id z2so22552319wrl.5 for ; Tue, 23 Mar 2021 16:14:12 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id p16sm552213wrt.54.2021.03.23.16.14.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 16:14:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aApVmQ+rRe6KJFTwqONCwpRpXk9mf0Cx9NTVPhXwmZQ=; b=FAOWK156c8X6bAYCfmLOj9zb/yhj9/dNGzugnEzS9aSURMiB65gfvAJt8feRglTehQ 40YLp8cxknnsw+lR3EN5KmJ2KCGjkEr7hifPMKE3ehcYeUdqxeiSX7KblEYCO3vhrUCJ ayEfyR9+wOZT4d02dT66j1bnZ9hnFT0CBtbBt3ROKq2y+Y7UDVG9E93bDGX2up7mW7Qm a5FAb/aaTqQ7AMzZ350Qpw6G4VJua9k+WUiqk19HQyHcLcVJDziu2NgqJXmEBTD3JVog bUW2sn0BSqsPtmRtdrDHVfbS1cLC90f6BD11vNPcvm9cm4Crh5ScqMG+V17DpybuuGx2 WPbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=aApVmQ+rRe6KJFTwqONCwpRpXk9mf0Cx9NTVPhXwmZQ=; b=ma/bjIv94FTai03KNfgdxSuzuGgh/FbAIRUEjksu1sL+KwfTKNnZ4tix7MzFnrZM5A MNQ7/az5x57DOLcoXAw9x0qZRtaoAC/2BgzSPwmPB43AgPm8EFkvw4aCry4T0923Dlev Z7oAqIyAQ24Yjcv8/+niCqSNVzqvny5LD2qHlRdwsmSRxcicoonZhz0j59gHOpWLlOGz AUpFtdvh2V05LEvtJ6kNFwGrQizMmDXD7ctgEHbOAgyHIFkgVaD3LU6FHOCZgohvUAyV FBOp8CfLXjlnuzmVZnEXnZSQBtm5Z2wP7Rv5KkpjF5nyrHRVAzTopaaElCK1YxnCWGnc Lj2w== X-Gm-Message-State: AOAM530iyP0k5qYuuusFCJW8wzAyM1Vtm6pJdKk9rEQIM7e6Dvp8bHZL +v3PPxuekfW3m9VHj7trj+4= X-Google-Smtp-Source: ABdhPJyJiWAMOdRW2Y5ORF4pp/hKImvbpD2a4wP/acuHpPB+HlyQLtJFfAOrrouW+n4l2io1+j6rIQ== X-Received: by 2002:a5d:518c:: with SMTP id k12mr296965wrv.15.1616541251196; Tue, 23 Mar 2021 16:14:11 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Greg Kurz , Aleksandar Rikalo , Aurelien Jarno , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson , BALATON Zoltan , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , qemu-ppc@nongnu.org, Peter Maydell , Jiaxun Yang , Huacai Chen Subject: [PATCH 2/6] hw/isa/i82378: Simplify removing unuseful qemu_allocate_irqs() call Date: Wed, 24 Mar 2021 00:13:54 +0100 Message-Id: <20210323231358.396520-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210323231358.396520-1-f4bug@amsat.org> References: <20210323231358.396520-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) When the i82378 model was added in commit a04ff940974 ("prep: Add i82378 PCI-to-ISA bridge emulation") the i8259 model was not yet QOM'ified. This happened later in commit 747c70af78f ("i8259: Convert to qdev"). Instead of creating an input IRQ with qemu_allocate_irqs() to pass it as output IRQ of the PIC, with its handler simply dispatching into the "intr" output IRQ, we can now simplify and directly connect the PIC to the "intr" named output. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/isa/i82378.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/hw/isa/i82378.c b/hw/isa/i82378.c index fd296c8ed7a..817eca47053 100644 --- a/hw/isa/i82378.c +++ b/hw/isa/i82378.c @@ -47,12 +47,6 @@ static const VMStateDescription vmstate_i82378 =3D { }, }; =20 -static void i82378_request_out0_irq(void *opaque, int irq, int level) -{ - I82378State *s =3D opaque; - qemu_set_irq(s->out[0], level); -} - static void i82378_request_pic_irq(void *opaque, int irq, int level) { DeviceState *dev =3D opaque; @@ -94,8 +88,7 @@ static void i82378_realize(PCIDevice *pci, Error **errp) */ =20 /* 2 82C59 (irq) */ - s->i8259 =3D i8259_init(isabus, - qemu_allocate_irq(i82378_request_out0_irq, s, 0)= ); + s->i8259 =3D i8259_init(isabus, s->out[0]); isa_bus_irqs(isabus, s->i8259); =20 /* 1 82C54 (pit) */ --=20 2.26.2 From nobody Mon Apr 29 00:00:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) client-ip=209.85.221.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1616541258; cv=none; d=zohomail.com; s=zohoarc; b=BFi/8XaGiHbkgNqbuYa8bbIz4ZBPL42TlfSj54MqlHpv3ln012iRCCf/wAvueYk7L8VDf4d+uNBO124tQ4kStiKDNtf9V6PHcNulGJu9c3j3NjNJ4SBB+rhfgfrVsUsiskT++kg45pss+fWgK0SHExIx+HsHxX5KXEY/PxTceJs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616541258; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=zpy4dUbdjK4RAyS69EYRJKkucXZnOQjnZyyP4OwZ9k8=; b=kOKZmvcuMLMOV0gEukSm/olyYtUXeNDGX5LlSM1MxqouWMhyYBKyxIaN53IsYORwp/ZEZQP+hRFy5xf1HQe0KwGGl8KWclc/NUvEWL7KUQVVV/NZYx33SzEPBkp1OgdvbuB0IQ6thXXFkMaW2EM1ecVF+j/YSx1p1GupzDbM+mA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mx.zohomail.com with SMTPS id 161654125813541.213446925693574; Tue, 23 Mar 2021 16:14:18 -0700 (PDT) Received: by mail-wr1-f44.google.com with SMTP id 61so22505037wrm.12 for ; Tue, 23 Mar 2021 16:14:17 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id k24sm249236wmr.48.2021.03.23.16.14.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 16:14:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zpy4dUbdjK4RAyS69EYRJKkucXZnOQjnZyyP4OwZ9k8=; b=YRT7/3sKzfE+E5C1WM3TnMzWtfm0HE7ADQRP0jn3g8bupAmDeHZUWqpQlXFiyMfGJM lPPs/TksjYxKJhD58YpCE3H0+U9i2pwfyGmP2Pr9akZ9z8F/cSNa5JnvUQnFPEEAfGFZ OOlsOQB6jCrvZ+kvtWHgWdCxrNWeBxcSY4siY2JeGHT3zwL2/ZM9zvQyD3S+FlCdukvW D6tNaWrKfiRQ2GRskULdjkJnoB27d8vIZIhoSYvgwqACVY0lwn/NgWe3WCcRnAjObOYg EmR6TXCLO4xEdP7elx3Wym78DCokID1LDmiA0EFX/gsdkz18B0cBEyPFtdQHlfrLAuQM i9ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=zpy4dUbdjK4RAyS69EYRJKkucXZnOQjnZyyP4OwZ9k8=; b=tVlj27fphDvwNpHhsCVVhGWVRzjDl7+529RLdTVSSrV4C7ILvCvo1CQ60bMvD0MeRQ Uy+gonVS5dR4/aUMl69avJOS7XcrU5yLmfrjNt+xlicl12AiMZvqBineAiTd+nhcUi9H GsQPW/ETxOdsLnKoxry6cWzLHspVV89lHbTdf/epRSiVeCQMBNUksuqsx9ZR96scuyQg b+kzFQBLh4sM0oOqc2XMkCcwX7FJ65Sh826QQYS1lSVpObP2pzkYYOcUXYHdZkWWQ+jD G0JWzrBP79jBf5EqcNxmxVDHAhAEmLZWxvhjqZvFkq0kk4yuRHWU4Czx1V0miPSo07PV gSIg== X-Gm-Message-State: AOAM532HPhJvrYMV2K25T9ao9KpaRFiMEL6QVI8oJIdXmoxF/U71mhML uAf0JDPnASusWMN38EsmV+k= X-Google-Smtp-Source: ABdhPJyAWu5MZiiNL72Tfmi8Cs/ooJxO00UkuofDvXZzFcz0kmASd3Ss1hmswn8TVcEnpMSy8HGl1g== X-Received: by 2002:a5d:64af:: with SMTP id m15mr276055wrp.231.1616541256265; Tue, 23 Mar 2021 16:14:16 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Greg Kurz , Aleksandar Rikalo , Aurelien Jarno , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson , BALATON Zoltan , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , qemu-ppc@nongnu.org, Peter Maydell , Jiaxun Yang , Huacai Chen Subject: [PATCH 3/6] hw/isa/i82378: Rename output IRQ variable Date: Wed, 24 Mar 2021 00:13:55 +0100 Message-Id: <20210323231358.396520-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210323231358.396520-1-f4bug@amsat.org> References: <20210323231358.396520-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) The i82378 has 2 output IRQs: "INT" and "NMI". We do not model the NMI, so simplify I82378State by removing the unused IRQ. To avoid keeping an array of one element, remove the array and rename the variable. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/isa/i82378.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/isa/i82378.c b/hw/isa/i82378.c index 817eca47053..164d6c65f64 100644 --- a/hw/isa/i82378.c +++ b/hw/isa/i82378.c @@ -32,7 +32,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(I82378State, I82378) struct I82378State { PCIDevice parent_obj; =20 - qemu_irq out[2]; + qemu_irq intr; qemu_irq *i8259; MemoryRegion io; }; @@ -88,7 +88,7 @@ static void i82378_realize(PCIDevice *pci, Error **errp) */ =20 /* 2 82C59 (irq) */ - s->i8259 =3D i8259_init(isabus, s->out[0]); + s->i8259 =3D i8259_init(isabus, s->intr); isa_bus_irqs(isabus, s->i8259); =20 /* 1 82C54 (pit) */ @@ -106,7 +106,7 @@ static void i82378_init(Object *obj) DeviceState *dev =3D DEVICE(obj); I82378State *s =3D I82378(obj); =20 - qdev_init_gpio_out_named(dev, s->out, "intr", 1); + qdev_init_gpio_out_named(dev, &s->intr, "intr", 1); qdev_init_gpio_in(dev, i82378_request_pic_irq, 16); } =20 --=20 2.26.2 From nobody Mon Apr 29 00:00:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) client-ip=209.85.221.41; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f41.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1616541262; cv=none; d=zohomail.com; s=zohoarc; b=PwdV5OXrpV8vX6PKJJq9VfbzwAWwqjZSDOu5K5zOFUwaa2dv/3hnv4DNZg1/nT6sh1P70DMhIJNGh22Uwq+gEymw29rZT0CAcXDgeo/cWqpLObRLSr47mKSmFcBjqtMCQgTrCGl60RojZ6h68b5R5FV9lWOzICGS1QzIC3NjcOs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616541262; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3a+HGyI7KD3Ew+RNtm2N2A+m/+QQ+Xa+aHzvmMpU2j8=; b=iZFbQvc7j3dkkt+W2lxQPw4fvby+8NdL1aEZtjTXjHEd20NvaAk8mV/YMbkQ4dBEf4WuFD5M+6g1bduuqx3RxUqocb5WzFKUrHW65sPMf4fq5vlEyWzkO3YdaOqtz9Ql9+eYlBJ77wubERSD99dh8EgOXCFraJe7sBnbrCcNk6w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mx.zohomail.com with SMTPS id 1616541262904195.57198001568202; Tue, 23 Mar 2021 16:14:22 -0700 (PDT) Received: by mail-wr1-f41.google.com with SMTP id k8so22523250wrc.3 for ; Tue, 23 Mar 2021 16:14:22 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id z2sm475865wrv.47.2021.03.23.16.14.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 16:14:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3a+HGyI7KD3Ew+RNtm2N2A+m/+QQ+Xa+aHzvmMpU2j8=; b=SkxObxIQxeD5qsuG0LUtPT+ZQe0sGbsBkDCFCA9p4SIgVXXKVlQjT7vyk1qJLrrEMH 6yU7Ryk2IoWxI/YeHCWsoK7sJScHbF9V1tz6uoZwqskpkEUcDSRWZ98ZCZwcjxGrKIY3 TIALF3N3HQdJOlhXDEPkUw2W7h1AU4UwMngW0w56ZTswL+kI8bs2Z71zjZQ6CqQ1iiCv YLWNHNhxKOtysGMIErFkPcOj4D1lMPOzBWJ3RxDA2HrsXhT/EgEzfMDQpgM0jXU2Uhfn 7B8AwHkPrZk25ptlkdpL5xEtpmf+WJbGodUGqNHvHHDLYJO1tMbICXd7hpr79LXmd+72 eSIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=3a+HGyI7KD3Ew+RNtm2N2A+m/+QQ+Xa+aHzvmMpU2j8=; b=Wl5+XPHDAO2WN9jiQKdebKMsjvkgNZIM99sdrooAa4JktZwrCt0YAIDhRJzXL8hqRm TikxZMnMxycgmT7vJLCLp75IXE8C2Cj4bKuXGLe1mJ7To2UHGGmDOzPt0qSvwiGSYtqV bUT3gbfE2vb7+IYY/OLrO2cZa8XPgwM1/Ov1/VJLPGhfb9kctHHyPxEPRMnw5rSaB5UD Q1aL4+a9OlUrkVTm092UOfDsK4WMzwulApDiOju4x+7PLh4s2Z1JmsMBUit2o0xCFBWk ucwg/Yy7xp8/5MXFnNxRBlEX8+EdRhi3NsTwVOIrB1f1kslrZmC7WA486WMYaMGv+pRR 3acg== X-Gm-Message-State: AOAM532oxh4FWzLHSdb1gCQwBU+xzrC+HaO8Jhe3Ecv2ptzzJeC/Wnfm qu4p9ckyaxeFjZ7Fpi3x0/0= X-Google-Smtp-Source: ABdhPJyYKc0C5evaS3iWXj+2CWlFoUvA2EpnS08gh7bRTgeEc6Y8e2hChepYD/RuFDuwkf73YSVZRg== X-Received: by 2002:adf:fb42:: with SMTP id c2mr289901wrs.83.1616541261203; Tue, 23 Mar 2021 16:14:21 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Greg Kurz , Aleksandar Rikalo , Aurelien Jarno , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson , BALATON Zoltan , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , qemu-ppc@nongnu.org, Peter Maydell , Jiaxun Yang , Huacai Chen Subject: [PATCH 4/6] hw/isa/vt82c686: Name output IRQ as 'intr' Date: Wed, 24 Mar 2021 00:13:56 +0100 Message-Id: <20210323231358.396520-5-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210323231358.396520-1-f4bug@amsat.org> References: <20210323231358.396520-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Named IRQs are easier to understand in the monitor. Name the single output interrupt as 'intr'. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/isa/vt82c686.c | 2 +- hw/mips/fuloong2e.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index 05d084f6982..87473ec121f 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -387,7 +387,7 @@ static void vt82c686b_realize(PCIDevice *d, Error **err= p) qemu_irq *isa_irq; int i; =20 - qdev_init_gpio_out(dev, &s->cpu_intr, 1); + qdev_init_gpio_out_named(dev, &s->cpu_intr, "intr", 1); isa_irq =3D qemu_allocate_irqs(via_isa_request_i8259_irq, s, 1); isa_bus =3D isa_bus_new(dev, get_system_memory(), pci_address_space_io= (d), &error_fatal); diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c index 4f61f2c873b..931385c760f 100644 --- a/hw/mips/fuloong2e.c +++ b/hw/mips/fuloong2e.c @@ -206,7 +206,7 @@ static void vt82c686b_southbridge_init(PCIBus *pci_bus,= int slot, qemu_irq intc, =20 dev =3D pci_create_simple_multifunction(pci_bus, PCI_DEVFN(slot, 0), t= rue, TYPE_VT82C686B_ISA); - qdev_connect_gpio_out(DEVICE(dev), 0, intc); + qdev_connect_gpio_out_named(DEVICE(dev), "intr", 0, intc); =20 dev =3D pci_create_simple(pci_bus, PCI_DEVFN(slot, 1), "via-ide"); pci_ide_create_devs(dev); --=20 2.26.2 From nobody Mon Apr 29 00:00:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) client-ip=209.85.128.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1616541269; cv=none; d=zohomail.com; s=zohoarc; b=VVy06sqt5wUM/biQCOohbUDe8PODL8RhSZ3DwnLH6k5HyWm56DS/mI56xpHclrj7xcfdzEPH2kNgREwD1QfJqo5nVDSBYQDoplc/0jToPHRV4YNYvbeKQpwwj0uRTGFt1EXwb3teYDHWtP+ouhaf+nthwgQlviXU8P5n3Qm1fgA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616541269; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=H3nW2fhq4tUhZ3Vvu7VChClLWULSqHl3aIZiVAgZl48=; b=h+ICfFdauNeDYvwphzCtRyqRH6cMvrQqzz5Q3Z7lzEA+cvGqig/tXhILQoVQpDCDf3Y8AvDiXPNuUUusleCrONbiRXtQ4tQ2/cRpulVuKX3exBn83Ybtl8h7/4h0wrRio8ucSs46qI5OKksaEtkwZVvw0BsYcxiNGFZoqn3m3Z8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mx.zohomail.com with SMTPS id 1616541269209850.8966439723382; Tue, 23 Mar 2021 16:14:29 -0700 (PDT) Received: by mail-wm1-f51.google.com with SMTP id y124-20020a1c32820000b029010c93864955so171679wmy.5 for ; Tue, 23 Mar 2021 16:14:27 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id y18sm446698wrq.61.2021.03.23.16.14.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 16:14:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=H3nW2fhq4tUhZ3Vvu7VChClLWULSqHl3aIZiVAgZl48=; b=HhD/7PiD3VuVTRqb0OsjHRj3STq4HcxELVrplIFwXwvIZrNTwwuMBw5UMRurz+OOZs Rj1K90t538c7lNQ/k/PD4yNCR27slQN9jRHgI8aO4T7fI8I5gVqh9edm/VzpqBw08o94 P2nCQs6st32UTNcJxphDl/IpMtWtEnTNqwzqLFF8bpQQT9fcUq2HypTfQjhS55rLy0UZ 6zzI8p/xm61PhvHH+eaARc74Pmh2eebwB22vFaeEifr4lP67mcNuawr41y4EMHhSXLvF eeKao1DjJnZqOnP0OlNVaRBD+mgYwyJlaudELv29V7/ivXX+4RiLNKeWX6d15y3/UZ6B R2oQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=H3nW2fhq4tUhZ3Vvu7VChClLWULSqHl3aIZiVAgZl48=; b=TpaK0BdUJxUV6RpZynYVSYEkZWGJ4qDEymL5bXAWClQD9fbZGywYGVlA/I3Nh7NIJb MMEPAJQxBkQdAjtjUHMLUf9ynHXhWQNdkjHyPiaxhZiWdj61KJO6U7gpgiRlbEqUbV0Y BMMgznTilRpBk7GLhoyHaTT9f4xuRAq6ZbDNjibye9dvefzU18179K7g601Jt8eT23iW t9Iqbl8GlgsXM8zYfTDPKZiZ5aZbr+r+atdzX8YvTeV3ptJwi781wWIFvlZ7qbE7Vkt+ wbQYAud/EMH/VPqBj+ZgGqKpKKHuMxndE3PfTPYEWRpJoEwDD/Vj9kBwtC463QCYNFu6 X23w== X-Gm-Message-State: AOAM531UyWLobvrerB6WS29rDesDrto03xexm1+SfyP6gurYg2CmMVN1 GDj2SH8wTPKtltKEOBhLbVk= X-Google-Smtp-Source: ABdhPJxsyfIQePvUJVTHBefqmzdLhI900lK1TZ6dnYJvuwKqwy+c91hPulZlKQMwn+4r3v7bn8ultA== X-Received: by 2002:a05:600c:3556:: with SMTP id i22mr268581wmq.116.1616541266275; Tue, 23 Mar 2021 16:14:26 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Greg Kurz , Aleksandar Rikalo , Aurelien Jarno , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson , BALATON Zoltan , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , qemu-ppc@nongnu.org, Peter Maydell , Jiaxun Yang , Huacai Chen Subject: [PATCH 5/6] hw/isa/vt82c686: Simplify removing unuseful qemu_allocate_irqs() call Date: Wed, 24 Mar 2021 00:13:57 +0100 Message-Id: <20210323231358.396520-6-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210323231358.396520-1-f4bug@amsat.org> References: <20210323231358.396520-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Instead of creating an input IRQ with qemu_allocate_irqs() to pass it as output IRQ of the PIC, with its handler simply dispatching into the "intr" output IRQ, simplify by directly connecting the PIC to the "intr" named output. Fixes: 3dc31cb8490 ("vt82c686: Move creation of ISA devices to the ISA brid= ge") Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/isa/vt82c686.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index 87473ec121f..3dc3454858e 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -323,12 +323,6 @@ struct VT82C686BISAState { SuperIOConfig superio_cfg; }; =20 -static void via_isa_request_i8259_irq(void *opaque, int irq, int level) -{ - VT82C686BISAState *s =3D opaque; - qemu_set_irq(s->cpu_intr, level); -} - static void vt82c686b_write_config(PCIDevice *d, uint32_t addr, uint32_t val, int len) { @@ -384,14 +378,12 @@ static void vt82c686b_realize(PCIDevice *d, Error **e= rrp) VT82C686BISAState *s =3D VT82C686B_ISA(d); DeviceState *dev =3D DEVICE(d); ISABus *isa_bus; - qemu_irq *isa_irq; int i; =20 qdev_init_gpio_out_named(dev, &s->cpu_intr, "intr", 1); - isa_irq =3D qemu_allocate_irqs(via_isa_request_i8259_irq, s, 1); isa_bus =3D isa_bus_new(dev, get_system_memory(), pci_address_space_io= (d), &error_fatal); - isa_bus_irqs(isa_bus, i8259_init(isa_bus, *isa_irq)); + isa_bus_irqs(isa_bus, i8259_init(isa_bus, s->cpu_intr)); i8254_pit_init(isa_bus, 0x40, 0, NULL); i8257_dma_init(isa_bus, 0); isa_create_simple(isa_bus, TYPE_VT82C686B_SUPERIO); --=20 2.26.2 From nobody Mon Apr 29 00:00:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) client-ip=209.85.221.48; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f48.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1616541273; cv=none; d=zohomail.com; s=zohoarc; b=O9c6EHI6FZ6xAEWhYVdyvmjP6OXPzcv6Id2tp6eccToDni1HbAavv8GF2jzzc5O8LwKoH4GiJy+aB80bL0U/eWZu6LlgsHCx1FsRJ3O0D/8leDT+Ci2jF+sXBr7xbyC2ayQeOBocFtO6E4IhOTr9AICDEeNTx1tW948FbkANZm0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616541273; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HLr1p17rSNE6s/epK0X3L7qBu4x4bjdM2MOJwM+w5LU=; b=apyCzj21VGidsfknPUdQlNUky3n/RIimDPmwrMyiHqKsMvMcQYxjNcMOGThs/HGnLwwIxpoqH8HxL3rO2U9RfV9Ujyf9ZRwarliT89HSrNXdrhGE7H8LAfXgfPyXavbE8fcFWQNwh3RZbklItmD44TF4j1BnhgBcO9mK+7nyLAk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mx.zohomail.com with SMTPS id 1616541273028735.1780797901597; Tue, 23 Mar 2021 16:14:33 -0700 (PDT) Received: by mail-wr1-f48.google.com with SMTP id x7so65292wrw.10 for ; Tue, 23 Mar 2021 16:14:32 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id x11sm303097wmi.3.2021.03.23.16.14.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 16:14:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HLr1p17rSNE6s/epK0X3L7qBu4x4bjdM2MOJwM+w5LU=; b=ClfA1bgLWGfGbOPVfZVtjNcX7qREsxwLSZEwTOEDmPd/CKjLgkjiL5VFSdO7JsdRBw /9EnUkW14+OnfDMVGXNdv1LhcZBy5s1B8EBLCj8+rJjbcdHPb1roSOX5jXtSv9ZtSr/1 BKgMcDCx/KVHiaYnYGS4hY3pOraub2z9FZpHFt+osge42Lwi+ye1SYH9clWrwzYUHLo/ m8fv3DFhT6s+kp5s2IKRecEo4bKj8s/Z1+3HloP4dVU5/oImG2VN6fNFy6ijG0ViNs5L 1iCZZOuNz/G9RwRd4QBTGbnFNGWKIhau1DgKQMONq+bBMb7Tvjz3V9500XP8SoXBgNiX /TVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=HLr1p17rSNE6s/epK0X3L7qBu4x4bjdM2MOJwM+w5LU=; b=jl2PS8mxiw5pa++leSAqYLTBdF26UyW4DQP1jRj2ktbMQHsY6aedwiNkoYWb68M5TS w3sAky0J9pBjUitueiHojzzfqXC2/7tyd7/w7j5KjLHZqvySfEiPfZz6HgjBUC51MR0N rmr7/Tvad7KR2c8veG/A0Dq/AV6g9bBQKZ9IsNreVMTJ/gVHwdy9Vwr2gTEBYaJgFYA6 bxtsdM6SNDXOIS0VdrJfABg4UX4cJVQszwln4ecQ/jvtW6vPB7QidVIS9m2YFSyXtjvk /VSt24gc/r4ds5as0P0aSRa718jYQqx993XpxZBrjblcwarHBlfEfvWUQLJqdcmVin1e W/TA== X-Gm-Message-State: AOAM530o7A36PFZaa7ThQogGPbSXKCmSzTuMxBpzFM4LkDt7k0mF1v5D i/jpXJYp4UKHon4ocVHUuwI= X-Google-Smtp-Source: ABdhPJxR152TZrY7emcMOv0lahUfLo2JKSOTlHYMicM7bXla/v2LNsFvLOmazU5uWULI7oekd3uPSg== X-Received: by 2002:a05:6000:11c1:: with SMTP id i1mr281494wrx.215.1616541271285; Tue, 23 Mar 2021 16:14:31 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Greg Kurz , Aleksandar Rikalo , Aurelien Jarno , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson , BALATON Zoltan , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , qemu-ppc@nongnu.org, Peter Maydell , Jiaxun Yang , Huacai Chen Subject: [PATCH 6/6] hw/isa/piix4: Fix leak removing unuseful qemu_allocate_irqs() call Date: Wed, 24 Mar 2021 00:13:58 +0100 Message-Id: <20210323231358.396520-7-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210323231358.396520-1-f4bug@amsat.org> References: <20210323231358.396520-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) We locally create an input IRQ with qemu_allocate_irqs() to pass it as output IRQ of the PIC, but its handler simply dispatch into another of our output IRQ ("intr" output). Simplify by directly connecting the PIC output to our "intr" output. This fixes when using QEMU built with --enable-sanitizers: =3D=3D338425=3D=3DERROR: LeakSanitizer: detected memory leaks Direct leak of 8 byte(s) in 1 object(s) allocated from: #0 0x5641b361e1df in malloc (qemu-system-mips+0x1b201df) #1 0x7f995e683958 in g_malloc (/lib64/libglib-2.0.so.0+0x58958) #2 0x5641b5558e36 in qemu_allocate_irqs hw/core/irq.c:66:12 #3 0x5641b4161817 in piix4_realize hw/isa/piix4.c:171:21 #4 0x5641b42f077a in pci_qdev_realize hw/pci/pci.c:2114:9 #5 0x5641b554c802 in device_set_realized hw/core/qdev.c:761:13 #6 0x5641b5578458 in property_set_bool qom/object.c:2257:5 #7 0x5641b55709e2 in object_property_set qom/object.c:1402:5 #8 0x5641b55861c9 in object_property_set_qobject qom/qom-qobject.c:28:10 #9 0x5641b5571831 in object_property_set_bool qom/object.c:1472:15 #10 0x5641b55410fd in qdev_realize hw/core/qdev.c:389:12 Fixes: 078778c5a55 ("piix4: Add an i8259 Interrupt Controller as specified = in datasheet") Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/isa/piix4.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c index a50d97834c7..79ed20e2a1a 100644 --- a/hw/isa/piix4.c +++ b/hw/isa/piix4.c @@ -103,12 +103,6 @@ static const VMStateDescription vmstate_piix4 =3D { } }; =20 -static void piix4_request_i8259_irq(void *opaque, int irq, int level) -{ - PIIX4State *s =3D opaque; - qemu_set_irq(s->cpu_intr, level); -} - static void piix4_set_i8259_irq(void *opaque, int irq, int level) { PIIX4State *s =3D opaque; @@ -149,7 +143,6 @@ static void piix4_realize(PCIDevice *dev, Error **errp) { PIIX4State *s =3D PIIX4_PCI_DEVICE(dev); ISABus *isa_bus; - qemu_irq *i8259_out_irq; =20 isa_bus =3D isa_bus_new(DEVICE(dev), pci_address_space(dev), pci_address_space_io(dev), errp); @@ -168,8 +161,7 @@ static void piix4_realize(PCIDevice *dev, Error **errp) PIIX_RCR_IOPORT, &s->rcr_mem, 1); =20 /* initialize i8259 pic */ - i8259_out_irq =3D qemu_allocate_irqs(piix4_request_i8259_irq, s, 1); - s->isa =3D i8259_init(isa_bus, *i8259_out_irq); + s->isa =3D i8259_init(isa_bus, s->cpu_intr); =20 /* initialize ISA irqs */ isa_bus_irqs(isa_bus, s->isa); --=20 2.26.2