From: "Eugene (jno) Dvurechenski" <j...@linux.vnet.ibm.com>
This function has nothing to do with virtio.
Reviewed-by: Cornelia Huck <cornelia.h...@de.ibm.com>
Reviewed-by: David Hildenbrand <d...@linux.vnet.ibm.com>
Signed-off-by: Eugene (jno) Dvurechenski <j...@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.h...@de.ibm.com>
---
pc-bios/s390-ccw/bootmap.c | 8 ++++----
pc-bios/s390-ccw/bootmap.h | 2 +-
pc-bios/s390-ccw/main.c | 8 ++++----
pc-bios/s390-ccw/s390-ccw.h | 2 +-
pc-bios/s390-ccw/virtio.c | 8 ++++----
5 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/pc-bios/s390-ccw/bootmap.c b/pc-bios/s390-ccw/bootmap.c
index ca60c33..711a518 100644
--- a/pc-bios/s390-ccw/bootmap.c
+++ b/pc-bios/s390-ccw/bootmap.c
@@ -72,7 +72,7 @@ static void jump_to_IPL_code(uint64_t address)
asm volatile("lghi 1,1\n\t"
"diag 1,1,0x308\n\t"
: : : "1", "memory");
- virtio_panic("\n! IPL returns !\n");
+ panic("\n! IPL returns !\n");
}
/***********************************************************************
@@ -617,7 +617,7 @@ static IsoBcSection *find_iso_bc_entry(void)
if (!is_iso_bc_valid(e)) {
/* The validation entry is mandatory */
- virtio_panic("No valid boot catalog found!\n");
+ panic("No valid boot catalog found!\n");
return NULL;
}
@@ -633,7 +633,7 @@ static IsoBcSection *find_iso_bc_entry(void)
}
}
- virtio_panic("No suitable boot entry found on ISO-9660 media!\n");
+ panic("No suitable boot entry found on ISO-9660 media!\n");
return NULL;
}
@@ -701,5 +701,5 @@ void zipl_load(void)
*/
ipl_eckd_cdl();
- virtio_panic("\n* this can never happen *\n");
+ panic("\n* this can never happen *\n");
}
diff --git a/pc-bios/s390-ccw/bootmap.h b/pc-bios/s390-ccw/bootmap.h
index 07e3b20..e074587 100644
--- a/pc-bios/s390-ccw/bootmap.h
+++ b/pc-bios/s390-ccw/bootmap.h
@@ -269,7 +269,7 @@ static inline void IPL_assert(bool term, const char
*message)
if (!term) {
sclp_print("\n! ");
sclp_print(message);
- virtio_panic(" !\n"); /* no return */
+ panic(" !\n"); /* no return */
}
}
diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c
index d5fe4ce..11cb803 100644
--- a/pc-bios/s390-ccw/main.c
+++ b/pc-bios/s390-ccw/main.c
@@ -31,7 +31,7 @@ void write_subsystem_identification(void)
}
-void virtio_panic(const char *string)
+void panic(const char *string)
{
sclp_print(string);
disabled_wait();
@@ -93,13 +93,13 @@ static void virtio_setup(uint64_t dev_info)
}
if (!found) {
- virtio_panic("No virtio-blk device found!\n");
+ panic("No virtio-blk device found!\n");
}
virtio_setup_block(blk_schid);
if (!virtio_ipl_disk_is_valid()) {
- virtio_panic("No valid hard disk detected.\n");
+ panic("No valid hard disk detected.\n");
}
}
@@ -111,6 +111,6 @@ int main(void)
zipl_load(); /* no return */
- virtio_panic("Failed to load OS from hard disk\n");
+ panic("Failed to load OS from hard disk\n");
return 0; /* make compiler happy */
}
diff --git a/pc-bios/s390-ccw/s390-ccw.h b/pc-bios/s390-ccw/s390-ccw.h
index 5484c2a..c24f720 100644
--- a/pc-bios/s390-ccw/s390-ccw.h
+++ b/pc-bios/s390-ccw/s390-ccw.h
@@ -50,7 +50,7 @@ void disabled_wait(void);
void consume_sclp_int(void);
/* main.c */
-void virtio_panic(const char *string);
+void panic(const char *string);
void write_subsystem_identification(void);
extern char stack[PAGE_SIZE * 8] __attribute__((__aligned__(PAGE_SIZE)));
extern char ring_area[PAGE_SIZE * 8] __attribute__((__aligned__(PAGE_SIZE)));
diff --git a/pc-bios/s390-ccw/virtio.c b/pc-bios/s390-ccw/virtio.c
index 87aed38..2d27b1d 100644
--- a/pc-bios/s390-ccw/virtio.c
+++ b/pc-bios/s390-ccw/virtio.c
@@ -97,7 +97,7 @@ static void virtio_set_status(struct subchannel_id schid,
{
unsigned char status = dev_addr;
if (run_ccw(schid, CCW_CMD_WRITE_STATUS, &status, sizeof(status))) {
- virtio_panic("Could not write status to host!\n");
+ panic("Could not write status to host!\n");
}
}
@@ -251,7 +251,7 @@ unsigned long virtio_load_direct(ulong rec_list1, ulong
rec_list2,
sclp_print(".");
status = virtio_read_many(sec, (void *)addr, sec_num);
if (status) {
- virtio_panic("I/O Error");
+ panic("I/O Error");
}
addr += sec_num * virtio_get_block_size();
@@ -381,10 +381,10 @@ void virtio_setup_block(struct subchannel_id schid)
config.index = 0;
if (run_ccw(schid, CCW_CMD_READ_VQ_CONF, &config, sizeof(config))) {
- virtio_panic("Could not get block device VQ configuration\n");
+ panic("Could not get block device VQ configuration\n");
}
if (run_ccw(schid, CCW_CMD_READ_CONF, &blk_cfg, sizeof(blk_cfg))) {
- virtio_panic("Could not get block device configuration\n");
+ panic("Could not get block device configuration\n");
}
vring_init(&block, config.num, ring_area,
KVM_S390_VIRTIO_RING_ALIGN);
--
2.7.4
