From nobody Tue Feb 10 20:48:08 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.218.46 as permitted sender) client-ip=209.85.218.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1620706754; cv=none; d=zohomail.com; s=zohoarc; b=ULTrWlDfRImzvIoAhOk/vBxmnXiavFV7ENsz1cX48qSWzdkoLoLyu1Ojv8i1qe6QP1/FlePhEJ4gmqifPe56IabokGtmSmZgijHryiQJadecZAT4HLhjbBL5ab029LCpuV+xLEHICscr++sW+1tE3ZfVdu22SxEtjjGbfI1PoVQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620706754; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=iRm53kHLT4/pnioKido8rYXjx6j0CRl97jvo0aFqgdc=; b=Kx7GYO4//gypwANf0PcdRa1LTISHlAcoERF77/8SeZMD23m8w7yWKjvIJE2k7YF2iTMm18tFkF0usSfkMroCKj5wBHqvNIu7NWf9a0WyhMhb2yjLjgOPMMOR/yQg0+ynuVPrbxfLyxkptgUNcXMe2AbQXdcZ4xVR5x+yJx0ddhU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) by mx.zohomail.com with SMTPS id 162070675486384.05641347440849; Mon, 10 May 2021 21:19:14 -0700 (PDT) Received: by mail-ej1-f46.google.com with SMTP id s20so22197067ejr.9 for ; Mon, 10 May 2021 21:19:14 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id s12sm1300068edr.54.2021.05.10.21.19.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 May 2021 21:19:12 -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=iRm53kHLT4/pnioKido8rYXjx6j0CRl97jvo0aFqgdc=; b=PVekdm2feesMQBHWZ4jhMBIrHBn03oO2suMIHccOwdmcuz23zBO+drwISsx+DO/H88 UMZWZMbTSIYYqiMZQ/L+mIXSztF+Imk9nzfX8cZu9dNpRSNzSyZnhoHH4LM7I+lOlxJ/ 45OOpaWNH41yT+XaOnoV4B8XCwKTnlfYdf42wzHif3aFM8hWqZWkM0i1jtNzlzIdebpk 4fCvcK8uwkKOJNI/2Lyo5ym6dwHq9z3UHOJGg54hT0+82SGRJ4RmuoBZRlwOsiYt12lo nKzsBR+OMGdmj+qpXxQ8E3G3ZfU79Mq4y4AaztQXt6y1BzYdLmZiDTuriYXR4DfhUDrh LZsQ== 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=iRm53kHLT4/pnioKido8rYXjx6j0CRl97jvo0aFqgdc=; b=RoQOMv/bw8Jg/BLGloOFsas38X4RifVeWSTtICL1BWLVTPCJKHUdJBa5npQTraKwY8 IkRBbObCvqFTbJFx7uph8pBQD/d3ZLBHqcVinssiDDkdHHnrKB/Qki0bs2I1VNuJ++PH WAvNg17hcDT/XFqpPXfrI4fXyRF/w0IbBrLKbq27ZQ9s7ubdXdV+hMtS5C1u+lX+WYZr gIMd+6vK7dD2is3LHnJVDdSB87DEEqvST5oDtBirrw8lN1TAGXORa7ukZkhDui15bGHE KV0jmrWhWDUOq3Y+NpeJV58jFUEQrJH6qqaTQfhK85QzrT0J/wVnU0MLie/nvDu3954L Czaw== X-Gm-Message-State: AOAM532Rh89VqZOyXA+zc50rI/qK86RX6PsMmp0zfp3W3cLfGvwRCsXX iD2IcqpqUVTbgApHqcCqyQc= X-Google-Smtp-Source: ABdhPJx03hO8nZubSLFIkytGQiRgZRp9i/WaE6m1Jcm5qQlXogNcewzHHEzzvHusIw6n5S6vRsygRA== X-Received: by 2002:a17:906:3b84:: with SMTP id u4mr29371173ejf.131.1620706753099; Mon, 10 May 2021 21:19:13 -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: Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, Jiaxun Yang , Huacai Chen , BALATON Zoltan , Aurelien Jarno , John Snow Subject: [PATCH v2 4/6] hw/ide/via: Replace magic 2 value by ARRAY_SIZE / MAX_IDE_DEVS Date: Tue, 11 May 2021 06:18:46 +0200 Message-Id: <20210511041848.2743312-5-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210511041848.2743312-1-f4bug@amsat.org> References: <20210511041848.2743312-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 Acked-by: John Snow --- 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.3