From patchwork Sun Oct 30 22:28:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 620036 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2452561pvb; Sun, 30 Oct 2022 15:36:55 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5M5RNZekwluBpApDp/8U+qlQOf0xVrgPcv1p1airffBfOiaM+Sq2Qu3eswW4rsRCEIRjkA X-Received: by 2002:ac8:7d81:0:b0:39c:d6ad:cce9 with SMTP id c1-20020ac87d81000000b0039cd6adcce9mr8564931qtd.81.1667169415059; Sun, 30 Oct 2022 15:36:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667169415; cv=none; d=google.com; s=arc-20160816; b=WtZFWvSwcAxdzOHLSqgDCX3I4VZfjXx2HGm240urWpZh6ZnDwmbeZ5dsl8ytAP9SOO naOjFdF9ErT1mPW8pdM3JAdY6wGHG8r78JfgfwrtEsoKpuo4SSQqOvuMDNwewXoGfIKe rmhKfDRwOimCuTONjcvNOGFmBErojlOcMaQ8/ceg4Z1Tnw/elVXPQrQAIf984ex9jPfA MEl4RIz8+DaHN5saK3JdoOjForX37wuLsQU9btmGAfb1Vwl1N1tjOy7gkUBbNHQ3W37v WREZxrZa42BFsUK6mRgrdvUTa33uE7eiS6G6ier8qfpIExIzXWXRztAPK1FNQHw0fXkM UPSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender: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:cc:to :from:dkim-signature; bh=EXpt2U7urhOundj676D3XC1wCblnQcS5gsy0nmp/Pv4=; b=lYcaLRE6rOtwyTEuFTmTyV75PCx91Zl0Xew+ekLkuXCNbMU0OsoYR30X6jaItp2WGv xSD8iLrNrCbgu/f+PZu1bQUa+pYzk+QNo3qWez+aZCHgn3sB2dthcB2Fd2SH/5j0/Ifq HmBjFxuGRrLu11D+0HVHWGlZNsQkNiANydYUBb4JuZ2EDjiJd7Kcss8JyZWLr5Wi5NsR UlCmn9jFMbHmlMiXG1L4DW7dA3iyQTc/0DcOOSbA72t+txj0hX1XUZGfqaN82+nf0ypC jm3Ks62STWay4Kv7IvxlmIxm3LBcTORvLirCigluxzAThaiGp4pd9/3+dbySroUYk5QV jJkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=k6FNzc2M; 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"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ay23-20020a05622a229700b0039ce5a0cc68si2774468qtb.323.2022.10.30.15.36.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 30 Oct 2022 15:36:55 -0700 (PDT) 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; dkim=pass header.i=@linaro.org header.s=google header.b=k6FNzc2M; 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"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opGox-00022V-Bi; Sun, 30 Oct 2022 18:30:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opGou-0001mt-Bj for qemu-devel@nongnu.org; Sun, 30 Oct 2022 18:30:20 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opGos-0007ix-2x for qemu-devel@nongnu.org; Sun, 30 Oct 2022 18:30:19 -0400 Received: by mail-wr1-x434.google.com with SMTP id l14so13688324wrw.2 for ; Sun, 30 Oct 2022 15:30:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=EXpt2U7urhOundj676D3XC1wCblnQcS5gsy0nmp/Pv4=; b=k6FNzc2Mp6TUeZIk+da69TntozAJqp3L/s/z89G+DoK97inwhTwozzf+n8S0MleWR9 ghv+c24DmrysYFpVoT7QYt/Rh68TOaNm8tiaxdBuzREbPQMKSeokSaxHZ1YfTTs5yBxm JvjCEaT7+/jiZiR6FIM4G/QVgQPsfgdTLhR8yp2sXhMBfmaGrBkaNzxmvobzZqspumZf sjTzs9A/4pVD+ZtpbdXWpM57M/VczW7UGvWWgTUt/JD6jqaJLI+g9QOG2ZuX+TSGDlHg RjqGS5Q5JZKqdFtNB1SA7aOSXBqfxVoV+732UPG2LLrJnbYge3fZA7fa0WJPiaAFW9Nk bXeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EXpt2U7urhOundj676D3XC1wCblnQcS5gsy0nmp/Pv4=; b=xXW4e3+ASSzw8XHnBUyomHcsKl7cWFv9D7m2F/IGABQFAqbJnkbMch1AFAHhIU99Tn R5Qs5kFO8xEfzc1OckUurt6O1PfLJWSZVm9hpF311qvclEDSiJQVA2MUgI/HbqCgUuGr 6Zwe7uPL1441tmPzZm9yEm8GvQco0uw9HWIQqxGF7mwY4yRy+skYnGhS36MYH+iN3vQ+ 7+Vo1vFO8FcITXNC2olas8if9Sr5j5yKqbrfRSUE7LJufMEmURQ53pMbpDRJtqWk0uRM PXN+4brbfFq9MTrdJjGIb+DekLL2csLLgi0GPDxuN0al5q2a+sB+i+4D43/epBFkqr1A xXTw== X-Gm-Message-State: ACrzQf3y4LpLrfFa+SgSqAaPjyMiFCPgtAG/JdgYTOjM+aL34rywX4DF gQdqChzk1DxazoSFadjXMjfRB4vyx/gMuQ== X-Received: by 2002:a5d:5265:0:b0:235:e1fa:98a2 with SMTP id l5-20020a5d5265000000b00235e1fa98a2mr6220596wrc.73.1667169016255; Sun, 30 Oct 2022 15:30:16 -0700 (PDT) Received: from localhost.localdomain ([185.126.107.38]) by smtp.gmail.com with ESMTPSA id i11-20020a05600c354b00b003cf57329221sm6151713wmq.14.2022.10.30.15.30.14 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 30 Oct 2022 15:30:15 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Huacai Chen , Stefan Pejic , Jiaxun Yang , Aurelien Jarno , Paul Burton , BALATON Zoltan , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PULL 14/55] hw: Remove unused MAX_IDE_BUS define Date: Sun, 30 Oct 2022 23:28:00 +0100 Message-Id: <20221030222841.42377-15-philmd@linaro.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221030222841.42377-1-philmd@linaro.org> References: <20221030222841.42377-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=philmd@linaro.org; helo=mail-wr1-x434.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org From: BALATON Zoltan Several machines have an unused MAX_IDE_BUS define. Remove it from these machines that don't need it. Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20220917115136.A32EF746E06@zero.eik.bme.hu> Signed-off-by: Philippe Mathieu-Daudé --- hw/alpha/dp264.c | 2 -- hw/hppa/machine.c | 2 -- hw/mips/fuloong2e.c | 1 - hw/mips/malta.c | 2 -- hw/ppc/prep.c | 2 -- hw/sparc64/sun4u.c | 1 - 6 files changed, 10 deletions(-) diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c index f4349eba83..c502c8c62a 100644 --- a/hw/alpha/dp264.c +++ b/hw/alpha/dp264.c @@ -20,8 +20,6 @@ #include "qemu/datadir.h" #include "net/net.h" -#define MAX_IDE_BUS 2 - static uint64_t cpu_alpha_superpage_to_phys(void *opaque, uint64_t addr) { if (((addr >> 41) & 3) == 2) { diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index e53d5f0fa7..355b3aac2e 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -30,8 +30,6 @@ #include "qemu/log.h" #include "net/net.h" -#define MAX_IDE_BUS 2 - #define MIN_SEABIOS_HPPA_VERSION 6 /* require at least this fw version */ #define HPA_POWER_BUTTON (FIRMWARE_END - 0x10) diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c index b478483706..50c61f0e4a 100644 --- a/hw/mips/fuloong2e.c +++ b/hw/mips/fuloong2e.c @@ -49,7 +49,6 @@ /* Fuloong 2e has a 512k flash: Winbond W39L040AP70Z */ #define BIOS_SIZE (512 * KiB) -#define MAX_IDE_BUS 2 /* * PMON is not part of qemu and released with BSD license, anyone diff --git a/hw/mips/malta.c b/hw/mips/malta.c index 0e932988e0..5099ed9592 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -69,8 +69,6 @@ #define FLASH_SIZE 0x400000 -#define MAX_IDE_BUS 2 - typedef struct { MemoryRegion iomem; MemoryRegion iomem_lo; /* 0 - 0x900 */ diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index f08714f2ec..fcbe4c5837 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -50,8 +50,6 @@ /* SMP is not enabled, for now */ #define MAX_CPUS 1 -#define MAX_IDE_BUS 2 - #define CFG_ADDR 0xf0000510 #define KERNEL_LOAD_ADDR 0x01000000 diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index 0e27715ac4..387181ff77 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -66,7 +66,6 @@ #define PBM_PCI_IO_BASE (PBM_SPECIAL_BASE + 0x02000000ULL) #define PROM_FILENAME "openbios-sparc64" #define NVRAM_SIZE 0x2000 -#define MAX_IDE_BUS 2 #define BIOS_CFG_IOPORT 0x510 #define FW_CFG_SPARC64_WIDTH (FW_CFG_ARCH_LOCAL + 0x00) #define FW_CFG_SPARC64_HEIGHT (FW_CFG_ARCH_LOCAL + 0x01)