* [Qemu-devel] [PATCH] vhost-user-test: fix up rhel6 build
@ 2015-10-23 11:36 Michael S. Tsirkin
2015-10-24 0:39 ` Gonglei
0 siblings, 1 reply; 3+ messages in thread
From: Michael S. Tsirkin @ 2015-10-23 11:36 UTC (permalink / raw)
To: qemu-devel
Cc: Marcel Apfelbaum, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?=,
Yuanhan Liu, Gonglei
Build on RHEL6 fails:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=42875
Apparently unnamed unions couldn't use C99 named field initializers.
Let's just name the payload union field.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
tests/vhost-user-test.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c
index a74c934..b6dde75 100644
--- a/tests/vhost-user-test.c
+++ b/tests/vhost-user-test.c
@@ -98,7 +98,7 @@ typedef struct VhostUserMsg {
struct vhost_vring_state state;
struct vhost_vring_addr addr;
VhostUserMemory memory;
- };
+ } payload;
} QEMU_PACKED VhostUserMsg;
static VhostUserMsg m __attribute__ ((unused));
@@ -242,23 +242,23 @@ static void chr_read(void *opaque, const uint8_t *buf, int size)
case VHOST_USER_GET_FEATURES:
/* send back features to qemu */
msg.flags |= VHOST_USER_REPLY_MASK;
- msg.size = sizeof(m.u64);
- msg.u64 = 0x1ULL << VHOST_F_LOG_ALL |
+ msg.size = sizeof(m.payload.u64);
+ msg.payload.u64 = 0x1ULL << VHOST_F_LOG_ALL |
0x1ULL << VHOST_USER_F_PROTOCOL_FEATURES;
p = (uint8_t *) &msg;
qemu_chr_fe_write_all(chr, p, VHOST_USER_HDR_SIZE + msg.size);
break;
case VHOST_USER_SET_FEATURES:
- g_assert_cmpint(msg.u64 & (0x1ULL << VHOST_USER_F_PROTOCOL_FEATURES),
+ g_assert_cmpint(msg.payload.u64 & (0x1ULL << VHOST_USER_F_PROTOCOL_FEATURES),
!=, 0ULL);
break;
case VHOST_USER_GET_PROTOCOL_FEATURES:
/* send back features to qemu */
msg.flags |= VHOST_USER_REPLY_MASK;
- msg.size = sizeof(m.u64);
- msg.u64 = 1 << VHOST_USER_PROTOCOL_F_LOG_SHMFD;
+ msg.size = sizeof(m.payload.u64);
+ msg.payload.u64 = 1 << VHOST_USER_PROTOCOL_F_LOG_SHMFD;
p = (uint8_t *) &msg;
qemu_chr_fe_write_all(chr, p, VHOST_USER_HDR_SIZE + msg.size);
break;
@@ -266,15 +266,15 @@ static void chr_read(void *opaque, const uint8_t *buf, int size)
case VHOST_USER_GET_VRING_BASE:
/* send back vring base to qemu */
msg.flags |= VHOST_USER_REPLY_MASK;
- msg.size = sizeof(m.state);
- msg.state.num = 0;
+ msg.size = sizeof(m.payload.state);
+ msg.payload.state.num = 0;
p = (uint8_t *) &msg;
qemu_chr_fe_write_all(chr, p, VHOST_USER_HDR_SIZE + msg.size);
break;
case VHOST_USER_SET_MEM_TABLE:
/* received the mem table */
- memcpy(&s->memory, &msg.memory, sizeof(msg.memory));
+ memcpy(&s->memory, &msg.payload.memory, sizeof(msg.payload.memory));
s->fds_num = qemu_chr_fe_get_msgfds(chr, s->fds, G_N_ELEMENTS(s->fds));
/* signal the test that it can continue */
--
MST
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] vhost-user-test: fix up rhel6 build
2015-10-23 11:36 [Qemu-devel] [PATCH] vhost-user-test: fix up rhel6 build Michael S. Tsirkin
@ 2015-10-24 0:39 ` Gonglei
2015-10-24 15:54 ` Michael S. Tsirkin
0 siblings, 1 reply; 3+ messages in thread
From: Gonglei @ 2015-10-24 0:39 UTC (permalink / raw)
To: Michael S. Tsirkin, qemu-devel
Cc: Marcel Apfelbaum, Marc-André Lureau, Yuanhan Liu
On 2015/10/23 19:36, Michael S. Tsirkin wrote:
> Build on RHEL6 fails:
> https://gcc.gnu.org/bugzilla/show_bug.cgi?id=42875
>
> Apparently unnamed unions couldn't use C99 named field initializers.
> Let's just name the payload union field.
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> tests/vhost-user-test.c | 18 +++++++++---------
> 1 file changed, 9 insertions(+), 9 deletions(-)
Reviewed-by: Gonglei <arei.gonglei@huawei.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] vhost-user-test: fix up rhel6 build
2015-10-24 0:39 ` Gonglei
@ 2015-10-24 15:54 ` Michael S. Tsirkin
0 siblings, 0 replies; 3+ messages in thread
From: Michael S. Tsirkin @ 2015-10-24 15:54 UTC (permalink / raw)
To: Gonglei; +Cc: Marcel Apfelbaum, Marc-André Lureau, Yuanhan Liu, qemu-devel
On Sat, Oct 24, 2015 at 08:39:46AM +0800, Gonglei wrote:
> On 2015/10/23 19:36, Michael S. Tsirkin wrote:
> > Build on RHEL6 fails:
> > https://gcc.gnu.org/bugzilla/show_bug.cgi?id=42875
> >
> > Apparently unnamed unions couldn't use C99 named field initializers.
> > Let's just name the payload union field.
> >
> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> > ---
> > tests/vhost-user-test.c | 18 +++++++++---------
> > 1 file changed, 9 insertions(+), 9 deletions(-)
>
> Reviewed-by: Gonglei <arei.gonglei@huawei.com>
Tested-by would have more value :)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-10-24 15:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-23 11:36 [Qemu-devel] [PATCH] vhost-user-test: fix up rhel6 build Michael S. Tsirkin
2015-10-24 0:39 ` Gonglei
2015-10-24 15:54 ` Michael S. Tsirkin
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.