From: "Michael S. Tsirkin" <mst@redhat.com>
To: David Howells <dhowells@redhat.com>
Cc: linux-api@vger.kernel.org,
virtualization@lists.linux-foundation.org,
linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org
Subject: Re: [PATCH 03/11] UAPI: virtio_net: Fix use of C++ keywords as structural members [ver #2]
Date: Thu, 6 Sep 2018 11:02:04 -0400 [thread overview]
Message-ID: <20180906104208-mutt-send-email-mst__27537.3450866484$1536246004$gmane$org@kernel.org> (raw)
In-Reply-To: <153622552270.14298.14568295161017777604.stgit@warthog.procyon.org.uk>
On Thu, Sep 06, 2018 at 10:18:42AM +0100, David Howells wrote:
> The virtio_net_ctrl_hdr struct uses a C++ keyword as structural members. Fix
> this by inserting an anonymous union that provides an alternative name and
> then hide the reserved name in C++.
>
> Signed-off-by: David Howells <dhowells@redhat.com>
> cc: "Michael S. Tsirkin" <mst@redhat.com>
> cc: Jason Wang <jasowang@redhat.com>
> cc: virtualization@lists.linux-foundation.org
> ---
>
> include/uapi/linux/virtio_net.h | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/include/uapi/linux/virtio_net.h b/include/uapi/linux/virtio_net.h
> index a3715a3224c1..967142bc0e05 100644
> --- a/include/uapi/linux/virtio_net.h
> +++ b/include/uapi/linux/virtio_net.h
> @@ -150,7 +150,12 @@ struct virtio_net_hdr_mrg_rxbuf {
> * command goes in between.
> */
> struct virtio_net_ctrl_hdr {
> - __u8 class;
> + union {
> +#ifndef __cplusplus
> + __u8 class;
> +#endif
> + __u8 _class;
> + };
> __u8 cmd;
> } __attribute__((packed));
>
So if we are going to do this, I think I'd prefer something like:
struct virtio_net_ctrl_hdr_v2 {
__u8 cmd_class;
__u8 cmd;
};
And then hide the whole old structure. This also gets rid of the packed
keyword which we don't really need here.
Only issue is virtio_net_ctrl_hdr_v2 is ugly. But oh well.
And then rework at least QEMU to use the v2 of the header.
Quite a bit of churn, so I don't think it makes sense to apply just this
one in isolation - only if rest of the changes go in.
--
MST
next prev parent reply other threads:[~2018-09-06 15:02 UTC|newest]
Thread overview: 124+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-06 9:18 [RFC] UAPI: Check headers by compiling all together as C++ David Howells
2018-09-06 9:18 ` David Howells
2018-09-06 9:18 ` David Howells
2018-09-06 9:18 ` David Howells
2018-09-06 9:18 ` David Howells
[not found] ` <153622549721.14298.8116794954073122489.stgit-S6HVgzuS8uM4Awkfq6JHfwNdhmdF6hFW@public.gmane.org>
2018-09-06 9:18 ` [PATCH 01/11] UAPI: drm: Fix use of C++ keywords as structural members [ver #2] David Howells
2018-09-06 9:18 ` David Howells
2018-09-06 9:18 ` [PATCH 02/11] UAPI: keys: " David Howells
2018-09-06 9:18 ` David Howells
2018-09-06 9:18 ` [PATCH 03/11] UAPI: virtio_net: " David Howells
2018-09-06 15:02 ` Michael S. Tsirkin
2018-09-06 15:02 ` Michael S. Tsirkin [this message]
2018-09-06 9:18 ` David Howells
2018-09-06 9:18 ` [PATCH 04/11] UAPI: bcache: Fix use of embedded flexible array " David Howells
2018-09-06 9:18 ` [PATCH 05/11] UAPI: coda: Move kernel internals out of public view " David Howells
2018-09-06 9:18 ` David Howells
2018-09-06 9:19 ` [PATCH 06/11] coda: Move internal defs out of include/linux/ " David Howells
2018-09-06 9:19 ` [PATCH 07/11] UAPI: netfilter: Fix symbol collision issues " David Howells
2018-09-10 17:32 ` kbuild test robot
2018-09-10 17:32 ` kbuild test robot
2018-09-10 17:32 ` kbuild test robot
2018-09-28 13:07 ` [netfilter-core] " Pablo Neira Ayuso
2018-10-09 15:35 ` David Howells
2018-09-06 9:19 ` [PATCH 08/11] UAPI: nilfs2: Fix use of undefined byteswapping functions " David Howells
2018-09-06 9:19 ` [PATCH 09/11] UAPI: ndctl: Fix g++-unsupported initialisation in headers " David Howells
2018-09-06 9:19 ` David Howells
2018-09-06 9:19 ` David Howells
2018-09-25 20:22 ` Dan Williams
2018-09-25 20:22 ` Dan Williams
2018-09-25 20:22 ` Dan Williams
2018-09-06 9:19 ` [PATCH 10/11] UAPI: ndctl: Remove use of PAGE_SIZE " David Howells
2018-09-06 9:19 ` David Howells
2018-09-06 9:19 ` David Howells
2018-09-25 20:17 ` Dan Williams
2018-09-25 20:17 ` Dan Williams
2018-09-25 20:17 ` Dan Williams
2018-10-09 15:36 ` David Howells
2018-10-09 15:36 ` David Howells
2018-09-06 9:19 ` [PATCH 11/11] UAPI: Check headers build for C++ " David Howells
2018-09-10 16:26 ` kbuild test robot
2018-09-10 16:26 ` kbuild test robot
2018-09-10 16:26 ` kbuild test robot
2018-09-10 17:02 ` kbuild test robot
2018-09-10 17:02 ` kbuild test robot
2018-09-10 17:02 ` kbuild test robot
2018-09-14 9:10 ` Arnd Bergmann
-- strict thread matches above, loose matches on Subject: below --
2018-09-05 15:54 [RFC] UAPI: Check headers by compiling all together as C++ David Howells
2018-09-05 15:54 ` David Howells
2018-09-05 15:54 ` David Howells
2018-09-05 15:54 ` David Howells
2018-09-05 15:54 ` David Howells
2018-09-05 15:54 ` [PATCH 01/11] UAPI: drm: Fix use of C++ keywords as structural members David Howells
2018-09-05 15:54 ` David Howells
2018-09-05 15:54 ` [PATCH 02/11] UAPI: keys: " David Howells
2018-09-05 15:54 ` David Howells
2018-09-05 15:54 ` [PATCH 03/11] UAPI: virtio_net: " David Howells
2018-09-05 16:54 ` Greg KH
2018-09-05 16:54 ` Greg KH
2018-09-05 17:15 ` David Howells
2018-09-05 17:15 ` David Howells
2018-09-05 17:35 ` Michael S. Tsirkin
2018-09-05 17:35 ` Michael S. Tsirkin
2018-09-06 7:09 ` David Howells
2018-09-06 7:09 ` David Howells
2018-09-06 14:36 ` Michael S. Tsirkin
2018-09-06 14:36 ` Michael S. Tsirkin
2018-09-05 15:54 ` David Howells
2018-09-05 15:55 ` [PATCH 04/11] UAPI: bcache: Fix use of embedded flexible array David Howells
2018-10-02 14:52 ` Jan Engelhardt
2018-10-09 15:41 ` David Howells
2018-10-09 16:54 ` Jan Engelhardt
2018-09-05 15:55 ` [PATCH 05/11] UAPI: coda: Don't use internal kernel structs in UAPI David Howells
2018-09-05 16:54 ` Jan Harkes
2018-09-05 17:12 ` Yann Droneaud
2018-09-05 17:28 ` Jan Harkes
2018-09-05 17:28 ` Jan Harkes
2018-09-05 17:24 ` David Howells
2018-09-06 7:13 ` David Howells
2018-09-06 11:52 ` Yann Droneaud
2018-09-06 12:16 ` Jan Harkes
2018-09-06 12:16 ` Jan Harkes
2018-09-06 14:53 ` David Howells
2018-09-05 15:55 ` [PATCH 06/11] UAPI: netfilter: Fix symbol collision issues David Howells
2018-09-05 15:55 ` [PATCH 07/11] UAPI: nilfs2: Fix use of undefined byteswapping functions David Howells
2018-09-05 22:20 ` Al Viro
2018-09-05 15:55 ` [PATCH 08/11] UAPI: sound: Fix use of u32 and co. in UAPI headers David Howells
2018-09-05 15:55 ` David Howells
2018-09-06 5:59 ` Takashi Sakamoto
2018-09-06 5:59 ` Takashi Sakamoto
2018-09-06 8:17 ` David Howells
2018-09-05 15:55 ` [PATCH 09/11] UAPI: ndctl: Fix g++-unsupported initialisation in headers David Howells
2018-09-05 15:55 ` David Howells
2018-09-05 15:55 ` David Howells
2018-09-05 15:55 ` [PATCH 10/11] UAPI: ndctl: Remove use of PAGE_SIZE David Howells
2018-09-05 15:55 ` David Howells
2018-09-05 15:55 ` [PATCH 11/11] UAPI: Check headers build for C++ David Howells
2018-09-05 16:55 ` [RFC] UAPI: Check headers by compiling all together as C++ Greg KH
2018-09-05 16:55 ` Greg KH
2018-09-05 16:55 ` Greg KH
2018-09-05 16:55 ` Greg KH
2018-09-05 16:55 ` Greg KH
2018-09-05 17:33 ` Yann Droneaud
2018-09-05 17:33 ` Yann Droneaud
2018-09-05 17:33 ` Yann Droneaud
2018-09-05 17:33 ` Yann Droneaud
2018-09-05 17:42 ` Michael S. Tsirkin
2018-09-05 17:42 ` Michael S. Tsirkin
2018-09-05 17:42 ` Michael S. Tsirkin
2018-09-05 17:42 ` Michael S. Tsirkin
2018-09-05 17:42 ` Michael S. Tsirkin
2018-09-05 17:42 ` Michael S. Tsirkin
2018-09-05 17:42 ` Michael S. Tsirkin
2018-09-06 7:12 ` Yann Droneaud
2018-09-06 7:12 ` Yann Droneaud
2018-09-06 7:12 ` Yann Droneaud
2018-09-06 7:12 ` Yann Droneaud
2018-09-05 19:22 ` Jan Engelhardt
2018-09-05 19:22 ` Jan Engelhardt
2018-09-05 19:22 ` Jan Engelhardt
2018-09-05 19:22 ` Jan Engelhardt
2018-09-05 19:22 ` Jan Engelhardt
2018-09-05 17:50 ` David Howells
2018-09-05 17:50 ` David Howells
2018-09-05 17:50 ` David Howells
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='20180906104208-mutt-send-email-mst__27537.3450866484$1536246004$gmane$org@kernel.org' \
--to=mst@redhat.com \
--cc=dhowells@redhat.com \
--cc=linux-api@vger.kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=virtualization@lists.linux-foundation.org \
--subject='Re: [PATCH 03/11] UAPI: virtio_net: Fix use of C++ keywords as structural members [ver #2]' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.