From patchwork Tue Jan 19 08:36:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 366153 Delivered-To: patch@linaro.org Received: by 2002:a02:a60d:0:0:0:0:0 with SMTP id c13csp548079jam; Tue, 19 Jan 2021 00:45:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJyoQJlYjzDR0GrGaMcMS1yXf2M2lMF5QC8tVtqdqC563PX/s7lgH/HODnJEhobh38+zTtTM X-Received: by 2002:a25:cc81:: with SMTP id l123mr4483186ybf.496.1611045946424; Tue, 19 Jan 2021 00:45:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611045946; cv=none; d=google.com; s=arc-20160816; b=YRvX70J7ZTQcbc4XQGaZ6qjJMsKQRHCBiGVFHV+QAKUz0zNbjaUs7L3+cOAKjYMyS2 NNcOo2keVIXhtIvPzIg5H3XvyppCrkgfasdCUJ8dbM+EzV2ekeKUQskvRnqLkN7EyaM9 /84MuGhKS8J1ksSJaXEesW2nYB9cKtlHs3H/rf0pDhPRoNqENnnrqusSVQDcESgKkJi0 +ZdZF1InIvAM2tyysWTc3iwLVwc0sYCXHLxACcw8GpdumXaE5Ft56fTe5i4UU/GS90n8 Psl/5gXknc61CNJctyTwV/p/W7uE+SBHV0JX3qcFnre3dJ1QxGtBp4iMLsVIoAPnpZyl ix4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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; bh=Lp8e+6CNq3PfO/lG5V1bR2jAbjEfRw8uEWg2058AyFU=; b=Bwbg1RPP2ADXUwWjShuaAlOj1nkApvW7/9X2LkO4f8XM80QFxTTAozLG1YN99g/ZrM MJOOa+68fC//Yl/czU1EhO2qYyeBztO8T0T7liqd/cfetj/u9e5NWrxZilHkB5zn6AlT HaSnEfUSO1b2BotompQCmvzQzvOjIAJbyGhQfuHr4KvZ/S0hATmkWZs8ZWmRnYfnQC8P MfwStIiwX7fpLz/SkvKKnWcVaKY+u7+CIobnGnSK6LQiFNd9Xe6oEIRkbhOMc7bERDh2 DeMfJ4xMMBpu0Br+ftqwQp1ad2RX9u2/nBiQq7OUhm/fAgJUJFsAVlskQjp60EH8nW3o a0zw== ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 201si17486699ybf.130.2021.01.19.00.45.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Jan 2021 00:45:46 -0800 (PST) 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; 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" Received: from localhost ([::1]:52090 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l1me1-0002MJ-VD for patch@linaro.org; Tue, 19 Jan 2021 03:45:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34438) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1mVZ-0008Jn-M0 for qemu-devel@nongnu.org; Tue, 19 Jan 2021 03:37:01 -0500 Received: from mail-wr1-f47.google.com ([209.85.221.47]:36538) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l1mVY-0003Vt-3C for qemu-devel@nongnu.org; Tue, 19 Jan 2021 03:37:01 -0500 Received: by mail-wr1-f47.google.com with SMTP id 6so11547764wri.3 for ; Tue, 19 Jan 2021 00:36:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Lp8e+6CNq3PfO/lG5V1bR2jAbjEfRw8uEWg2058AyFU=; b=klIV5NYmQwkloh4SynoEb6Wz2DZCAbMYn6tMgGuRZRxnWZqLsYfd0qqbylq84y0NC0 tZkmwR5HQafKC0fMnsxdi3DI7KzgfT6MZtKuYgGkqd7W19m0JJz1BS/f813JGQ9Qmwmu Us/qHtriOyp9eKNO16Nf/vROPwd+Q2DAvaMywsQHXUWFhL2dC9unhMcK9c44Toow580K PyYdtylG7q3BUozIgj/V3CLysJKSXUYcmUtrPgnCdWHabZMAe1LH2jMg3HdUndV4Xdx0 7A5HrbQYY/pLTAwIxtygXQDuPriR/DOAGDw0MljpOluKrZ5scpTbiqfNuay1qSknhKsq RWhg== X-Gm-Message-State: AOAM531u3e3Nk/Uw3gE8omne3cCYM02pgB18Zet7iIq5Cu7uOqWOriQ4 V6uUwtZDfQ5hexQMa9I3wYV38B/+vbc= X-Received: by 2002:a5d:660c:: with SMTP id n12mr3165700wru.291.1611045418609; Tue, 19 Jan 2021 00:36:58 -0800 (PST) Received: from localhost.localdomain (pd9e83aed.dip0.t-ipconnect.de. [217.232.58.237]) by smtp.gmail.com with ESMTPSA id z14sm540833wrm.5.2021.01.19.00.36.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Jan 2021 00:36:58 -0800 (PST) From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 09/11] hw/m68k/next-cube: Remove unused fields from NeXTState Date: Tue, 19 Jan 2021 09:36:15 +0100 Message-Id: <20210119083617.6337-10-huth@tuxfamily.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210119083617.6337-1-huth@tuxfamily.org> References: <20210119083617.6337-1-huth@tuxfamily.org> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.221.47; envelope-from=th.huth@gmail.com; helo=mail-wr1-f47.google.com X-Spam_score_int: -13 X-Spam_score: -1.4 X-Spam_bar: - X-Spam_report: (-1.4 / 5.0 requ) BAYES_00=-1.9, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell The fields scsi_irq, scsi_dma, scsi_reset and fd_irq in NeXTState are all unused, except in commented out "this should do something like this" code. Remove the unused fields. As and when the functionality that might use them is added, we can put in the correct kind of wiring (which might or might not need to be a qemu_irq, but which in any case will need to be in the NeXTPC device, not in NeXTState). Signed-off-by: Peter Maydell Message-Id: <20210115201206.17347-10-peter.maydell@linaro.org> Signed-off-by: Thomas Huth --- hw/m68k/next-cube.c | 4 ---- 1 file changed, 4 deletions(-) -- 2.29.2 diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c index 57f9e9f837..1f6a2d58a1 100644 --- a/hw/m68k/next-cube.c +++ b/hw/m68k/next-cube.c @@ -74,10 +74,6 @@ struct NeXTState { MachineState parent; next_dma dma[10]; - qemu_irq *scsi_irq; - qemu_irq scsi_dma; - qemu_irq scsi_reset; - qemu_irq *fd_irq; }; #define TYPE_NEXT_PC "next-pc"