From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2D899C43603 for ; Mon, 16 Dec 2019 13:11:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 00A6C20726 for ; Mon, 16 Dec 2019 13:11:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="KSrThmf9" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727807AbfLPNLw (ORCPT ); Mon, 16 Dec 2019 08:11:52 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:24434 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727782AbfLPNLv (ORCPT ); Mon, 16 Dec 2019 08:11:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576501910; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=75YfmPUd8IxShkS7a0b2Ig4I+aTSu5nF6jxguOhk6cM=; b=KSrThmf9izmv/Yhj/9gbfDcwelG5Fee6HXY45eaDMS5xI7oSbNswDN1Esj98Cbsek5guzp aGiZ7Hl/6KcoPg1tfPHgMQbVL7tvYNKKwRUJM8NOG+LkxW90a80sVLFybLPqc6sHG005IV QN9xIfm9T7WAGxF00wLgdHWT3+VXhlA= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-350-1slzXXL4Pzu-vQiAahAQSQ-1; Mon, 16 Dec 2019 08:11:48 -0500 X-MC-Unique: 1slzXXL4Pzu-vQiAahAQSQ-1 Received: by mail-wm1-f72.google.com with SMTP id t17so1004849wmi.7 for ; Mon, 16 Dec 2019 05:11:48 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=75YfmPUd8IxShkS7a0b2Ig4I+aTSu5nF6jxguOhk6cM=; b=awPRt9GPsrQMh2ylhdIsZUFBKoKXdYzbEEZD4f3yXB58rwfLztOEpVSfNd989DbYrI ZKBErm/d2WOLs22hKMUXJEYddG96b75IgtyXkcfJZdZbtLTbOKLF+MTGlMFU7R62MHMt KoNSzCubBigS+05Gg0PB5kFPAlUaMHeGFQQqpVe1JI9sx9U3EqktAJjtDzpi45pzovG0 6E/U3adtmvbJqfPepSvRKyySbruUZqGhMJbVcAnbOCFYRd8+wHTVb7Hq7o0pfsngoCwe zDRAmpn7ZuKoCc98SlNLBsHTi+F4Nq0KcdGO8U7Y7S+rq+TBv+HjQQg4BqRljeR1g1jt Efuw== X-Gm-Message-State: APjAAAW1J+S2dri2n0Pm6ehAbqaoAHQ7om6rFvhJqnPryVKinXkEGoIf Y1U6i7KNjIjPbLmX2Q+JF/YIQ/FSG0wzRTm0nOzd0OBU87RW8kZLmlNsMyScCasaDDmmya2EjC2 4CKf3A2RnM1I9 X-Received: by 2002:a5d:53d1:: with SMTP id a17mr29258093wrw.327.1576501907532; Mon, 16 Dec 2019 05:11:47 -0800 (PST) X-Google-Smtp-Source: APXvYqwuIcoQzrLz1xC87UatN3jXBE3T8LoVif4M67IAzWtqOxR+SyLrgYTkIoP4IoF7SSSnGn/e5g== X-Received: by 2002:a5d:53d1:: with SMTP id a17mr29258050wrw.327.1576501907281; Mon, 16 Dec 2019 05:11:47 -0800 (PST) Received: from ?IPv6:2001:b07:6468:f312:cde8:2463:95a9:1d81? ([2001:b07:6468:f312:cde8:2463:95a9:1d81]) by smtp.gmail.com with ESMTPSA id t190sm12609330wmt.44.2019.12.16.05.11.46 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 16 Dec 2019 05:11:46 -0800 (PST) Subject: Re: [PATCH 08/12] hw/ide/piix: Use ARRAY_SIZE() instead of magic numbers To: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , qemu-devel@nongnu.org Cc: John Snow , "Michael S. Tsirkin" , Eduardo Habkost , Paul Durrant , Marcel Apfelbaum , kvm@vger.kernel.org, Stefano Stabellini , Igor Mammedov , Anthony Perard , qemu-block@nongnu.org, Richard Henderson , xen-devel@lists.xenproject.org, Sergio Lopez References: <20191213161753.8051-1-philmd@redhat.com> <20191213161753.8051-9-philmd@redhat.com> From: Paolo Bonzini Message-ID: <3e4ef8f0-4ccf-65c8-35ec-95bc6cf4e3d0@redhat.com> Date: Mon, 16 Dec 2019 14:11:45 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.1.1 MIME-Version: 1.0 In-Reply-To: <20191213161753.8051-9-philmd@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On 13/12/19 17:17, Philippe Mathieu-Daudé wrote: > Using magic numbers is dangerous because the structures PCIIDEState > might be modified and this source file consuming the "ide/pci.h" > header would be out of sync, eventually accessing out of bound > array members. > Use the ARRAY_SIZE() to keep the source file sync. > > Signed-off-by: Philippe Mathieu-Daudé > --- > hw/ide/piix.c | 26 +++++++++++--------------- > 1 file changed, 11 insertions(+), 15 deletions(-) > > diff --git a/hw/ide/piix.c b/hw/ide/piix.c > index ffeff4e095..ab23613a44 100644 > --- a/hw/ide/piix.c > +++ b/hw/ide/piix.c > @@ -87,10 +87,9 @@ static const MemoryRegionOps piix_bmdma_ops = { > > static void bmdma_setup_bar(PCIIDEState *d) > { > - int i; > - > memory_region_init(&d->bmdma_bar, OBJECT(d), "piix-bmdma-container", 16); > - for(i = 0;i < 2; i++) { > + > + for (size_t i = 0; i < ARRAY_SIZE(d->bmdma); i++) { > BMDMAState *bm = &d->bmdma[i]; > > memory_region_init_io(&bm->extra_io, OBJECT(d), &piix_bmdma_ops, bm, > @@ -107,9 +106,8 @@ static void piix_ide_reset(DeviceState *dev) > PCIIDEState *d = PCI_IDE(dev); > PCIDevice *pd = PCI_DEVICE(d); > uint8_t *pci_conf = pd->config; > - int i; > > - for (i = 0; i < 2; i++) { > + for (size_t i = 0; i < ARRAY_SIZE(d->bus); i++) { > ide_bus_reset(&d->bus[i]); > } > > @@ -132,10 +130,10 @@ static void pci_piix_init_ports(PCIIDEState *d) { > {0x1f0, 0x3f6, 14}, > {0x170, 0x376, 15}, > }; > - int i; > > - for (i = 0; i < 2; i++) { > - ide_bus_new(&d->bus[i], sizeof(d->bus[i]), DEVICE(d), i, 2); > + for (size_t i = 0; i < ARRAY_SIZE(d->bus); i++) { > + ide_bus_new(&d->bus[i], sizeof(d->bus[i]), DEVICE(d), i, > + ARRAY_SIZE(d->bus[0].ifs)); > ide_init_ioport(&d->bus[i], NULL, port_info[i].iobase, > port_info[i].iobase2); > ide_init2(&d->bus[i], isa_get_irq(NULL, port_info[i].isairq)); > @@ -163,14 +161,13 @@ static void pci_piix_ide_realize(PCIDevice *dev, Error **errp) > > int pci_piix3_xen_ide_unplug(DeviceState *dev, bool aux) > { > - PCIIDEState *pci_ide; > + PCIIDEState *pci_ide = PCI_IDE(dev); > DriveInfo *di; > - int i; > IDEDevice *idedev; > + const size_t idedev_max = ARRAY_SIZE(pci_ide->bus) > + * ARRAY_SIZE(pci_ide->bus[0].ifs); > > - pci_ide = PCI_IDE(dev); > - > - for (i = aux ? 1 : 0; i < 4; i++) { > + for (size_t i = aux ? 1 : 0; i < idedev_max; i++) { > di = drive_get_by_index(IF_IDE, i); > if (di != NULL && !di->media_cd) { > BlockBackend *blk = blk_by_legacy_dinfo(di); > @@ -210,9 +207,8 @@ PCIDevice *pci_piix3_xen_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn) > static void pci_piix_ide_exitfn(PCIDevice *dev) > { > PCIIDEState *d = PCI_IDE(dev); > - unsigned i; > > - for (i = 0; i < 2; ++i) { > + for (size_t i = 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_ioport); > } > Queued, thanks. Paolo From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.1 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 59041C43603 for ; Mon, 16 Dec 2019 13:12:46 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 242832053B for ; Mon, 16 Dec 2019 13:12:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="FdtYHvrw" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 242832053B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:53522 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1igqB3-0002qh-5t for qemu-devel@archiver.kernel.org; Mon, 16 Dec 2019 08:12:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40924) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1igqAD-0001w1-Fs for qemu-devel@nongnu.org; Mon, 16 Dec 2019 08:11:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1igqAC-00072y-As for qemu-devel@nongnu.org; Mon, 16 Dec 2019 08:11:53 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:24114 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1igqAC-00072A-7O for qemu-devel@nongnu.org; Mon, 16 Dec 2019 08:11:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576501911; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ib4GLxFZXzsZYq5vhvW4dRSucJEdW9kOkRYUP32unpw=; b=FdtYHvrwhMu9JmqZF2vpRHUos74O/W8jlhlZOYmT3X7xMKD3/XW809VIGhiwXOfWv4mdrh 1lWdCd3YOVJ0A7iWbS0DCnqy3jhxeBiL3U37X1G5py2Ym7mvCjVlW1J+UM7laZxONO54iR mUW3GZnoqJEETWeIlkowDCfaYaADeA0= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-201-If9jdl9zPNGPeYUyjpqwCQ-1; Mon, 16 Dec 2019 08:11:48 -0500 Received: by mail-wm1-f71.google.com with SMTP id z2so1004981wmf.5 for ; Mon, 16 Dec 2019 05:11:48 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=75YfmPUd8IxShkS7a0b2Ig4I+aTSu5nF6jxguOhk6cM=; b=SlMKBlCdL1WspkjUaZyvz5agXw7dU6xDhW8JDU8I/gSRG0HlVClOQHFzhMkmEiRbSH b9XkoNL7J1m3QruyyA8ozZaTe1/XcAx97pa3rMDDTTiXpJnBVzc0A0DiH3JFxIx/+g5G 98Jyon25vkqqhZxIY7V0qmUVaV3DvVkqLoUMiZMhzQp7YYzZof8jLsvpg+c0uNZZ7ykL yZ2KLASobJDZGbArhOSSp/f6O8/TyH14z7uTR07EpY73mFLmj2in6AJba16C3pioXdj3 7zi2jS14MOctmfOiFkdOf9zJn6NslYx849t/4mTdeDmwkZeATv7RTDnX8in/9G8leOsN F21A== X-Gm-Message-State: APjAAAUuyLvvjYKy1rVp2ggWZJny9M6ceQMXUgRHK91Epk0Wx20Jx2CC ic2e/ShxxmCxdWIiuxUx40Zvun+n//vgcefdsld+xkDnrdxjciaLo9k5KfHsrLeueew6cNBj+1Y aoizZ55qMJjY2g9I= X-Received: by 2002:a5d:53d1:: with SMTP id a17mr29258090wrw.327.1576501907532; Mon, 16 Dec 2019 05:11:47 -0800 (PST) X-Google-Smtp-Source: APXvYqwuIcoQzrLz1xC87UatN3jXBE3T8LoVif4M67IAzWtqOxR+SyLrgYTkIoP4IoF7SSSnGn/e5g== X-Received: by 2002:a5d:53d1:: with SMTP id a17mr29258050wrw.327.1576501907281; Mon, 16 Dec 2019 05:11:47 -0800 (PST) Received: from ?IPv6:2001:b07:6468:f312:cde8:2463:95a9:1d81? ([2001:b07:6468:f312:cde8:2463:95a9:1d81]) by smtp.gmail.com with ESMTPSA id t190sm12609330wmt.44.2019.12.16.05.11.46 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 16 Dec 2019 05:11:46 -0800 (PST) Subject: Re: [PATCH 08/12] hw/ide/piix: Use ARRAY_SIZE() instead of magic numbers To: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , qemu-devel@nongnu.org References: <20191213161753.8051-1-philmd@redhat.com> <20191213161753.8051-9-philmd@redhat.com> From: Paolo Bonzini Message-ID: <3e4ef8f0-4ccf-65c8-35ec-95bc6cf4e3d0@redhat.com> Date: Mon, 16 Dec 2019 14:11:45 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.1.1 MIME-Version: 1.0 In-Reply-To: <20191213161753.8051-9-philmd@redhat.com> Content-Language: en-US X-MC-Unique: If9jdl9zPNGPeYUyjpqwCQ-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 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: , Cc: Stefano Stabellini , Sergio Lopez , Eduardo Habkost , kvm@vger.kernel.org, Paul Durrant , "Michael S. Tsirkin" , xen-devel@lists.xenproject.org, Anthony Perard , Igor Mammedov , qemu-block@nongnu.org, John Snow , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 13/12/19 17:17, Philippe Mathieu-Daud=C3=A9 wrote: > Using magic numbers is dangerous because the structures PCIIDEState > might be modified and this source file consuming the "ide/pci.h" > header would be out of sync, eventually accessing out of bound > array members. > Use the ARRAY_SIZE() to keep the source file sync. >=20 > Signed-off-by: Philippe Mathieu-Daud=C3=A9 > --- > hw/ide/piix.c | 26 +++++++++++--------------- > 1 file changed, 11 insertions(+), 15 deletions(-) >=20 > diff --git a/hw/ide/piix.c b/hw/ide/piix.c > index ffeff4e095..ab23613a44 100644 > --- a/hw/ide/piix.c > +++ b/hw/ide/piix.c > @@ -87,10 +87,9 @@ static const MemoryRegionOps piix_bmdma_ops =3D { > =20 > static void bmdma_setup_bar(PCIIDEState *d) > { > - int i; > - > memory_region_init(&d->bmdma_bar, OBJECT(d), "piix-bmdma-container",= 16); > - for(i =3D 0;i < 2; i++) { > + > + for (size_t 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), &piix_bmdma_ops,= bm, > @@ -107,9 +106,8 @@ static void piix_ide_reset(DeviceState *dev) > PCIIDEState *d =3D PCI_IDE(dev); > PCIDevice *pd =3D PCI_DEVICE(d); > uint8_t *pci_conf =3D pd->config; > - int i; > =20 > - for (i =3D 0; i < 2; i++) { > + for (size_t i =3D 0; i < ARRAY_SIZE(d->bus); i++) { > ide_bus_reset(&d->bus[i]); > } > =20 > @@ -132,10 +130,10 @@ static void pci_piix_init_ports(PCIIDEState *d) { > {0x1f0, 0x3f6, 14}, > {0x170, 0x376, 15}, > }; > - int i; > =20 > - for (i =3D 0; i < 2; i++) { > - ide_bus_new(&d->bus[i], sizeof(d->bus[i]), DEVICE(d), i, 2); > + for (size_t i =3D 0; i < ARRAY_SIZE(d->bus); i++) { > + ide_bus_new(&d->bus[i], sizeof(d->bus[i]), DEVICE(d), i, > + ARRAY_SIZE(d->bus[0].ifs)); > ide_init_ioport(&d->bus[i], NULL, port_info[i].iobase, > port_info[i].iobase2); > ide_init2(&d->bus[i], isa_get_irq(NULL, port_info[i].isairq)); > @@ -163,14 +161,13 @@ static void pci_piix_ide_realize(PCIDevice *dev, Er= ror **errp) > =20 > int pci_piix3_xen_ide_unplug(DeviceState *dev, bool aux) > { > - PCIIDEState *pci_ide; > + PCIIDEState *pci_ide =3D PCI_IDE(dev); > DriveInfo *di; > - int i; > IDEDevice *idedev; > + const size_t idedev_max =3D ARRAY_SIZE(pci_ide->bus) > + * ARRAY_SIZE(pci_ide->bus[0].ifs); > =20 > - pci_ide =3D PCI_IDE(dev); > - > - for (i =3D aux ? 1 : 0; i < 4; i++) { > + for (size_t i =3D aux ? 1 : 0; i < idedev_max; i++) { > di =3D drive_get_by_index(IF_IDE, i); > if (di !=3D NULL && !di->media_cd) { > BlockBackend *blk =3D blk_by_legacy_dinfo(di); > @@ -210,9 +207,8 @@ PCIDevice *pci_piix3_xen_ide_init(PCIBus *bus, DriveI= nfo **hd_table, int devfn) > static void pci_piix_ide_exitfn(PCIDevice *dev) > { > PCIIDEState *d =3D PCI_IDE(dev); > - unsigned i; > =20 > - for (i =3D 0; i < 2; ++i) { > + for (size_t 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_iop= ort); > } >=20 Queued, thanks. Paolo From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.1 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 07817C2D0C0 for ; Mon, 16 Dec 2019 13:12:11 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D0BFC206D3 for ; Mon, 16 Dec 2019 13:12:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="CS0WjJ7a" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D0BFC206D3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1igqAL-0000Ms-NV; Mon, 16 Dec 2019 13:12:01 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1igqAK-0000MR-Sv for xen-devel@lists.xenproject.org; Mon, 16 Dec 2019 13:12:00 +0000 X-Inumbo-ID: 9f087ef0-2005-11ea-88e7-bc764e2007e4 Received: from us-smtp-1.mimecast.com (unknown [207.211.31.81]) by us1-rack-iad1.inumbo.com (Halon) with ESMTP id 9f087ef0-2005-11ea-88e7-bc764e2007e4; Mon, 16 Dec 2019 13:11:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576501910; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ib4GLxFZXzsZYq5vhvW4dRSucJEdW9kOkRYUP32unpw=; b=CS0WjJ7axahi3lqEysnM1Ct1PJFpEBs6mD9EMOrxQzPvJcBXYXT9Vw6G0kYDGj28CZGQll NEqNb3qgL3mcw3+7/sFWweEXJK3XRXTWFc2+svGKlZcBMsi6okTeasqG8IgoyWThbeN/Wm lYqFknIpyEge3RNSAy8l3xWTqH88MPI= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-11-lo9DSbgEMb6GgUNRsFopTQ-1; Mon, 16 Dec 2019 08:11:48 -0500 Received: by mail-wm1-f71.google.com with SMTP id m133so1005421wmf.2 for ; Mon, 16 Dec 2019 05:11:48 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=75YfmPUd8IxShkS7a0b2Ig4I+aTSu5nF6jxguOhk6cM=; b=m3hKtirH1YaBk/O8ianYUSWTP668ZqO6i903kCzPUl4piu7NpadcoiTkrTvx3/3bjZ PAMAfFviLVTmHvVFq40+JQKEVqmLpnKEMQoT9yPiCfs/SAVG/Hk8KectMucJfBDpimmV MjerMfYkNg5N3RMlF7Ero4sRpSXyGBxuFjuaFAtYYNT1xlBlGgF3cNzgMjUtxhAJvg6P Ef0TTK/naEiCbtrkWbCzXbNv/GwXtajRLf7hksvxwlCjMWnViOBp0x3BpKKD4SVyZ1Ss WQTQvgg1z+MQe/6HwlyEl3QDokDpYl1D0BXymNnqF+/e2uBaZ+4gi85YYa055QWCDbp/ UeqQ== X-Gm-Message-State: APjAAAUjgnydhOhH3jPqaWY/JlJMrkL1OzAbkJhxVEiT6UA8kDcoExsS x6cSFGoKfNRv0jysfoy9sifF1lW9K7WkrJ86xm7yj0UV+lSgUfK9iKdiVxSJ2Sr5Tw/c5NU7EZo ZBz/QsPUTELolwqc4iTFLzLmHYWQ= X-Received: by 2002:a5d:53d1:: with SMTP id a17mr29258087wrw.327.1576501907532; Mon, 16 Dec 2019 05:11:47 -0800 (PST) X-Google-Smtp-Source: APXvYqwuIcoQzrLz1xC87UatN3jXBE3T8LoVif4M67IAzWtqOxR+SyLrgYTkIoP4IoF7SSSnGn/e5g== X-Received: by 2002:a5d:53d1:: with SMTP id a17mr29258050wrw.327.1576501907281; Mon, 16 Dec 2019 05:11:47 -0800 (PST) Received: from ?IPv6:2001:b07:6468:f312:cde8:2463:95a9:1d81? ([2001:b07:6468:f312:cde8:2463:95a9:1d81]) by smtp.gmail.com with ESMTPSA id t190sm12609330wmt.44.2019.12.16.05.11.46 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 16 Dec 2019 05:11:46 -0800 (PST) To: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , qemu-devel@nongnu.org References: <20191213161753.8051-1-philmd@redhat.com> <20191213161753.8051-9-philmd@redhat.com> From: Paolo Bonzini Message-ID: <3e4ef8f0-4ccf-65c8-35ec-95bc6cf4e3d0@redhat.com> Date: Mon, 16 Dec 2019 14:11:45 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.1.1 MIME-Version: 1.0 In-Reply-To: <20191213161753.8051-9-philmd@redhat.com> Content-Language: en-US X-MC-Unique: lo9DSbgEMb6GgUNRsFopTQ-1 X-Mimecast-Spam-Score: 0 Subject: Re: [Xen-devel] [PATCH 08/12] hw/ide/piix: Use ARRAY_SIZE() instead of magic numbers X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Stefano Stabellini , Sergio Lopez , Eduardo Habkost , kvm@vger.kernel.org, Paul Durrant , "Michael S. Tsirkin" , Marcel Apfelbaum , xen-devel@lists.xenproject.org, Anthony Perard , Igor Mammedov , qemu-block@nongnu.org, John Snow , Richard Henderson Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" T24gMTMvMTIvMTkgMTc6MTcsIFBoaWxpcHBlIE1hdGhpZXUtRGF1ZMOpIHdyb3RlOgo+IFVzaW5n IG1hZ2ljIG51bWJlcnMgaXMgZGFuZ2Vyb3VzIGJlY2F1c2UgdGhlIHN0cnVjdHVyZXMgUENJSURF U3RhdGUKPiBtaWdodCBiZSBtb2RpZmllZCBhbmQgdGhpcyBzb3VyY2UgZmlsZSBjb25zdW1pbmcg dGhlICJpZGUvcGNpLmgiCj4gaGVhZGVyIHdvdWxkIGJlIG91dCBvZiBzeW5jLCBldmVudHVhbGx5 IGFjY2Vzc2luZyBvdXQgb2YgYm91bmQKPiBhcnJheSBtZW1iZXJzLgo+IFVzZSB0aGUgQVJSQVlf U0laRSgpIHRvIGtlZXAgdGhlIHNvdXJjZSBmaWxlIHN5bmMuCj4gCj4gU2lnbmVkLW9mZi1ieTog UGhpbGlwcGUgTWF0aGlldS1EYXVkw6kgPHBoaWxtZEByZWRoYXQuY29tPgo+IC0tLQo+ICBody9p ZGUvcGlpeC5jIHwgMjYgKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0KPiAgMSBmaWxlIGNoYW5n ZWQsIDExIGluc2VydGlvbnMoKyksIDE1IGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9o dy9pZGUvcGlpeC5jIGIvaHcvaWRlL3BpaXguYwo+IGluZGV4IGZmZWZmNGUwOTUuLmFiMjM2MTNh NDQgMTAwNjQ0Cj4gLS0tIGEvaHcvaWRlL3BpaXguYwo+ICsrKyBiL2h3L2lkZS9waWl4LmMKPiBA QCAtODcsMTAgKzg3LDkgQEAgc3RhdGljIGNvbnN0IE1lbW9yeVJlZ2lvbk9wcyBwaWl4X2JtZG1h X29wcyA9IHsKPiAgCj4gIHN0YXRpYyB2b2lkIGJtZG1hX3NldHVwX2JhcihQQ0lJREVTdGF0ZSAq ZCkKPiAgewo+IC0gICAgaW50IGk7Cj4gLQo+ICAgICAgbWVtb3J5X3JlZ2lvbl9pbml0KCZkLT5i bWRtYV9iYXIsIE9CSkVDVChkKSwgInBpaXgtYm1kbWEtY29udGFpbmVyIiwgMTYpOwo+IC0gICAg Zm9yKGkgPSAwO2kgPCAyOyBpKyspIHsKPiArCj4gKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8 IEFSUkFZX1NJWkUoZC0+Ym1kbWEpOyBpKyspIHsKPiAgICAgICAgICBCTURNQVN0YXRlICpibSA9 ICZkLT5ibWRtYVtpXTsKPiAgCj4gICAgICAgICAgbWVtb3J5X3JlZ2lvbl9pbml0X2lvKCZibS0+ ZXh0cmFfaW8sIE9CSkVDVChkKSwgJnBpaXhfYm1kbWFfb3BzLCBibSwKPiBAQCAtMTA3LDkgKzEw Niw4IEBAIHN0YXRpYyB2b2lkIHBpaXhfaWRlX3Jlc2V0KERldmljZVN0YXRlICpkZXYpCj4gICAg ICBQQ0lJREVTdGF0ZSAqZCA9IFBDSV9JREUoZGV2KTsKPiAgICAgIFBDSURldmljZSAqcGQgPSBQ Q0lfREVWSUNFKGQpOwo+ICAgICAgdWludDhfdCAqcGNpX2NvbmYgPSBwZC0+Y29uZmlnOwo+IC0g ICAgaW50IGk7Cj4gIAo+IC0gICAgZm9yIChpID0gMDsgaSA8IDI7IGkrKykgewo+ICsgICAgZm9y IChzaXplX3QgaSA9IDA7IGkgPCBBUlJBWV9TSVpFKGQtPmJ1cyk7IGkrKykgewo+ICAgICAgICAg IGlkZV9idXNfcmVzZXQoJmQtPmJ1c1tpXSk7Cj4gICAgICB9Cj4gIAo+IEBAIC0xMzIsMTAgKzEz MCwxMCBAQCBzdGF0aWMgdm9pZCBwY2lfcGlpeF9pbml0X3BvcnRzKFBDSUlERVN0YXRlICpkKSB7 Cj4gICAgICAgICAgezB4MWYwLCAweDNmNiwgMTR9LAo+ICAgICAgICAgIHsweDE3MCwgMHgzNzYs IDE1fSwKPiAgICAgIH07Cj4gLSAgICBpbnQgaTsKPiAgCj4gLSAgICBmb3IgKGkgPSAwOyBpIDwg MjsgaSsrKSB7Cj4gLSAgICAgICAgaWRlX2J1c19uZXcoJmQtPmJ1c1tpXSwgc2l6ZW9mKGQtPmJ1 c1tpXSksIERFVklDRShkKSwgaSwgMik7Cj4gKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IEFS UkFZX1NJWkUoZC0+YnVzKTsgaSsrKSB7Cj4gKyAgICAgICAgaWRlX2J1c19uZXcoJmQtPmJ1c1tp XSwgc2l6ZW9mKGQtPmJ1c1tpXSksIERFVklDRShkKSwgaSwKPiArICAgICAgICAgICAgICAgICAg ICBBUlJBWV9TSVpFKGQtPmJ1c1swXS5pZnMpKTsKPiAgICAgICAgICBpZGVfaW5pdF9pb3BvcnQo JmQtPmJ1c1tpXSwgTlVMTCwgcG9ydF9pbmZvW2ldLmlvYmFzZSwKPiAgICAgICAgICAgICAgICAg ICAgICAgICAgcG9ydF9pbmZvW2ldLmlvYmFzZTIpOwo+ICAgICAgICAgIGlkZV9pbml0MigmZC0+ YnVzW2ldLCBpc2FfZ2V0X2lycShOVUxMLCBwb3J0X2luZm9baV0uaXNhaXJxKSk7Cj4gQEAgLTE2 MywxNCArMTYxLDEzIEBAIHN0YXRpYyB2b2lkIHBjaV9waWl4X2lkZV9yZWFsaXplKFBDSURldmlj ZSAqZGV2LCBFcnJvciAqKmVycnApCj4gIAo+ICBpbnQgcGNpX3BpaXgzX3hlbl9pZGVfdW5wbHVn KERldmljZVN0YXRlICpkZXYsIGJvb2wgYXV4KQo+ICB7Cj4gLSAgICBQQ0lJREVTdGF0ZSAqcGNp X2lkZTsKPiArICAgIFBDSUlERVN0YXRlICpwY2lfaWRlID0gUENJX0lERShkZXYpOwo+ICAgICAg RHJpdmVJbmZvICpkaTsKPiAtICAgIGludCBpOwo+ICAgICAgSURFRGV2aWNlICppZGVkZXY7Cj4g KyAgICBjb25zdCBzaXplX3QgaWRlZGV2X21heCA9IEFSUkFZX1NJWkUocGNpX2lkZS0+YnVzKQo+ ICsgICAgICAgICAgICAgICAgICAgICAgICAgICAgKiBBUlJBWV9TSVpFKHBjaV9pZGUtPmJ1c1sw XS5pZnMpOwo+ICAKPiAtICAgIHBjaV9pZGUgPSBQQ0lfSURFKGRldik7Cj4gLQo+IC0gICAgZm9y IChpID0gYXV4ID8gMSA6IDA7IGkgPCA0OyBpKyspIHsKPiArICAgIGZvciAoc2l6ZV90IGkgPSBh dXggPyAxIDogMDsgaSA8IGlkZWRldl9tYXg7IGkrKykgewo+ICAgICAgICAgIGRpID0gZHJpdmVf Z2V0X2J5X2luZGV4KElGX0lERSwgaSk7Cj4gICAgICAgICAgaWYgKGRpICE9IE5VTEwgJiYgIWRp LT5tZWRpYV9jZCkgewo+ICAgICAgICAgICAgICBCbG9ja0JhY2tlbmQgKmJsayA9IGJsa19ieV9s ZWdhY3lfZGluZm8oZGkpOwo+IEBAIC0yMTAsOSArMjA3LDggQEAgUENJRGV2aWNlICpwY2lfcGlp eDNfeGVuX2lkZV9pbml0KFBDSUJ1cyAqYnVzLCBEcml2ZUluZm8gKipoZF90YWJsZSwgaW50IGRl dmZuKQo+ICBzdGF0aWMgdm9pZCBwY2lfcGlpeF9pZGVfZXhpdGZuKFBDSURldmljZSAqZGV2KQo+ ICB7Cj4gICAgICBQQ0lJREVTdGF0ZSAqZCA9IFBDSV9JREUoZGV2KTsKPiAtICAgIHVuc2lnbmVk IGk7Cj4gIAo+IC0gICAgZm9yIChpID0gMDsgaSA8IDI7ICsraSkgewo+ICsgICAgZm9yIChzaXpl X3QgaSA9IDA7IGkgPCBBUlJBWV9TSVpFKGQtPmJtZG1hKTsgKytpKSB7Cj4gICAgICAgICAgbWVt b3J5X3JlZ2lvbl9kZWxfc3VicmVnaW9uKCZkLT5ibWRtYV9iYXIsICZkLT5ibWRtYVtpXS5leHRy YV9pbyk7Cj4gICAgICAgICAgbWVtb3J5X3JlZ2lvbl9kZWxfc3VicmVnaW9uKCZkLT5ibWRtYV9i YXIsICZkLT5ibWRtYVtpXS5hZGRyX2lvcG9ydCk7Cj4gICAgICB9Cj4gCgpRdWV1ZWQsIHRoYW5r cy4KClBhb2xvCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcK aHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hlbi1kZXZlbA==