[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[qemu-s390x] [RFC 04/15] s390-bios: Extend find_dev() for non-virtio dev
From: |
Jason J. Herne |
Subject: |
[qemu-s390x] [RFC 04/15] s390-bios: Extend find_dev() for non-virtio devices |
Date: |
Thu, 5 Jul 2018 13:25:32 -0400 |
From: "Jason J. Herne" <address@hidden>
We need a method for finding the subchannel of a dasd device. Let's
modify find_dev to handle this since it mostly does what we need. Up to
this point find_dev has been specific to only virtio devices.
Signed-off-by: Jason J. Herne <address@hidden>
Acked-by: Halil Pasic <address@hidden>
Signed-off-by: Jason J. Herne <address@hidden>
---
pc-bios/s390-ccw/main.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c
index 8ecab93..30f847f 100644
--- a/pc-bios/s390-ccw/main.c
+++ b/pc-bios/s390-ccw/main.c
@@ -49,6 +49,12 @@ unsigned int get_loadparm_index(void)
return atoui(loadparm_str);
}
+/*
+ * Find the subchannel connected to the given device (dev_no) and fill in the
+ * subchannel information block (schib) with the connected subchannel's info.
+ * NOTE: The global variable blk_schid is updated to contain the subchannel
+ * information.
+ */
static bool find_dev(Schib *schib, int dev_no)
{
int i, r;
@@ -62,15 +68,15 @@ static bool find_dev(Schib *schib, int dev_no)
if (!schib->pmcw.dnv) {
continue;
}
- if (!virtio_is_supported(blk_schid)) {
- continue;
- }
+
/* Skip net devices since no IPLB is created and therefore no
- * no network bootloader has been loaded
+ * network bootloader has been loaded
*/
- if (virtio_get_device_type() == VIRTIO_ID_NET && dev_no < 0) {
+ if (virtio_is_supported(blk_schid) &&
+ virtio_get_device_type() == VIRTIO_ID_NET && dev_no < 0) {
continue;
}
+
if ((dev_no < 0) || (schib->pmcw.dev == dev_no)) {
return true;
}
--
2.7.4
- Re: [qemu-s390x] [RFC 14/15] s390-bios: Support booting from real dasd device, (continued)
Re: [qemu-s390x] [Qemu-devel] [RFC 14/15] s390-bios: Support booting from real dasd device, Halil Pasic, 2018/07/18
[qemu-s390x] [RFC 05/15] s390-bios: Factor finding boot device out of virtio code path, Jason J. Herne, 2018/07/05
[qemu-s390x] [RFC 04/15] s390-bios: Extend find_dev() for non-virtio devices,
Jason J. Herne <=
[qemu-s390x] [RFC 07/15] s390-bios: Decouple channel i/o logic from virtio, Jason J. Herne, 2018/07/05
Re: [qemu-s390x] [Qemu-devel] [RFC 00/15] s390: vfio-ccw dasd ipl support, no-reply, 2018/07/05
Re: [qemu-s390x] [RFC 00/15] s390: vfio-ccw dasd ipl support, Cornelia Huck, 2018/07/06