On 27/01/2026 17.15, [email protected] wrote:
From: Jared Rossi <[email protected]>
The schid is already stored as an attribute of the VDev itself and any other
instances are copies of this same value. To avoid CCW specific attributes in
the VRing let's just access the existing VDev schid attribute as needed.
Signed-off-by: Jared Rossi <[email protected]>
---
pc-bios/s390-ccw/virtio-blkdev.c | 2 +-
pc-bios/s390-ccw/virtio-net.c | 2 +-
pc-bios/s390-ccw/virtio.c | 9 ++++-----
pc-bios/s390-ccw/virtio.h | 3 +--
4 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/pc-bios/s390-ccw/virtio-blkdev.c b/pc-bios/s390-ccw/virtio-blkdev.c
index 4b819dd80f..019c2718b1 100644
--- a/pc-bios/s390-ccw/virtio-blkdev.c
+++ b/pc-bios/s390-ccw/virtio-blkdev.c
@@ -42,7 +42,7 @@ static int virtio_blk_read_many(VDev *vdev, unsigned long
sector, void *load_add
/* Now we can tell the host to read */
vring_wait_reply();
- if (drain_irqs(vr->schid)) {
+ if (drain_irqs()) {
/* Well, whatever status is supposed to contain... */
status = 1;
}
Just a thought: Maybe we should rather get rid of the global access to the
"vdev" in the long run (in case we ever want to deal with multiple devices
at once), so it might be nicer to add a "VDev *vdev" parameter to the
drain_irqs() function now instead of making its parameter list "void".
Anyway, it's just a thought, we can also still tackle this later if needed,
so I'm also fine with this patch as it:
Reviewed-by: Thomas Huth <[email protected]>
