From nobody Sat Apr 20 03:28:54 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=1585084149; cv=none; d=zohomail.com; s=zohoarc; b=FTHJYiorgEeJMf0U4CkgPM2IN8OXTB9QsgXWmpmiCGOXb0yDDrXRCAC7eJT48Tpf4sBKXwcVdBQZkgjkk65Wj4FpHikWpA/IoTBTDvmDlNldvmbPI7HUU9ht4jAZQzWA40p4dquo+rjgtgvZQ4W5nRkr/KnhCCKI6jVvUMH/jYU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585084149; 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=7xNldLJfy4ycA2oKpKHbiUOGFXbYMmu6Fe3TST2gKTE=; b=MzHoIcouIOzZQKwuumzDoJso9dvCOU3UxuBD4aFK3RbneK/ocpEHbqdgHHDvD2OCFHZUrTdNi1pnYTE5Et+G9wJLzQEVjKDnCqXq27dhZwsCg/dClX8nd/uB9y2GsOogGXSzhxyt6objQzrLPB3eEXB4VsOiDkMVHexIjqKFXu4= 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 1585084149376291.0263257833301; Tue, 24 Mar 2020 14:09:09 -0700 (PDT) Received: from localhost ([::1]:55052 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGqnM-00048U-3Q for importer@patchew.org; Tue, 24 Mar 2020 17:09:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34026) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGqk1-00078a-Nj for qemu-devel@nongnu.org; Tue, 24 Mar 2020 17:05:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jGqjz-0005S9-KZ for qemu-devel@nongnu.org; Tue, 24 Mar 2020 17:05:41 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:48378 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 1jGqjz-0005Rb-Ee; Tue, 24 Mar 2020 17:05:39 -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 1jGqkP-0001H4-1T; Tue, 24 Mar 2020 21:06:09 +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:18 +0000 Message-Id: <20200324210519.2974-3-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 2/3] via-ide: use qdev gpio rather than qemu_allocate_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" This prevents the memory from qemu_allocate_irqs() from being leaked which can in some cases be spotted by Coverity (CID 1421984). Signed-off-by: Mark Cave-Ayland --- hw/ide/via.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/ide/via.c b/hw/ide/via.c index 2a55b7fbc6..be09912b33 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c @@ -160,6 +160,7 @@ static void via_ide_reset(DeviceState *dev) static void via_ide_realize(PCIDevice *dev, Error **errp) { PCIIDEState *d =3D PCI_IDE(dev); + DeviceState *ds =3D DEVICE(dev); uint8_t *pci_conf =3D dev->config; int i; =20 @@ -187,9 +188,10 @@ static void via_ide_realize(PCIDevice *dev, Error **er= rp) bmdma_setup_bar(d); pci_register_bar(dev, 4, PCI_BASE_ADDRESS_SPACE_IO, &d->bmdma_bar); =20 + qdev_init_gpio_in(ds, via_ide_set_irq, 2); for (i =3D 0; i < 2; i++) { - ide_bus_new(&d->bus[i], sizeof(d->bus[i]), DEVICE(d), i, 2); - ide_init2(&d->bus[i], qemu_allocate_irq(via_ide_set_irq, d, i)); + ide_bus_new(&d->bus[i], sizeof(d->bus[i]), ds, i, 2); + ide_init2(&d->bus[i], qdev_get_gpio_in(ds, i)); =20 bmdma_init(&d->bus[i], &d->bmdma[i], d); d->bmdma[i].bus =3D &d->bus[i]; --=20 2.20.1