[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/2] virtio-ccw: assure BE accesses
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PATCH 1/2] virtio-ccw: assure BE accesses |
Date: |
Wed, 11 Mar 2015 10:57:50 +0100 |
All fields in structures transmitted by ccws are big endian; assure
we handle them as such.
Reviewed-by: Thomas Huth <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
hw/s390x/virtio-ccw.c | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
index 8b6b2ab..60f8a14 100644
--- a/hw/s390x/virtio-ccw.c
+++ b/hw/s390x/virtio-ccw.c
@@ -589,7 +589,7 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw)
if (!ccw.cda) {
ret = -EFAULT;
} else {
- indicators = ldq_phys(&address_space_memory, ccw.cda);
+ indicators = ldq_be_phys(&address_space_memory, ccw.cda);
dev->indicators = get_indicator(indicators, sizeof(uint64_t));
sch->curr_status.scsw.count = ccw.count - sizeof(indicators);
ret = 0;
@@ -609,7 +609,7 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw)
if (!ccw.cda) {
ret = -EFAULT;
} else {
- indicators = ldq_phys(&address_space_memory, ccw.cda);
+ indicators = ldq_be_phys(&address_space_memory, ccw.cda);
dev->indicators2 = get_indicator(indicators, sizeof(uint64_t));
sch->curr_status.scsw.count = ccw.count - sizeof(indicators);
ret = 0;
@@ -629,11 +629,11 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw)
if (!ccw.cda) {
ret = -EFAULT;
} else {
- vq_config.index = lduw_phys(&address_space_memory, ccw.cda);
+ vq_config.index = lduw_be_phys(&address_space_memory, ccw.cda);
vq_config.num_max = virtio_queue_get_num(vdev,
vq_config.index);
- stw_phys(&address_space_memory,
- ccw.cda + sizeof(vq_config.index), vq_config.num_max);
+ stw_be_phys(&address_space_memory,
+ ccw.cda + sizeof(vq_config.index), vq_config.num_max);
sch->curr_status.scsw.count = ccw.count - sizeof(vq_config);
ret = 0;
}
@@ -661,13 +661,17 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw)
if (!thinint) {
ret = -EFAULT;
} else {
+ uint64_t ind_bit = ldq_be_p(&thinint->ind_bit);
+
len = hw_len;
dev->summary_indicator =
- get_indicator(thinint->summary_indicator, sizeof(uint8_t));
- dev->indicators = get_indicator(thinint->device_indicator,
- thinint->ind_bit / 8 + 1);
+ get_indicator(ldq_be_p(&thinint->summary_indicator),
+ sizeof(uint8_t));
+ dev->indicators =
+ get_indicator(ldq_be_p(&thinint->device_indicator),
+ ind_bit / 8 + 1);
dev->thinint_isc = thinint->isc;
- dev->routes.adapter.ind_offset = thinint->ind_bit;
+ dev->routes.adapter.ind_offset = ind_bit;
dev->routes.adapter.summary_offset = 7;
cpu_physical_memory_unmap(thinint, hw_len, 0, hw_len);
ret = css_register_io_adapter(CSS_IO_ADAPTER_VIRTIO,
--
2.1.4
- [Qemu-devel] [PATCH] virtio: avoid leading underscores for helpers, Cornelia Huck, 2015/03/10
- Re: [Qemu-devel] [PATCH] virtio: avoid leading underscores for helpers, Michael S. Tsirkin, 2015/03/10
- Re: [Qemu-devel] [PATCH] virtio: avoid leading underscores for helpers, Cornelia Huck, 2015/03/10
- Re: [Qemu-devel] [PATCH] virtio: avoid leading underscores for helpers, Michael S. Tsirkin, 2015/03/10
- Re: [Qemu-devel] [PATCH] virtio: avoid leading underscores for helpers, Cornelia Huck, 2015/03/10
- Re: [Qemu-devel] [PATCH] virtio: avoid leading underscores for helpers, Michael S. Tsirkin, 2015/03/10
- Re: [Qemu-devel] [PATCH] virtio: avoid leading underscores for helpers, Cornelia Huck, 2015/03/10
- [Qemu-devel] [PATCH] virtio: legacy features callback, Cornelia Huck, 2015/03/10
- [Qemu-devel] [PATCH 0/2] virtio-ccw: be accesses, Cornelia Huck, 2015/03/11
- [Qemu-devel] [PATCH 1/2] virtio-ccw: assure BE accesses,
Cornelia Huck <=
- Re: [Qemu-devel] [PATCH 1/2] virtio-ccw: assure BE accesses, Cornelia Huck, 2015/03/13
- [Qemu-devel] [PATCH 2/2] virtio-ccw: assure be accesses for set-revision, Cornelia Huck, 2015/03/11
- Re: [Qemu-devel] [PATCH 2/2] virtio-ccw: assure be accesses for set-revision, Thomas Huth, 2015/03/11