From patchwork Tue Feb 22 17:38:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernhard Beschow X-Patchwork-Id: 12755748 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 25500C433EF for ; Tue, 22 Feb 2022 17:44:20 +0000 (UTC) Received: from localhost ([::1]:60488 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nMZD1-0004Y9-5p for qemu-devel@archiver.kernel.org; Tue, 22 Feb 2022 12:44:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36300) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMZ7V-0003VE-Ko for qemu-devel@nongnu.org; Tue, 22 Feb 2022 12:38:37 -0500 Received: from [2a00:1450:4864:20::633] (port=44603 helo=mail-ej1-x633.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nMZ7T-0002m4-4r for qemu-devel@nongnu.org; Tue, 22 Feb 2022 12:38:37 -0500 Received: by mail-ej1-x633.google.com with SMTP id p14so45076816ejf.11 for ; Tue, 22 Feb 2022 09:38:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NSkH+rZ7LIEEh7cIevAxKcBEWeFcCPnBblGfAJiA4f4=; b=Ggob4pzkG1UvrEaNDh+ue5L9H5SeNzadxF0CPT1mJHasMrdi6S+2wEjmLHrDJ3diMF DucIJ9R73KPfN/pOJ8QOyh4uK2q44NhRIs34dlZRESGzGrI5SqODd25XIQKqo0lm6NVN MTotg9xBMSJVPYZOi9zwGlcVBQHaIA3aulEu2ndzMcAvAxi8bJj9eAS8buEg07BMh9fi oMZ+BWZEWNwsYsSpWapLbaHCMQ/2kAXj8fc9FNVkBN8ys2PXK1rdp0pSBddksB97ecTH 4Q00yybOdLffUZ0Mx7u+eKLzf2OPruhPTxlvAehxxvdWUBPIzt7mXxFEHRJvxRmCUrvh AGkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NSkH+rZ7LIEEh7cIevAxKcBEWeFcCPnBblGfAJiA4f4=; b=BpqoSQjwYT6YYr5NmqRpSs0tn3tIffXa/E/wUdal8K8r7toHFEDE7T+8PGxWPSJVY1 bMTl+PCr9STcjXjZs+R0wJUsh04KBVoqKJweHucrhTpPxMioG696kD+33agrVHOe1Ml4 DJmRgOdV1XwSEuiPO5jcLoY+DgEG7Bih4UogCQWiDa5JvxgvG0uMSTbKK5/A8HCLEDNj p5zVbc7Z26lIp5nM67LreVtpTheGw1te6AyIDVMUyqA5ZjOPvLdDlGh2LsJPDddr3vXU MRSqCKiJ6ZMtrOpXWhSVEkZoKOWsOXMt6cm+ktYL0uw6cy4Ukcpo8L/zEfmqePQCHRq7 xk2g== X-Gm-Message-State: AOAM532mOb0/C1t2mVtVU4mCr7okhUgj7hsmviqWKgYJ4kNQGyjkzl6P 4FWHo/XuiY6AvUojYnz4OyKxd5Y1EV4= X-Google-Smtp-Source: ABdhPJzskGPCQNMPoIFqGE93CBMncUXZ/EtHUwaV8Kvs/nfr+CCS9eftbpgJhcD38aJx1mFEjtU3XQ== X-Received: by 2002:a17:906:6b8e:b0:6cf:8e6e:609a with SMTP id l14-20020a1709066b8e00b006cf8e6e609amr20193328ejr.243.1645551513751; Tue, 22 Feb 2022 09:38:33 -0800 (PST) Received: from Provence.localdomain (dynamic-089-012-227-088.89.12.pool.telefonica.de. [89.12.227.88]) by smtp.gmail.com with ESMTPSA id et2sm6449382ejc.101.2022.02.22.09.38.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Feb 2022 09:38:33 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Subject: [PATCH 06/22] isa: Drop unused attributes from ISADevice Date: Tue, 22 Feb 2022 18:38:03 +0100 Message-Id: <20220222173819.76568-7-shentey@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220222173819.76568-1-shentey@gmail.com> References: <20220222173819.76568-1-shentey@gmail.com> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::633 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::633; envelope-from=shentey@gmail.com; helo=mail-ej1-x633.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bernhard Beschow Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Now that the last users of ISADevice::isairq[] have been resolved during the previous commits, it can be removed for good. Signed-off-by: Bernhard Beschow --- hw/isa/isa-bus.c | 13 ------------- include/hw/isa/isa.h | 2 -- 2 files changed, 15 deletions(-) diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c index af5add6a26..c64a14120b 100644 --- a/hw/isa/isa-bus.c +++ b/hw/isa/isa-bus.c @@ -87,11 +87,7 @@ qemu_irq isa_get_irq(ISADevice *dev, unsigned isairq) void isa_init_irq(ISADevice *dev, qemu_irq *p, unsigned isairq) { - assert(dev->nirqs < ARRAY_SIZE(dev->isairq)); - assert(isairq < ISA_NUM_IRQS); - dev->isairq[dev->nirqs] = isairq; *p = isa_get_irq(dev, isairq); - dev->nirqs++; } void isa_connect_gpio_out(ISADevice *isadev, int gpioirq, unsigned isairq) @@ -150,14 +146,6 @@ int isa_register_portio_list(ISADevice *dev, return 0; } -static void isa_device_init(Object *obj) -{ - ISADevice *dev = ISA_DEVICE(obj); - - dev->isairq[0] = -1; - dev->isairq[1] = -1; -} - ISADevice *isa_new(const char *name) { return ISA_DEVICE(qdev_new(name)); @@ -244,7 +232,6 @@ static const TypeInfo isa_device_type_info = { .name = TYPE_ISA_DEVICE, .parent = TYPE_DEVICE, .instance_size = sizeof(ISADevice), - .instance_init = isa_device_init, .abstract = true, .class_size = sizeof(ISADeviceClass), .class_init = isa_device_class_init, diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h index d4417b34b6..d80cab5b79 100644 --- a/include/hw/isa/isa.h +++ b/include/hw/isa/isa.h @@ -83,8 +83,6 @@ struct ISADevice { DeviceState parent_obj; /*< public >*/ - int8_t isairq[2]; /* -1 = unassigned */ - int nirqs; int ioport_id; };