From nobody Mon Feb 9 11:50:44 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) client-ip=209.85.128.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1616608512; cv=none; d=zohomail.com; s=zohoarc; b=FeGPTD6pWDL0rO/Ksh+wWQfWHr95PzgoOrQMugIbPJMVZitz1UGTtGzlp1I73oGdSDSMTi1WPXUMtEmkfaJW1bxvekb2O3VLKQuNmtewkKPx84xf44nGFrbPrTY8sqk7b8fMLo0s56WGV/0PA0TG2xRxKK8ORg2LkK+LqWXoRzA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616608512; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=RjAULdJLLfqXphaxErcjk/Xv0LxkTKy/1JUt+S9ziaQ=; b=BpaOTlsMlIrHhxS8+ZSBJln2gwxCja5J7oKwEIdO+ah0TMtqYEqfyIMdX61XKhCsgCZFNO/h5yiKp2zeOtw1btc3c5PiAHKmpytK7uul1GGwwfxoiQmcCYv3jnAIVSiu+PB+6ONHOc/8NnPua/7yQF0mQuUbu8mhcSAjs4VuymY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mx.zohomail.com with SMTPS id 1616608512828276.8981023430897; Wed, 24 Mar 2021 10:55:12 -0700 (PDT) Received: by mail-wm1-f46.google.com with SMTP id r10-20020a05600c35cab029010c946c95easo1686917wmq.4 for ; Wed, 24 Mar 2021 10:55: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 b17sm4127034wrt.17.2021.03.24.10.55.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Mar 2021 10:55: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=RjAULdJLLfqXphaxErcjk/Xv0LxkTKy/1JUt+S9ziaQ=; b=ew3fbTBaRorvz41omS5ieF8HOPSTiR3aj4zWWVBvZZVSQ2N4E1LzOvt2LjIxwsWviP zqvrC+hHCkgK5PLshpA5lqukTRrB75+YohxkCZEZ9QfycM5LPGzPVfDLm6jmqu1DrKtP NnAtDUhZlQg1AXZfW1vlhiKtp/URQAUWoV1Co8mmylhqPzX0fFmJvjakkkHBu7fFb9f4 mww2SIaKKLQZD6cMZeTReiXXGk1jb0mDeZ60LPVCXOyGslnCJwOdwPFifDiXpjXADfn9 VwYIfPLB4X5KIwVyzrLt/ELSx/o0tpN/b0GdItYH8m+TLnyvAJVU/vrMjRIiFZZNYEBE IhWw== 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=RjAULdJLLfqXphaxErcjk/Xv0LxkTKy/1JUt+S9ziaQ=; b=qmlo7R1SzzaVtCaC6caPNSh2HInkRWyIH9LWbXcKr5SBes0ZEtXNnmPnXiUVDVYnAc QcHGSZ9GXqF41a531WoxTkc27bmBHJjOWPvPrgSqwNODqjKMGNtUN6eq1udx23UvcjC7 fgQLok75PL9FcsC+Bt4fuqAL/dxMycABfF1ot8IObR82WqbcwLarHEL16TAxTqZCzReS odV4QjPV4IqOaI5FSNELSYl+vrrKxuJN2DMzbwMGCKgFWja65O85D+wyUcSShC5wfINg TdkatYzANQUskQuBV1CVVESktdVRz2uDN8j7TdUBJ6B1mbT02T64FHzjz5PGB7enL4UM RNgA== X-Gm-Message-State: AOAM531w+UgPHkiIDWLe+/6rmRosP1eZsRxzFy/k+hI760cLISpwAiCH +CZzFs8Q1LYQ2kvJzrmoa/4= X-Google-Smtp-Source: ABdhPJx+f4o1MIxR0D6AdZk65y/2If9Z8Ti6540mucBLkek3QhW0ekQlX9rAORF21Ws2E9u43yRpAQ== X-Received: by 2002:a1c:7901:: with SMTP id l1mr4176259wme.114.1616608511053; Wed, 24 Mar 2021 10:55: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: BALATON Zoltan , Jiaxun Yang , John Snow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, Aleksandar Rikalo , Huacai Chen , Aurelien Jarno Subject: [PATCH 4/6] hw/ide/via: Replace magic 2 value by ARRAY_SIZE / MAX_IDE_DEVS Date: Wed, 24 Mar 2021 18:54:36 +0100 Message-Id: <20210324175438.680310-5-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210324175438.680310-1-f4bug@amsat.org> References: <20210324175438.680310-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) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/ide/via.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/ide/via.c b/hw/ide/via.c index be09912b334..6c667a92130 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c @@ -90,7 +90,7 @@ static void bmdma_setup_bar(PCIIDEState *d) int i; =20 memory_region_init(&d->bmdma_bar, OBJECT(d), "via-bmdma-container", 16= ); - for(i =3D 0;i < 2; i++) { + for (i =3D 0; i < ARRAY_SIZE(d->bmdma); i++) { BMDMAState *bm =3D &d->bmdma[i]; =20 memory_region_init_io(&bm->extra_io, OBJECT(d), &via_bmdma_ops, bm, @@ -122,7 +122,7 @@ static void via_ide_reset(DeviceState *dev) uint8_t *pci_conf =3D pd->config; int i; =20 - for (i =3D 0; i < 2; i++) { + for (i =3D 0; i < ARRAY_SIZE(d->bus); i++) { ide_bus_reset(&d->bus[i]); } =20 @@ -188,9 +188,9 @@ static void via_ide_realize(PCIDevice *dev, Error **err= p) 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]), ds, i, 2); + qdev_init_gpio_in(ds, via_ide_set_irq, ARRAY_SIZE(d->bus)); + for (i =3D 0; i < ARRAY_SIZE(d->bus); i++) { + ide_bus_new(&d->bus[i], sizeof(d->bus[i]), ds, i, MAX_IDE_DEVS); ide_init2(&d->bus[i], qdev_get_gpio_in(ds, i)); =20 bmdma_init(&d->bus[i], &d->bmdma[i], d); @@ -204,7 +204,7 @@ static void via_ide_exitfn(PCIDevice *dev) PCIIDEState *d =3D PCI_IDE(dev); unsigned i; =20 - for (i =3D 0; i < 2; ++i) { + for (i =3D 0; i < ARRAY_SIZE(d->bmdma); ++i) { memory_region_del_subregion(&d->bmdma_bar, &d->bmdma[i].extra_io); memory_region_del_subregion(&d->bmdma_bar, &d->bmdma[i].addr_iopor= t); } --=20 2.26.2