aboutsummaryrefslogtreecommitdiff
path: root/tests/virtio-9p-test.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-03-27 18:59:04 +0100
committerGreg Kurz <groug@kaod.org>2017-03-27 21:15:31 +0200
commit34ef723ce34aaa14f94530c06a0ab3170a19bb59 (patch)
tree85a23ddd9e52365fb6978f0548f0b72396ecfad0 /tests/virtio-9p-test.c
parentd63fb193e71644a073b77ff5ac6f1216f2f6cf6e (diff)
downloadqemu-34ef723ce34aaa14f94530c06a0ab3170a19bb59.zip
qemu-34ef723ce34aaa14f94530c06a0ab3170a19bb59.tar.gz
qemu-34ef723ce34aaa14f94530c06a0ab3170a19bb59.tar.bz2
tests/virtio-9p-test: Don't call le*_to_cpus on fields of packed struct
For a packed struct like 'P9Hdr' the fields within it may not be aligned as much as the natural alignment for their types. This means it is not valid to pass the address of such a field to a function like le32_to_cpus() which operate on uint32_t* and assume alignment. Doing this results in a SIGBUS on hosts like SPARC which have strict alignment requirements. Use ldl_le_p() instead, which is specified to correctly handle unaligned pointers. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Greg Kurz <groug@kaod.org> Signed-off-by: Greg Kurz <groug@kaod.org>
Diffstat (limited to 'tests/virtio-9p-test.c')
-rw-r--r--tests/virtio-9p-test.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/virtio-9p-test.c b/tests/virtio-9p-test.c
index 43a1ad8..ad33d96 100644
--- a/tests/virtio-9p-test.c
+++ b/tests/virtio-9p-test.c
@@ -256,8 +256,8 @@ static void v9fs_req_recv(P9Req *req, uint8_t id)
qvirtio_wait_queue_isr(v9p->dev, v9p->vq, 1000 * 1000);
v9fs_memread(req, &hdr, 7);
- le32_to_cpus(&hdr.size);
- le16_to_cpus(&hdr.tag);
+ hdr.size = ldl_le_p(&hdr.size);
+ hdr.tag = lduw_le_p(&hdr.tag);
if (hdr.size >= 7) {
break;
}