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=-11.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 8EF09C18E5B for ; Sun, 8 Mar 2020 07:57:31 +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 461B520663 for ; Sun, 8 Mar 2020 07:57:31 +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="jBduEFCS" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 461B520663 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]:55726 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAqoU-0001UB-FF for qemu-devel@archiver.kernel.org; Sun, 08 Mar 2020 03:57:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46356) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAqnZ-0000aV-Tu for qemu-devel@nongnu.org; Sun, 08 Mar 2020 03:56:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jAqnY-0001pY-5L for qemu-devel@nongnu.org; Sun, 08 Mar 2020 03:56:33 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:32112 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jAqnY-0001pH-0v for qemu-devel@nongnu.org; Sun, 08 Mar 2020 03:56:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583654191; 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=ynFyiQeM454w8E0H4H7s8WljySZMe1a49ecpNjlpYQM=; b=jBduEFCSbSM7apkct5yLuJDHd35hP+R0cUAZ8c+F2bHTWMofYgv+4AyZBeHgqciTG7dsAK USsD7mJVEqZG5oX+XUEvwZS04Xe/gp2awFZX65xroFlLlSJs2UgWWBIOMnIOSZtxwqHb+p RoZ+bJVFtpJBW+Ce09TnaeVvTjoo+Xw= Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-23-04fgkVpzMoqB3Ed0kXdICA-1; Sun, 08 Mar 2020 03:56:27 -0400 X-MC-Unique: 04fgkVpzMoqB3Ed0kXdICA-1 Received: by mail-qv1-f69.google.com with SMTP id u5so4618801qvj.10 for ; Sat, 07 Mar 2020 23:56:27 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=eNlNeV0cCqtLqdRwzb8GyuXIKo2c9XoG4YAsMmS1GFs=; b=E9nSpyuC9/Blu0ARjUlY6s+OBtIZ69506jTNAGMzO+ylLFykBbamSmYnRnzb0IRE1v Yy2/hjEJde4AIBSpyuTgsUVwxGFTN+DMSJDNg5ztgBvgwAK5fOolN2SSs0EC5fnnYmQN D2BV8ITLdgRIE15iNVPW8wJQxQm6BKoOXlUrr7wzyQxHSl0OL/YQ2B9PSkQRDUytmHvC 1NyNvn52E55H41Bom6RHoboYHTflG3mUI2XwhX4NawXhfbJAvCP63v2OMDOEwsD/w7J7 cGYA1YBtkcIBGeiIMqxXfhVCXE5E1JsAl2Xb4TAVhbU78ut4iEMB4A1YhZZlZUoMYEwQ RknA== X-Gm-Message-State: ANhLgQ3W9H8rkEFD2xC7z31ZnFYIb2V/uPC9nVzLM77OJKZqZ5cq4Ey6 XPqB1dMa+ZilC1fD/V0mWpehj7fStrK3qnLJ1eUx/gD+xeuGMVdDuac4Ug8yhnzziffZKgDVX8G po0sYEl0tJVOnBBY= X-Received: by 2002:a37:b902:: with SMTP id j2mr8192003qkf.247.1583654187091; Sat, 07 Mar 2020 23:56:27 -0800 (PST) X-Google-Smtp-Source: ADFU+vuID5MQrlw0vlf04kMS2QniRJdQNH+wTNGYgD6Nv71XEqwNm6ZQGuLqxsUZ0Nu+o3VWZWrGcw== X-Received: by 2002:a37:b902:: with SMTP id j2mr8191977qkf.247.1583654186728; Sat, 07 Mar 2020 23:56:26 -0800 (PST) Received: from redhat.com (bzq-79-178-2-19.red.bezeqint.net. [79.178.2.19]) by smtp.gmail.com with ESMTPSA id t55sm21320959qte.24.2020.03.07.23.56.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Mar 2020 23:56:26 -0800 (PST) Date: Sun, 8 Mar 2020 03:56:16 -0400 From: "Michael S. Tsirkin" To: Philippe =?iso-8859-1?Q?Mathieu-Daud=E9?= Subject: Re: [PATCH v2 2/2] misc: Replace zero-length arrays with flexible array member (manual) Message-ID: <20200308035558-mutt-send-email-mst@kernel.org> References: <20200304153816.23636-1-philmd@redhat.com> <20200304153816.23636-3-philmd@redhat.com> MIME-Version: 1.0 In-Reply-To: <20200304153816.23636-3-philmd@redhat.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 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: Fam Zheng , Peter Maydell , Paul Durrant , Jason Wang , qemu-devel@nongnu.org, Gerd Hoffmann , Stefano Stabellini , qemu-block@nongnu.org, David Hildenbrand , "Gustavo A . R . Silva" , Halil Pasic , Christian Borntraeger , "Gonglei \(Arei\)" , Anthony Perard , xen-devel@lists.xenproject.org, Thomas Huth , Eduardo Habkost , Yuval Shaia , =?iso-8859-1?Q?Marc-Andr=E9?= Lureau , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, Paolo Bonzini , John Snow , Richard Henderson , Kevin Wolf , Xiao Guangrong , Eric Auger , Cornelia Huck , Laurent Vivier , Max Reitz , Igor Mammedov Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Wed, Mar 04, 2020 at 04:38:16PM +0100, Philippe Mathieu-Daud=E9 wrote: > Description copied from Linux kernel commit from Gustavo A. R. Silva > (see [3]): >=20 > --v-- description start --v-- >=20 > The current codebase makes use of the zero-length array language > extension to the C90 standard, but the preferred mechanism to > declare variable-length types such as these ones is a flexible > array member [1], introduced in C99: >=20 > struct foo { > int stuff; > struct boo array[]; > }; >=20 > By making use of the mechanism above, we will get a compiler > warning in case the flexible array does not occur last in the > structure, which will help us prevent some kind of undefined > behavior bugs from being unadvertenly introduced [2] to the > Linux codebase from now on. >=20 > --^-- description end --^-- >=20 > Do the similar housekeeping in the QEMU codebase (which uses > C99 since commit 7be41675f7cb). >=20 > All these instances of code were found with the help of the > following command (then manual analysis, without modifying > structures only having a single flexible array member, such > QEDTable in block/qed.h): >=20 > git grep -F '[0];' >=20 > [1] https://gcc.gnu.org/onlinedocs/gcc/Zero-Length.html > [2] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/co= mmit/?id=3D76497732932f > [3] https://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git/= commit/?id=3D17642a2fbd2c1 >=20 > Inspired-by: Gustavo A. R. Silva > Reviewed-by: David Hildenbrand > Signed-off-by: Philippe Mathieu-Daud=E9 Reviewed-by: Michael S. Tsirkin > --- > v2: Do not modify block/qed.h: >=20 > block/qed.h:106:14: error: flexible array member 'offsets' not allowed = in otherwise empty struct > uint64_t offsets[]; /* in bytes */ > ^ > --- > docs/interop/vhost-user.rst | 4 ++-- > include/hw/acpi/acpi-defs.h | 4 ++-- > include/hw/boards.h | 2 +- > include/hw/s390x/event-facility.h | 2 +- > include/hw/s390x/sclp.h | 8 ++++---- > block/vmdk.c | 2 +- > hw/char/sclpconsole-lm.c | 2 +- > hw/char/sclpconsole.c | 2 +- > hw/s390x/virtio-ccw.c | 2 +- > target/s390x/ioinst.c | 2 +- > 10 files changed, 15 insertions(+), 15 deletions(-) >=20 > diff --git a/docs/interop/vhost-user.rst b/docs/interop/vhost-user.rst > index 401652397c..3b1b6602c7 100644 > --- a/docs/interop/vhost-user.rst > +++ b/docs/interop/vhost-user.rst > @@ -568,7 +568,7 @@ For split virtqueue, queue region can be implemented = as: > uint16_t used_idx; > =20 > /* Used to track the state of each descriptor in descriptor table = */ > - DescStateSplit desc[0]; > + DescStateSplit desc[]; > } QueueRegionSplit; > =20 > To track inflight I/O, the queue region should be processed as follows: > @@ -690,7 +690,7 @@ For packed virtqueue, queue region can be implemented= as: > uint8_t padding[7]; > =20 > /* Used to track the state of each descriptor fetched from descrip= tor ring */ > - DescStatePacked desc[0]; > + DescStatePacked desc[]; > } QueueRegionPacked; > =20 > To track inflight I/O, the queue region should be processed as follows: > diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h > index 19f7ba7b70..c13327fa78 100644 > --- a/include/hw/acpi/acpi-defs.h > +++ b/include/hw/acpi/acpi-defs.h > @@ -152,7 +152,7 @@ typedef struct AcpiSerialPortConsoleRedirection > */ > struct AcpiRsdtDescriptorRev1 { > ACPI_TABLE_HEADER_DEF /* ACPI common table header */ > - uint32_t table_offset_entry[0]; /* Array of pointers to other */ > + uint32_t table_offset_entry[]; /* Array of pointers to other */ > /* ACPI tables */ > } QEMU_PACKED; > typedef struct AcpiRsdtDescriptorRev1 AcpiRsdtDescriptorRev1; > @@ -162,7 +162,7 @@ typedef struct AcpiRsdtDescriptorRev1 AcpiRsdtDescrip= torRev1; > */ > struct AcpiXsdtDescriptorRev2 { > ACPI_TABLE_HEADER_DEF /* ACPI common table header */ > - uint64_t table_offset_entry[0]; /* Array of pointers to other */ > + uint64_t table_offset_entry[]; /* Array of pointers to other */ > /* ACPI tables */ > } QEMU_PACKED; > typedef struct AcpiXsdtDescriptorRev2 AcpiXsdtDescriptorRev2; > diff --git a/include/hw/boards.h b/include/hw/boards.h > index 9bc42dfb22..c96120d15f 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -71,7 +71,7 @@ typedef struct CPUArchId { > */ > typedef struct { > int len; > - CPUArchId cpus[0]; > + CPUArchId cpus[]; > } CPUArchIdList; > =20 > /** > diff --git a/include/hw/s390x/event-facility.h b/include/hw/s390x/event-f= acility.h > index bdc32a3c09..700a610f33 100644 > --- a/include/hw/s390x/event-facility.h > +++ b/include/hw/s390x/event-facility.h > @@ -122,7 +122,7 @@ typedef struct MDBO { > =20 > typedef struct MDB { > MdbHeader header; > - MDBO mdbo[0]; > + MDBO mdbo[]; > } QEMU_PACKED MDB; > =20 > typedef struct SclpMsg { > diff --git a/include/hw/s390x/sclp.h b/include/hw/s390x/sclp.h > index c54413b78c..cd7b24359f 100644 > --- a/include/hw/s390x/sclp.h > +++ b/include/hw/s390x/sclp.h > @@ -132,7 +132,7 @@ typedef struct ReadInfo { > uint16_t highest_cpu; > uint8_t _reserved5[124 - 122]; /* 122-123 */ > uint32_t hmfai; > - struct CPUEntry entries[0]; > + struct CPUEntry entries[]; > } QEMU_PACKED ReadInfo; > =20 > typedef struct ReadCpuInfo { > @@ -142,7 +142,7 @@ typedef struct ReadCpuInfo { > uint16_t nr_standby; /* 12-13 */ > uint16_t offset_standby; /* 14-15 */ > uint8_t reserved0[24-16]; /* 16-23 */ > - struct CPUEntry entries[0]; > + struct CPUEntry entries[]; > } QEMU_PACKED ReadCpuInfo; > =20 > typedef struct ReadStorageElementInfo { > @@ -151,7 +151,7 @@ typedef struct ReadStorageElementInfo { > uint16_t assigned; > uint16_t standby; > uint8_t _reserved0[16 - 14]; /* 14-15 */ > - uint32_t entries[0]; > + uint32_t entries[]; > } QEMU_PACKED ReadStorageElementInfo; > =20 > typedef struct AttachStorageElement { > @@ -159,7 +159,7 @@ typedef struct AttachStorageElement { > uint8_t _reserved0[10 - 8]; /* 8-9 */ > uint16_t assigned; > uint8_t _reserved1[16 - 12]; /* 12-15 */ > - uint32_t entries[0]; > + uint32_t entries[]; > } QEMU_PACKED AttachStorageElement; > =20 > typedef struct AssignStorage { > diff --git a/block/vmdk.c b/block/vmdk.c > index 20e909d997..8466051bc9 100644 > --- a/block/vmdk.c > +++ b/block/vmdk.c > @@ -187,7 +187,7 @@ typedef struct VmdkMetaData { > typedef struct VmdkGrainMarker { > uint64_t lba; > uint32_t size; > - uint8_t data[0]; > + uint8_t data[]; > } QEMU_PACKED VmdkGrainMarker; > =20 > enum { > diff --git a/hw/char/sclpconsole-lm.c b/hw/char/sclpconsole-lm.c > index c420dc066e..2b5f37b6a2 100644 > --- a/hw/char/sclpconsole-lm.c > +++ b/hw/char/sclpconsole-lm.c > @@ -31,7 +31,7 @@ > typedef struct OprtnsCommand { > EventBufferHeader header; > MDMSU message_unit; > - char data[0]; > + char data[]; > } QEMU_PACKED OprtnsCommand; > =20 > /* max size for line-mode data in 4K SCCB page */ > diff --git a/hw/char/sclpconsole.c b/hw/char/sclpconsole.c > index 1fa124dab9..5c7664905e 100644 > --- a/hw/char/sclpconsole.c > +++ b/hw/char/sclpconsole.c > @@ -25,7 +25,7 @@ > =20 > typedef struct ASCIIConsoleData { > EventBufferHeader ebh; > - char data[0]; > + char data[]; > } QEMU_PACKED ASCIIConsoleData; > =20 > /* max size for ASCII data in 4K SCCB page */ > diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c > index 50cf95b781..64f928fc7d 100644 > --- a/hw/s390x/virtio-ccw.c > +++ b/hw/s390x/virtio-ccw.c > @@ -193,7 +193,7 @@ typedef struct VirtioThinintInfo { > typedef struct VirtioRevInfo { > uint16_t revision; > uint16_t length; > - uint8_t data[0]; > + uint8_t data[]; > } QEMU_PACKED VirtioRevInfo; > =20 > /* Specify where the virtqueues for the subchannel are in guest memory. = */ > diff --git a/target/s390x/ioinst.c b/target/s390x/ioinst.c > index c437a1d8c6..0e840cc579 100644 > --- a/target/s390x/ioinst.c > +++ b/target/s390x/ioinst.c > @@ -347,7 +347,7 @@ typedef struct ChscResp { > uint16_t len; > uint16_t code; > uint32_t param; > - char data[0]; > + char data[]; > } QEMU_PACKED ChscResp; > =20 > #define CHSC_MIN_RESP_LEN 0x0008 > --=20 > 2.21.1