diff options
| -rw-r--r-- | tools/blktap2/drivers/tapdisk-vbd.c | 2 | ||||
| -rw-r--r-- | xen/include/public/io/ring.h | 12 |
2 files changed, 11 insertions, 3 deletions
diff --git a/tools/blktap2/drivers/tapdisk-vbd.c b/tools/blktap2/drivers/tapdisk-vbd.c index e6d18594ce..41425e2d83 100644 --- a/tools/blktap2/drivers/tapdisk-vbd.c +++ b/tools/blktap2/drivers/tapdisk-vbd.c @@ -1684,7 +1684,7 @@ tapdisk_vbd_check_ring_message(td_vbd_t *vbd) if (!vbd->ring.sring) return -EINVAL; - switch (vbd->ring.sring->pad[0]) { + switch (vbd->ring.sring->private.tapif_user.msg) { case 0: return 0; diff --git a/xen/include/public/io/ring.h b/xen/include/public/io/ring.h index 0880b1c52e..0c01339722 100644 --- a/xen/include/public/io/ring.h +++ b/xen/include/public/io/ring.h @@ -103,8 +103,16 @@ union __name##_sring_entry { \ struct __name##_sring { \ RING_IDX req_prod, req_event; \ RING_IDX rsp_prod, rsp_event; \ - uint8_t netfront_smartpoll_active; \ - uint8_t pad[47]; \ + union { \ + struct { \ + uint8_t smartpoll_active; \ + } netif; \ + struct { \ + uint8_t msg; \ + } tapif_user; \ + uint8_t pvt_pad[4]; \ + } private; \ + uint8_t pad[44]; \ union __name##_sring_entry ring[1]; /* variable-length */ \ }; \ \ |