openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

vhost-user-test: fix up rhel6 build 

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>
This commit is contained in:
Michael S. Tsirkin 2015-10-22 22:28:37 +03:00
parent 7fc0246c07
commit 12ebf69083
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/vhost-user-test.c
View File

@ -98,7 +98,7 @@ typedef struct VhostUserMsg {
struct vhost_vring_state state; struct vhost_vring_state state;
struct vhost_vring_addr addr; struct vhost_vring_addr addr;
VhostUserMemory memory; VhostUserMemory memory;
}; } payload;
} QEMU_PACKED VhostUserMsg; } QEMU_PACKED VhostUserMsg;
static VhostUserMsg m __attribute__ ((unused)); 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: case VHOST_USER_GET_FEATURES:
/* send back features to qemu */ /* send back features to qemu */
msg.flags |= VHOST_USER_REPLY_MASK; msg.flags |= VHOST_USER_REPLY_MASK;
msg.size = sizeof(m.u64); msg.size = sizeof(m.payload.u64);
msg.u64 = 0x1ULL << VHOST_F_LOG_ALL | msg.payload.u64 = 0x1ULL << VHOST_F_LOG_ALL |
0x1ULL << VHOST_USER_F_PROTOCOL_FEATURES; 0x1ULL << VHOST_USER_F_PROTOCOL_FEATURES;
p = (uint8_t *) &msg; p = (uint8_t *) &msg;
qemu_chr_fe_write_all(chr, p, VHOST_USER_HDR_SIZE + msg.size); qemu_chr_fe_write_all(chr, p, VHOST_USER_HDR_SIZE + msg.size);
break; break;
case VHOST_USER_SET_FEATURES: 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); !=, 0ULL);
break; break;
case VHOST_USER_GET_PROTOCOL_FEATURES: case VHOST_USER_GET_PROTOCOL_FEATURES:
/* send back features to qemu */ /* send back features to qemu */
msg.flags |= VHOST_USER_REPLY_MASK; msg.flags |= VHOST_USER_REPLY_MASK;
msg.size = sizeof(m.u64); msg.size = sizeof(m.payload.u64);
msg.u64 = 1 << VHOST_USER_PROTOCOL_F_LOG_SHMFD; msg.payload.u64 = 1 << VHOST_USER_PROTOCOL_F_LOG_SHMFD;
p = (uint8_t *) &msg; p = (uint8_t *) &msg;
qemu_chr_fe_write_all(chr, p, VHOST_USER_HDR_SIZE + msg.size); qemu_chr_fe_write_all(chr, p, VHOST_USER_HDR_SIZE + msg.size);
break; break;
@ -266,15 +266,15 @@ static void chr_read(void *opaque, const uint8_t *buf, int size)
case VHOST_USER_GET_VRING_BASE: case VHOST_USER_GET_VRING_BASE:
/* send back vring base to qemu */ /* send back vring base to qemu */
msg.flags |= VHOST_USER_REPLY_MASK; msg.flags |= VHOST_USER_REPLY_MASK;
msg.size = sizeof(m.state); msg.size = sizeof(m.payload.state);
msg.state.num = 0; msg.payload.state.num = 0;
p = (uint8_t *) &msg; p = (uint8_t *) &msg;
qemu_chr_fe_write_all(chr, p, VHOST_USER_HDR_SIZE + msg.size); qemu_chr_fe_write_all(chr, p, VHOST_USER_HDR_SIZE + msg.size);
break; break;
case VHOST_USER_SET_MEM_TABLE: case VHOST_USER_SET_MEM_TABLE:
/* received the 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)); s->fds_num = qemu_chr_fe_get_msgfds(chr, s->fds, G_N_ELEMENTS(s->fds));
/* signal the test that it can continue */ /* signal the test that it can continue */