pc-bios/s390-ccw: Fix misattributed function prototypes
The virtio-blkdev functions are incorrectly listed in s390-ccw.h as belonging to virtio.c. Additionally, virtio_load_direct() has an unused subchan_id argument. Remove the unused argument and move the prototypes to virtio.h so that they are independent from the CCW bus. Reviewed-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Eric Farman <farman@linux.ibm.com> Reviewed-by: Farhan Ali <alifm@linux.ibm.com> Signed-off-by: Jared Rossi <jrossi@linux.ibm.com> Message-ID: <20260309003601.242634-2-jrossi@linux.ibm.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
Jared Rossi committed
Mar 8, 2026 at 20:35 UTC
1ef532cbcfc3c84395ef31f022f44cb48dec8123
4 files changed
+9
-6
pc-bios/s390-ccw/bootmap.c
+1
-1
@@ -662,7 +662,7 @@ static int zipl_load_segment(ComponentEntry *entry)
662
*/
663
break;
664
}
665
- address = virtio_load_direct(cur_desc[0], cur_desc[1], 0,
665
+ address = virtio_load_direct(cur_desc[0], cur_desc[1],
666
(void *)address);
667
if (!address) {
668
puts("zIPL load segment failed");
pc-bios/s390-ccw/s390-ccw.h
-4
@@ -67,11 +67,7 @@ void sclp_get_loadparm_ascii(char *loadparm);
67
int sclp_read(char *str, size_t count);
68
69
/* virtio.c */
70
-unsigned long virtio_load_direct(unsigned long rec_list1, unsigned long rec_list2,
71
- unsigned long subchan_id, void *load_addr);
70
bool virtio_is_supported(SubChannelId schid);
73
-int virtio_blk_setup_device(SubChannelId schid);
74
-int virtio_read(unsigned long sector, void *load_addr);
71
72
/* bootmap.c */
73
void zipl_load(void);
pc-bios/s390-ccw/virtio-blkdev.c
+1
-1
@@ -64,7 +64,7 @@ int virtio_read_many(unsigned long sector, void *load_addr, int sec_num)
64
}
65
66
unsigned long virtio_load_direct(unsigned long rec_list1, unsigned long rec_list2,
67
- unsigned long subchan_id, void *load_addr)
67
+ void *load_addr)
68
{
69
u8 status;
70
int sec = rec_list1;
pc-bios/s390-ccw/virtio.h
+7
@@ -277,7 +277,14 @@ int virtio_run(VDev *vdev, int vqid, VirtioCmd *cmd);
277
int virtio_reset(VDev *vdev);
278
int virtio_setup_ccw(VDev *vdev);
279
280
+/* virtio-net.c */
281
int virtio_net_init(void *mac_addr);
282
void virtio_net_deinit(void);
283
284
+/* virtio-blkdev.c */
285
+int virtio_blk_setup_device(SubChannelId schid);
286
+int virtio_read(unsigned long sector, void *load_addr);
287
+unsigned long virtio_load_direct(unsigned long rec_list1, unsigned long rec_list2,
288
+ void *load_addr);
289
+
290
#endif /* VIRTIO_H */